diff options
author | Michal Minar <miminar@redhat.com> | 2014-02-26 13:44:05 +0100 |
---|---|---|
committer | Michal Minar <miminar@redhat.com> | 2014-03-17 12:25:52 +0100 |
commit | c322f0f820e937861a043d9c8cf4df454edbca2e (patch) | |
tree | c90770674c0fdabfa9bec3d661e23930c34efa0c | |
parent | 79b1b0e1935f068517acad9fb36647a6e5879f53 (diff) | |
download | openlmi-scripts-c322f0f820e937861a043d9c8cf4df454edbca2e.tar.gz openlmi-scripts-c322f0f820e937861a043d9c8cf4df454edbca2e.tar.xz openlmi-scripts-c322f0f820e937861a043d9c8cf4df454edbca2e.zip |
unified script versions
All scripts have the same version which is set in single file (VERSION).
All setup.py and conf.py scripts containing these version numbers were
renamed to *.skel. These skeletons are then read by makefiles and proper
*.py scripts are generated out of them.
-rw-r--r-- | Makefile | 33 | ||||
-rw-r--r-- | Makefile.inc | 53 | ||||
-rw-r--r-- | VERSION | 1 | ||||
-rw-r--r-- | commands/account/Makefile | 20 | ||||
-rw-r--r-- | commands/account/doc/conf.py.skel (renamed from commands/account/doc/conf.py) | 4 | ||||
-rw-r--r-- | commands/account/setup.cfg | 2 | ||||
-rw-r--r-- | commands/account/setup.py.skel (renamed from commands/account/setup.py) | 7 | ||||
-rw-r--r-- | commands/hardware/Makefile | 1 | ||||
-rw-r--r-- | commands/hardware/doc/conf.py.skel (renamed from commands/hardware/doc/conf.py) | 4 | ||||
-rw-r--r-- | commands/hardware/setup.cfg | 2 | ||||
-rw-r--r-- | commands/hardware/setup.py.skel (renamed from commands/hardware/setup.py) | 2 | ||||
-rw-r--r-- | commands/logicalfile/Makefile | 20 | ||||
-rw-r--r-- | commands/logicalfile/doc/conf.py.skel (renamed from commands/logicalfile/doc/conf.py) | 4 | ||||
-rw-r--r-- | commands/logicalfile/setup.py.skel (renamed from commands/logicalfile/setup.py) | 7 | ||||
-rw-r--r-- | commands/networking/Makefile | 20 | ||||
-rw-r--r-- | commands/networking/doc/conf.py.skel (renamed from commands/powermanagement/doc/conf.py) | 4 | ||||
-rw-r--r-- | commands/networking/setup.py.skel (renamed from commands/networking/setup.py) | 2 | ||||
-rw-r--r-- | commands/powermanagement/Makefile | 1 | ||||
-rw-r--r-- | commands/powermanagement/doc/conf.py.skel (renamed from commands/networking/doc/conf.py) | 4 | ||||
-rw-r--r-- | commands/powermanagement/setup.cfg | 2 | ||||
-rw-r--r-- | commands/powermanagement/setup.py.skel (renamed from commands/powermanagement/setup.py) | 2 | ||||
-rw-r--r-- | commands/service/Makefile | 20 | ||||
-rw-r--r-- | commands/service/doc/conf.py.skel (renamed from commands/service/doc/conf.py) | 4 | ||||
-rw-r--r-- | commands/service/setup.py.skel (renamed from commands/service/setup.py) | 7 | ||||
-rw-r--r-- | commands/software/Makefile | 20 | ||||
-rw-r--r-- | commands/software/doc/conf.py.skel (renamed from commands/software/doc/conf.py) | 4 | ||||
-rw-r--r-- | commands/software/setup.py.skel (renamed from commands/software/setup.py) | 7 | ||||
-rw-r--r-- | commands/storage/Makefile | 20 | ||||
-rw-r--r-- | commands/storage/doc/conf.py.skel (renamed from commands/storage/doc/conf.py) | 4 | ||||
-rw-r--r-- | commands/storage/setup.py.skel (renamed from commands/storage/setup.py) | 7 | ||||
-rw-r--r-- | commands/system/Makefile | 20 | ||||
-rw-r--r-- | commands/system/doc/conf.py.skel (renamed from commands/system/doc/conf.py) | 4 | ||||
-rw-r--r-- | commands/system/setup.py.skel (renamed from commands/system/setup.py) | 2 | ||||
-rw-r--r-- | doc/conf.py.skel (renamed from doc/conf.py) | 4 | ||||
-rw-r--r-- | setup.py.skel (renamed from setup.py) | 7 |
35 files changed, 116 insertions, 209 deletions
@@ -1,25 +1,14 @@ -PYTHONPATH?=$(HOME)/workspace/python_sandbox -DEVELOPDIR?=$(shell echo $(PYTHONPATH) | cut -d : -f 1) +include Makefile.inc -.PHONY: readme sdist develop upload_docs clean all +COMMANDS ?= $(shell find commands -mindepth 1 -maxdepth 1 -type d) +# all rules executable on meta-command and commands +RULES := setup upload upload_docs clean +MASSRULES := $(foreach rule,$(RULES),$(rule)-all) -all: sdist +.PHONY: $(MASSRULES) -sdist: - python setup.py sdist - -develop: - python setup.py develop --install-dir=$(DEVELOPDIR) - -readme: README.txt - -%.txt: %.md - pandoc --from=markdown --to=rst -o $@ $? - -upload_docs: - make -C doc html - python setup.py upload_docs - -clean: - -rm README.txt - make -C doc clean +$(MASSRULES): %-all: % + # executes rule for metacommand and for all commands found + for cmd in $(COMMANDS); do \ + make -C $$cmd $*; \ + done diff --git a/Makefile.inc b/Makefile.inc new file mode 100644 index 0000000..d3b604f --- /dev/null +++ b/Makefile.inc @@ -0,0 +1,53 @@ +SELFDIR := $(dir $(lastword $(MAKEFILE_LIST))) +PYTHONPATH ?= $(HOME)/workspace/python_sandbox +DEVELOPDIR ?= $(shell echo $(PYTHONPATH) | cut -d : -f 1) +VERSION ?= $(shell cat $(SELFDIR)/VERSION) +# these can be used only after the setup.py is created +EGGNAME = $(shell python setup.py --name) +SRCDIST = $(EGGNAME)-$(VERSION).tar.gz + +.PHONY: readme sdist develop upload_docs clean all doc setup + +all: sdist + +setup: setup.py doc/conf.py + +%.py: %.py.skel $(SELFDIR)/VERSION + sed 's/@@VERSION@@/$(VERSION)/g' <$*.py.skel >$@ + +sdist: setup .$(VERSION).sdist + +.$(VERSION).sdist: + python setup.py sdist + touch $@ + +develop: setup + python setup.py develop --install-dir=$(DEVELOPDIR) + +readme: README.txt + +%.txt: %.md + pandoc --from=markdown --to=rst -o $@ $? + +doc: setup + make -C doc + +upload: setup .$(VERSION).upload + +.$(VERSION).upload: + python setup.py upload + touch $@ + +upload_docs: setup .$(VERSION).upload_docs + +.$(VERSION).upload_docs: + make -C doc html + python setup.py upload_docs + touch $@ + +clean: + -rm README.txt setup.py .$(VERSION).* + -rm -rf dist/ + make -C doc clean + +# ex: ft=make noet sw=8 ts=8 @@ -0,0 +1 @@ +0.2.7 diff --git a/commands/account/Makefile b/commands/account/Makefile index 8c02686..ee4552b 100644 --- a/commands/account/Makefile +++ b/commands/account/Makefile @@ -1,19 +1 @@ -PYTHONPATH?=$(HOME)/workspace/python_sandbox -DEVELOPDIR?=$(shell echo $(PYTHONPATH) | cut -d : -f 1) - -.PHONY: sdist develop upload_docs clean all - -all: sdist - -sdist: - python setup.py sdist - -develop: - python setup.py develop --install-dir=$(DEVELOPDIR) - -upload_docs: - make -C doc html - python setup.py upload_docs - -clean: - make -C doc clean +include ../../Makefile.inc diff --git a/commands/account/doc/conf.py b/commands/account/doc/conf.py.skel index 1f6e78f..9aee71a 100644 --- a/commands/account/doc/conf.py +++ b/commands/account/doc/conf.py.skel @@ -48,9 +48,9 @@ copyright = u'2014, Red Hat, Inc.' # built documents. # # The short X.Y version. -version = '0.0.1' +version = "@@VERSION@@" # The full version, including alpha/beta/rc tags. -release = '0.0.1' +release = "@@VERSION@@" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/commands/account/setup.cfg b/commands/account/setup.cfg new file mode 100644 index 0000000..2ddce25 --- /dev/null +++ b/commands/account/setup.cfg @@ -0,0 +1,2 @@ +[upload_docs] +upload-dir = doc/_build/html diff --git a/commands/account/setup.py b/commands/account/setup.py.skel index 8d81d71..86df908 100644 --- a/commands/account/setup.py +++ b/commands/account/setup.py.skel @@ -1,8 +1,5 @@ #!/usr/bin/env python -PROJECT = 'openlmi-scripts-account' -VERSION = '0.0.1' - from setuptools import setup, find_packages try: @@ -11,8 +8,8 @@ except IOError: long_description = '' setup( - name=PROJECT, - version=VERSION, + name='openlmi-scripts-account', + version='@@VERSION@@', description='LMI command for system account administration.', long_description=long_description, author='Roman Rakus', diff --git a/commands/hardware/Makefile b/commands/hardware/Makefile new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/commands/hardware/Makefile @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/commands/hardware/doc/conf.py b/commands/hardware/doc/conf.py.skel index 79fe291..08b460a 100644 --- a/commands/hardware/doc/conf.py +++ b/commands/hardware/doc/conf.py.skel @@ -48,9 +48,9 @@ copyright = u'2013-2014, Red Hat, Inc.' # built documents. # # The short X.Y version. -version = '0.0.1' +version = "@@VERSION@@" # The full version, including alpha/beta/rc tags. -release = '0.0.1' +release = "@@VERSION@@" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/commands/hardware/setup.cfg b/commands/hardware/setup.cfg new file mode 100644 index 0000000..2ddce25 --- /dev/null +++ b/commands/hardware/setup.cfg @@ -0,0 +1,2 @@ +[upload_docs] +upload-dir = doc/_build/html diff --git a/commands/hardware/setup.py b/commands/hardware/setup.py.skel index 441612c..7f85956 100644 --- a/commands/hardware/setup.py +++ b/commands/hardware/setup.py.skel @@ -10,7 +10,7 @@ except IOError: setup( name='openlmi-scripts-hardware', - version='0.0.3', + version='@@VERSION@@', description='Hardware information available in OpenLMI hardware providers', long_description=long_description, author=u'Peter Schiffer', diff --git a/commands/logicalfile/Makefile b/commands/logicalfile/Makefile index 7d0a592..ee4552b 100644 --- a/commands/logicalfile/Makefile +++ b/commands/logicalfile/Makefile @@ -1,19 +1 @@ -PYTHONPATH?=$(HOME)/workspace/python_sandbox -DEVELOPDIR?=$(shell echo $(PYTHONPATH) | cut -d : -f 1) - -.PHONY: sdist develop upload_docs clean - -all: sdist - -sdist: - python setup.py sdist - -develop: - python setup.py develop --install-dir=$(DEVELOPDIR) - -upload_docs: - make -C doc html - python setup.py upload_docs - -clean: - make -C doc clean +include ../../Makefile.inc diff --git a/commands/logicalfile/doc/conf.py b/commands/logicalfile/doc/conf.py.skel index 841f14b..eba7932 100644 --- a/commands/logicalfile/doc/conf.py +++ b/commands/logicalfile/doc/conf.py.skel @@ -48,9 +48,9 @@ copyright = u'2013-2014, Red Hat, Inc.' # built documents. # # The short X.Y version. -version = '0.0.3' +version = "@@VERSION@@" # The full version, including alpha/beta/rc tags. -release = '0.0.3' +release = "@@VERSION@@" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/commands/logicalfile/setup.py b/commands/logicalfile/setup.py.skel index f3f32c8..466c6af 100644 --- a/commands/logicalfile/setup.py +++ b/commands/logicalfile/setup.py.skel @@ -1,8 +1,5 @@ #!/usr/bin/env python -PROJECT = 'openlmi-scripts-logicalfile' -VERSION = '0.0.3' - from setuptools import setup, find_packages try: @@ -11,8 +8,8 @@ except IOError: long_description = '' setup( - name=PROJECT, - version=VERSION, + name='openlmi-scripts-logicalfile', + version='@@VERSION@@', description='LMI command for system logical file administration.', long_description=long_description, author='Jan Synacek', diff --git a/commands/networking/Makefile b/commands/networking/Makefile index 7d0a592..ee4552b 100644 --- a/commands/networking/Makefile +++ b/commands/networking/Makefile @@ -1,19 +1 @@ -PYTHONPATH?=$(HOME)/workspace/python_sandbox -DEVELOPDIR?=$(shell echo $(PYTHONPATH) | cut -d : -f 1) - -.PHONY: sdist develop upload_docs clean - -all: sdist - -sdist: - python setup.py sdist - -develop: - python setup.py develop --install-dir=$(DEVELOPDIR) - -upload_docs: - make -C doc html - python setup.py upload_docs - -clean: - make -C doc clean +include ../../Makefile.inc diff --git a/commands/powermanagement/doc/conf.py b/commands/networking/doc/conf.py.skel index 41ffdb4..f1446f9 100644 --- a/commands/powermanagement/doc/conf.py +++ b/commands/networking/doc/conf.py.skel @@ -48,9 +48,9 @@ copyright = u'2013, Radek Novacek' # built documents. # # The short X.Y version. -version = '0.0.1' +version = "@@VERSION@@" # The full version, including alpha/beta/rc tags. -release = '0.0.1' +release = "@@VERSION@@" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/commands/networking/setup.py b/commands/networking/setup.py.skel index b18c030..6dabfdd 100644 --- a/commands/networking/setup.py +++ b/commands/networking/setup.py.skel @@ -10,7 +10,7 @@ except IOError: setup( name='openlmi-scripts-networking', - version='0.0.2', + version='@@VERSION@@', description='LMI command for network administration.', long_description=long_description, author=u'Radek Novacek', diff --git a/commands/powermanagement/Makefile b/commands/powermanagement/Makefile new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/commands/powermanagement/Makefile @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/commands/networking/doc/conf.py b/commands/powermanagement/doc/conf.py.skel index 5138a89..f1446f9 100644 --- a/commands/networking/doc/conf.py +++ b/commands/powermanagement/doc/conf.py.skel @@ -48,9 +48,9 @@ copyright = u'2013, Radek Novacek' # built documents. # # The short X.Y version. -version = '0.0.2' +version = "@@VERSION@@" # The full version, including alpha/beta/rc tags. -release = '0.0.2' +release = "@@VERSION@@" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/commands/powermanagement/setup.cfg b/commands/powermanagement/setup.cfg new file mode 100644 index 0000000..2ddce25 --- /dev/null +++ b/commands/powermanagement/setup.cfg @@ -0,0 +1,2 @@ +[upload_docs] +upload-dir = doc/_build/html diff --git a/commands/powermanagement/setup.py b/commands/powermanagement/setup.py.skel index 6613348..5fe420d 100644 --- a/commands/powermanagement/setup.py +++ b/commands/powermanagement/setup.py.skel @@ -10,7 +10,7 @@ except IOError: setup( name='openlmi-scripts-powermanagement', - version='0.0.1', + version='@@VERSION@@', description='LMI command for power management.', long_description=long_description, author=u'Radek Novacek', diff --git a/commands/service/Makefile b/commands/service/Makefile index 7d0a592..ee4552b 100644 --- a/commands/service/Makefile +++ b/commands/service/Makefile @@ -1,19 +1 @@ -PYTHONPATH?=$(HOME)/workspace/python_sandbox -DEVELOPDIR?=$(shell echo $(PYTHONPATH) | cut -d : -f 1) - -.PHONY: sdist develop upload_docs clean - -all: sdist - -sdist: - python setup.py sdist - -develop: - python setup.py develop --install-dir=$(DEVELOPDIR) - -upload_docs: - make -C doc html - python setup.py upload_docs - -clean: - make -C doc clean +include ../../Makefile.inc diff --git a/commands/service/doc/conf.py b/commands/service/doc/conf.py.skel index 8244025..29770eb 100644 --- a/commands/service/doc/conf.py +++ b/commands/service/doc/conf.py.skel @@ -48,9 +48,9 @@ copyright = u'2013-2014, Red Hat, Inc.' # built documents. # # The short X.Y version. -version = '0.1.2' +version = "@@VERSION@@" # The full version, including alpha/beta/rc tags. -release = '0.1.2' +release = "@@VERSION@@" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/commands/service/setup.py b/commands/service/setup.py.skel index cb994e3..105379e 100644 --- a/commands/service/setup.py +++ b/commands/service/setup.py.skel @@ -1,8 +1,5 @@ #!/usr/bin/env python -PROJECT = 'openlmi-scripts-service' -VERSION = '0.1.2' - from setuptools import setup, find_packages try: @@ -11,8 +8,8 @@ except IOError: long_description = '' setup( - name=PROJECT, - version=VERSION, + name='openlmi-scripts-service', + version='@@VERSION@@', description='LMI command for system service administration.', long_description=long_description, author='Michal Minar', diff --git a/commands/software/Makefile b/commands/software/Makefile index 7d0a592..ee4552b 100644 --- a/commands/software/Makefile +++ b/commands/software/Makefile @@ -1,19 +1 @@ -PYTHONPATH?=$(HOME)/workspace/python_sandbox -DEVELOPDIR?=$(shell echo $(PYTHONPATH) | cut -d : -f 1) - -.PHONY: sdist develop upload_docs clean - -all: sdist - -sdist: - python setup.py sdist - -develop: - python setup.py develop --install-dir=$(DEVELOPDIR) - -upload_docs: - make -C doc html - python setup.py upload_docs - -clean: - make -C doc clean +include ../../Makefile.inc diff --git a/commands/software/doc/conf.py b/commands/software/doc/conf.py.skel index a48fb0f..b5d0634 100644 --- a/commands/software/doc/conf.py +++ b/commands/software/doc/conf.py.skel @@ -48,9 +48,9 @@ copyright = u'2013-2014, Red Hat, Inc.' # built documents. # # The short X.Y version. -version = '0.2.5' +version = "@@VERSION@@" # The full version, including alpha/beta/rc tags. -release = '0.2.5' +release = "@@VERSION@@" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/commands/software/setup.py b/commands/software/setup.py.skel index 49522cd..834d05b 100644 --- a/commands/software/setup.py +++ b/commands/software/setup.py.skel @@ -1,8 +1,5 @@ #!/usr/bin/env python -PROJECT = 'openlmi-scripts-software' -VERSION = '0.2.5' - from setuptools import setup, find_packages try: @@ -11,8 +8,8 @@ except IOError: long_description = '' setup( - name=PROJECT, - version=VERSION, + name='openlmi-scripts-software', + version='@@VERSION@@', description='LMI command for system software administration.', long_description=long_description, author='Michal Minar', diff --git a/commands/storage/Makefile b/commands/storage/Makefile index 8c02686..ee4552b 100644 --- a/commands/storage/Makefile +++ b/commands/storage/Makefile @@ -1,19 +1 @@ -PYTHONPATH?=$(HOME)/workspace/python_sandbox -DEVELOPDIR?=$(shell echo $(PYTHONPATH) | cut -d : -f 1) - -.PHONY: sdist develop upload_docs clean all - -all: sdist - -sdist: - python setup.py sdist - -develop: - python setup.py develop --install-dir=$(DEVELOPDIR) - -upload_docs: - make -C doc html - python setup.py upload_docs - -clean: - make -C doc clean +include ../../Makefile.inc diff --git a/commands/storage/doc/conf.py b/commands/storage/doc/conf.py.skel index f8c6d91..91e0905 100644 --- a/commands/storage/doc/conf.py +++ b/commands/storage/doc/conf.py.skel @@ -48,9 +48,9 @@ copyright = u'2013-2014, Red Hat, Inc.' # built documents. # # The short X.Y version. -version = '0.0.5' +version = "@@VERSION@@" # The full version, including alpha/beta/rc tags. -release = '0.0.5' +release = "@@VERSION@@" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/commands/storage/setup.py b/commands/storage/setup.py.skel index a90b751..93ddf3f 100644 --- a/commands/storage/setup.py +++ b/commands/storage/setup.py.skel @@ -1,8 +1,5 @@ #!/usr/bin/env python -PROJECT = 'openlmi-scripts-storage' -VERSION = '0.0.5' - from setuptools import setup, find_packages try: @@ -11,8 +8,8 @@ except IOError: long_description = '' setup( - name=PROJECT, - version=VERSION, + name='openlmi-scripts-storage', + version='@@VERSION@@', description='LMI command for system storage administration.', long_description=long_description, author='Jan Safranek', diff --git a/commands/system/Makefile b/commands/system/Makefile index 7d0a592..ee4552b 100644 --- a/commands/system/Makefile +++ b/commands/system/Makefile @@ -1,19 +1 @@ -PYTHONPATH?=$(HOME)/workspace/python_sandbox -DEVELOPDIR?=$(shell echo $(PYTHONPATH) | cut -d : -f 1) - -.PHONY: sdist develop upload_docs clean - -all: sdist - -sdist: - python setup.py sdist - -develop: - python setup.py develop --install-dir=$(DEVELOPDIR) - -upload_docs: - make -C doc html - python setup.py upload_docs - -clean: - make -C doc clean +include ../../Makefile.inc diff --git a/commands/system/doc/conf.py b/commands/system/doc/conf.py.skel index 4d1fbe7..29c1048 100644 --- a/commands/system/doc/conf.py +++ b/commands/system/doc/conf.py.skel @@ -48,9 +48,9 @@ copyright = u'2014, Peter Schiffer' # built documents. # # The short X.Y version. -version = '0.0.2' +version = "@@VERSION@@" # The full version, including alpha/beta/rc tags. -release = '0.0.2' +release = "@@VERSION@@" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/commands/system/setup.py b/commands/system/setup.py.skel index 57b07a7..71c3bfe 100644 --- a/commands/system/setup.py +++ b/commands/system/setup.py.skel @@ -10,7 +10,7 @@ except IOError: setup( name='openlmi-scripts-system', - version='0.0.2', + version='@@VERSION@@', description='Display general system information', long_description=long_description, author=u'Peter Schiffer', diff --git a/doc/conf.py b/doc/conf.py.skel index f5a0693..af4caa9 100644 --- a/doc/conf.py +++ b/doc/conf.py.skel @@ -58,9 +58,9 @@ copyright = u'2013-2014, Red Hat, Inc.' # built documents. # # The short X.Y version. -version = '0.2.7' +version = '@@VERSION@@' # The full version, including alpha/beta/rc tags. -release = '0.2.7' +release = '@@VERSION@@' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -5,9 +5,6 @@ import subprocess import sys from setuptools import setup, find_packages -PROJECT = 'openlmi-scripts' -VERSION = '0.2.7' - long_description = '' try: try: @@ -29,8 +26,8 @@ except IOError: pass setup( - name=PROJECT, - version=VERSION, + name='openlmi-scripts', + version='@@VERSION@@', description='Client-side library and command-line client', long_description=long_description, author='Michal Minar', |