summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
Diffstat (limited to 'commands')
-rw-r--r--commands/account/Makefile20
-rw-r--r--commands/account/doc/conf.py.skel (renamed from commands/account/doc/conf.py)4
-rw-r--r--commands/account/setup.cfg2
-rw-r--r--commands/account/setup.py.skel (renamed from commands/account/setup.py)7
-rw-r--r--commands/hardware/Makefile1
-rw-r--r--commands/hardware/doc/conf.py.skel (renamed from commands/hardware/doc/conf.py)4
-rw-r--r--commands/hardware/setup.cfg2
-rw-r--r--commands/hardware/setup.py.skel (renamed from commands/hardware/setup.py)2
-rw-r--r--commands/logicalfile/Makefile20
-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/Makefile20
-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/Makefile1
-rw-r--r--commands/powermanagement/doc/conf.py.skel (renamed from commands/networking/doc/conf.py)4
-rw-r--r--commands/powermanagement/setup.cfg2
-rw-r--r--commands/powermanagement/setup.py.skel (renamed from commands/powermanagement/setup.py)2
-rw-r--r--commands/service/Makefile20
-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/Makefile20
-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/Makefile20
-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/Makefile20
-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
30 files changed, 47 insertions, 180 deletions
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',