[node-patches] Change in ovirt-node[master]: package: TUI code into autotools
fabiand at fedoraproject.org
fabiand at fedoraproject.org
Wed Apr 17 15:44:12 UTC 2013
Fabian Deutsch has uploaded a new change for review.
Change subject: package: TUI code into autotools
......................................................................
package: TUI code into autotools
Previously the TUI was installed using setup.py, this is now also done
using automake.
rhbz#843753
Change-Id: If2f8b2924014634b6085fb3caca9548b2eaf598a
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M ovirt-node.spec.in
R src/.checkstyle
R src/.gitignore
R src/.project
R src/.pydevproject
R src/.pylintrc
M src/Makefile.am
R src/makefile.tui
R src/ovirt/__init__.py
R src/ovirt/node/README
R src/ovirt/node/__init__.py
R src/ovirt/node/app.py
R src/ovirt/node/base.py
R src/ovirt/node/config/__init__.py
R src/ovirt/node/config/defaults.py
R src/ovirt/node/config/network.py
R src/ovirt/node/exceptions.py
R src/ovirt/node/installer/__init__.py
R src/ovirt/node/installer/__main__.py
R src/ovirt/node/installer/boot_device_page.py
R src/ovirt/node/installer/installation_device_page.py
R src/ovirt/node/installer/keyboard_page.py
R src/ovirt/node/installer/password_page.py
R src/ovirt/node/installer/progress_page.py
R src/ovirt/node/installer/storage_vol_page.py
R src/ovirt/node/installer/upgrade_page.py
R src/ovirt/node/installer/welcome_page.py
R src/ovirt/node/plugins.py
R src/ovirt/node/setup/__init__.py
R src/ovirt/node/setup/__main__.py
R src/ovirt/node/setup/kdump_page.py
R src/ovirt/node/setup/keyboard_page.py
R src/ovirt/node/setup/logging_page.py
R src/ovirt/node/setup/monitoring_page.py
R src/ovirt/node/setup/network_page.py
R src/ovirt/node/setup/ping.py
R src/ovirt/node/setup/remote_storage_page.py
R src/ovirt/node/setup/security_page.py
R src/ovirt/node/setup/snmp_page.py
R src/ovirt/node/setup/status_page.py
R src/ovirt/node/setup/support_page.py
R src/ovirt/node/ui/__init__.py
R src/ovirt/node/ui/urwid_builder.py
R src/ovirt/node/ui/widgets.py
R src/ovirt/node/utils/__init__.py
R src/ovirt/node/utils/console.py
R src/ovirt/node/utils/fs.py
R src/ovirt/node/utils/network.py
R src/ovirt/node/utils/process.py
R src/ovirt/node/utils/security.py
R src/ovirt/node/utils/storage.py
R src/ovirt/node/utils/system.py
R src/ovirt/node/utils/virt.py
R src/ovirt/node/valid.py
D src/tui/makefile.legacy
D src/tui/setup.py
56 files changed, 73 insertions(+), 91 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/01/14001/1
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 3dd74f1..a6b6a90 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -188,14 +188,6 @@
# specific version of python-augeas is not available in Fedora yet
%{__install} -p -m0644 scripts/augeas.py %{buildroot}%{python_sitelib}
-# Build and install the new TUI
-pushd .
-cd src/tui/
-make -f makefile.legacy install python=%{__python} prefix=%{_prefix} root=%{buildroot}
-# Remove some extra data
-rm -rf %{buildroot}/usr/extra
-popd .
-
%clean
%{__rm} -rf %{buildroot}
@@ -381,9 +373,13 @@
%{_initrddir}/ovirt-post
%endif
# Files related to the new TUI
-%{python_sitelib}/ovirt_node_molch*.egg-info
-%{python_sitelib}/ovirt/__init__.*
+%{python_sitelib}/ovirt/*
%{python_sitelib}/ovirt/node/*
+%{python_sitelib}/ovirt/node/config/*
+%{python_sitelib}/ovirt/node/installer/*
+%{python_sitelib}/ovirt/node/setup/*
+%{python_sitelib}/ovirt/node/ui/*
+%{python_sitelib}/ovirt/node/utils/*
%{_bindir}/ovirt-config-setup
%{_bindir}/ovirt-node-installer
%{_bindir}/ovirt-node-doc
diff --git a/src/tui/.checkstyle b/src/.checkstyle
similarity index 100%
rename from src/tui/.checkstyle
rename to src/.checkstyle
diff --git a/src/tui/.gitignore b/src/.gitignore
similarity index 100%
rename from src/tui/.gitignore
rename to src/.gitignore
diff --git a/src/tui/.project b/src/.project
similarity index 100%
rename from src/tui/.project
rename to src/.project
diff --git a/src/tui/.pydevproject b/src/.pydevproject
similarity index 100%
rename from src/tui/.pydevproject
rename to src/.pydevproject
diff --git a/src/tui/src/.pylintrc b/src/.pylintrc
similarity index 100%
rename from src/tui/src/.pylintrc
rename to src/.pylintrc
diff --git a/src/Makefile.am b/src/Makefile.am
index 99dfd02..645ad8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,8 +47,73 @@
ovirtnode/password.py \
ovirtnode/storage.py
-EXTRA_DIST = \
- tui
+pyovirtdir = $(pythondir)/ovirt
+pyovirt_nodedir = $(pyovirtdir)/node
+pyovirt_node_configdir = $(pyovirt_nodedir)/config
+pyovirt_node_installerdir = $(pyovirt_nodedir)/installer
+pyovirt_node_setupdir = $(pyovirt_nodedir)/setup
+pyovirt_node_uidir = $(pyovirt_nodedir)/ui
+pyovirt_node_utilsdir = $(pyovirt_nodedir)/utils
+
+pyovirt_PYTHON = \
+ ovirt/__init__.py
+
+pyovirt_node_PYTHON = \
+ ovirt/node/__init__.py \
+ ovirt/node/exceptions.py \
+ ovirt/node/plugins.py \
+ ovirt/node/valid.py \
+ ovirt/node/app.py \
+ ovirt/node/base.py
+
+pyovirt_node_config_PYTHON = \
+ ovirt/node/config/defaults.py \
+ ovirt/node/config/__init__.py \
+ ovirt/node/config/network.py
+
+pyovirt_node_installer_PYTHON = \
+ ovirt/node/installer/__init__.py \
+ ovirt/node/installer/__main__.py \
+ ovirt/node/installer/boot_device_page.py \
+ ovirt/node/installer/installation_device_page.py \
+ ovirt/node/installer/keyboard_page.py \
+ ovirt/node/installer/password_page.py \
+ ovirt/node/installer/progress_page.py \
+ ovirt/node/installer/storage_vol_page.py \
+ ovirt/node/installer/upgrade_page.py \
+ ovirt/node/installer/welcome_page.py
+
+pyovirt_node_setup_PYTHON = \
+ ovirt/node/setup/__init__.py \
+ ovirt/node/setup/__main__.py \
+ ovirt/node/setup/kdump_page.py \
+ ovirt/node/setup/keyboard_page.py \
+ ovirt/node/setup/logging_page.py \
+ ovirt/node/setup/monitoring_page.py \
+ ovirt/node/setup/network_page.py \
+ ovirt/node/setup/ping.py \
+ ovirt/node/setup/remote_storage_page.py \
+ ovirt/node/setup/security_page.py \
+ ovirt/node/setup/snmp_page.py \
+ ovirt/node/setup/status_page.py \
+ ovirt/node/setup/support_page.py
+
+pyovirt_node_ui_PYTHON = \
+ ovirt/node/ui/__init__.py \
+ ovirt/node/ui/urwid_builder.py \
+ ovirt/node/ui/widgets.py
+
+pyovirt_node_utils_PYTHON = \
+ ovirt/node/utils/__init__.py \
+ ovirt/node/utils/console.py \
+ ovirt/node/utils/fs.py \
+ ovirt/node/utils/network.py \
+ ovirt/node/utils/process.py \
+ ovirt/node/utils/security.py \
+ ovirt/node/utils/storage.py \
+ ovirt/node/utils/system.py \
+ ovirt/node/utils/virt.py
+
# Requires python-pep8 package (Fedora)
check-local: check-local-pep8
diff --git a/src/tui/src/Makefile b/src/makefile.tui
similarity index 100%
rename from src/tui/src/Makefile
rename to src/makefile.tui
diff --git a/src/tui/src/ovirt/__init__.py b/src/ovirt/__init__.py
similarity index 100%
rename from src/tui/src/ovirt/__init__.py
rename to src/ovirt/__init__.py
diff --git a/src/tui/src/ovirt/node/README b/src/ovirt/node/README
similarity index 100%
rename from src/tui/src/ovirt/node/README
rename to src/ovirt/node/README
diff --git a/src/tui/src/ovirt/node/__init__.py b/src/ovirt/node/__init__.py
similarity index 100%
rename from src/tui/src/ovirt/node/__init__.py
rename to src/ovirt/node/__init__.py
diff --git a/src/tui/src/ovirt/node/app.py b/src/ovirt/node/app.py
similarity index 100%
rename from src/tui/src/ovirt/node/app.py
rename to src/ovirt/node/app.py
diff --git a/src/tui/src/ovirt/node/base.py b/src/ovirt/node/base.py
similarity index 100%
rename from src/tui/src/ovirt/node/base.py
rename to src/ovirt/node/base.py
diff --git a/src/tui/src/ovirt/node/config/__init__.py b/src/ovirt/node/config/__init__.py
similarity index 100%
rename from src/tui/src/ovirt/node/config/__init__.py
rename to src/ovirt/node/config/__init__.py
diff --git a/src/tui/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
similarity index 100%
rename from src/tui/src/ovirt/node/config/defaults.py
rename to src/ovirt/node/config/defaults.py
diff --git a/src/tui/src/ovirt/node/config/network.py b/src/ovirt/node/config/network.py
similarity index 100%
rename from src/tui/src/ovirt/node/config/network.py
rename to src/ovirt/node/config/network.py
diff --git a/src/tui/src/ovirt/node/exceptions.py b/src/ovirt/node/exceptions.py
similarity index 100%
rename from src/tui/src/ovirt/node/exceptions.py
rename to src/ovirt/node/exceptions.py
diff --git a/src/tui/src/ovirt/node/installer/__init__.py b/src/ovirt/node/installer/__init__.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/__init__.py
rename to src/ovirt/node/installer/__init__.py
diff --git a/src/tui/src/ovirt/node/installer/__main__.py b/src/ovirt/node/installer/__main__.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/__main__.py
rename to src/ovirt/node/installer/__main__.py
diff --git a/src/tui/src/ovirt/node/installer/boot_device_page.py b/src/ovirt/node/installer/boot_device_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/boot_device_page.py
rename to src/ovirt/node/installer/boot_device_page.py
diff --git a/src/tui/src/ovirt/node/installer/installation_device_page.py b/src/ovirt/node/installer/installation_device_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/installation_device_page.py
rename to src/ovirt/node/installer/installation_device_page.py
diff --git a/src/tui/src/ovirt/node/installer/keyboard_page.py b/src/ovirt/node/installer/keyboard_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/keyboard_page.py
rename to src/ovirt/node/installer/keyboard_page.py
diff --git a/src/tui/src/ovirt/node/installer/password_page.py b/src/ovirt/node/installer/password_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/password_page.py
rename to src/ovirt/node/installer/password_page.py
diff --git a/src/tui/src/ovirt/node/installer/progress_page.py b/src/ovirt/node/installer/progress_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/progress_page.py
rename to src/ovirt/node/installer/progress_page.py
diff --git a/src/tui/src/ovirt/node/installer/storage_vol_page.py b/src/ovirt/node/installer/storage_vol_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/storage_vol_page.py
rename to src/ovirt/node/installer/storage_vol_page.py
diff --git a/src/tui/src/ovirt/node/installer/upgrade_page.py b/src/ovirt/node/installer/upgrade_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/upgrade_page.py
rename to src/ovirt/node/installer/upgrade_page.py
diff --git a/src/tui/src/ovirt/node/installer/welcome_page.py b/src/ovirt/node/installer/welcome_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/installer/welcome_page.py
rename to src/ovirt/node/installer/welcome_page.py
diff --git a/src/tui/src/ovirt/node/plugins.py b/src/ovirt/node/plugins.py
similarity index 100%
rename from src/tui/src/ovirt/node/plugins.py
rename to src/ovirt/node/plugins.py
diff --git a/src/tui/src/ovirt/node/setup/__init__.py b/src/ovirt/node/setup/__init__.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/__init__.py
rename to src/ovirt/node/setup/__init__.py
diff --git a/src/tui/src/ovirt/node/setup/__main__.py b/src/ovirt/node/setup/__main__.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/__main__.py
rename to src/ovirt/node/setup/__main__.py
diff --git a/src/tui/src/ovirt/node/setup/kdump_page.py b/src/ovirt/node/setup/kdump_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/kdump_page.py
rename to src/ovirt/node/setup/kdump_page.py
diff --git a/src/tui/src/ovirt/node/setup/keyboard_page.py b/src/ovirt/node/setup/keyboard_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/keyboard_page.py
rename to src/ovirt/node/setup/keyboard_page.py
diff --git a/src/tui/src/ovirt/node/setup/logging_page.py b/src/ovirt/node/setup/logging_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/logging_page.py
rename to src/ovirt/node/setup/logging_page.py
diff --git a/src/tui/src/ovirt/node/setup/monitoring_page.py b/src/ovirt/node/setup/monitoring_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/monitoring_page.py
rename to src/ovirt/node/setup/monitoring_page.py
diff --git a/src/tui/src/ovirt/node/setup/network_page.py b/src/ovirt/node/setup/network_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/network_page.py
rename to src/ovirt/node/setup/network_page.py
diff --git a/src/tui/src/ovirt/node/setup/ping.py b/src/ovirt/node/setup/ping.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/ping.py
rename to src/ovirt/node/setup/ping.py
diff --git a/src/tui/src/ovirt/node/setup/remote_storage_page.py b/src/ovirt/node/setup/remote_storage_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/remote_storage_page.py
rename to src/ovirt/node/setup/remote_storage_page.py
diff --git a/src/tui/src/ovirt/node/setup/security_page.py b/src/ovirt/node/setup/security_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/security_page.py
rename to src/ovirt/node/setup/security_page.py
diff --git a/src/tui/src/ovirt/node/setup/snmp_page.py b/src/ovirt/node/setup/snmp_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/snmp_page.py
rename to src/ovirt/node/setup/snmp_page.py
diff --git a/src/tui/src/ovirt/node/setup/status_page.py b/src/ovirt/node/setup/status_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/status_page.py
rename to src/ovirt/node/setup/status_page.py
diff --git a/src/tui/src/ovirt/node/setup/support_page.py b/src/ovirt/node/setup/support_page.py
similarity index 100%
rename from src/tui/src/ovirt/node/setup/support_page.py
rename to src/ovirt/node/setup/support_page.py
diff --git a/src/tui/src/ovirt/node/ui/__init__.py b/src/ovirt/node/ui/__init__.py
similarity index 100%
rename from src/tui/src/ovirt/node/ui/__init__.py
rename to src/ovirt/node/ui/__init__.py
diff --git a/src/tui/src/ovirt/node/ui/urwid_builder.py b/src/ovirt/node/ui/urwid_builder.py
similarity index 100%
rename from src/tui/src/ovirt/node/ui/urwid_builder.py
rename to src/ovirt/node/ui/urwid_builder.py
diff --git a/src/tui/src/ovirt/node/ui/widgets.py b/src/ovirt/node/ui/widgets.py
similarity index 100%
rename from src/tui/src/ovirt/node/ui/widgets.py
rename to src/ovirt/node/ui/widgets.py
diff --git a/src/tui/src/ovirt/node/utils/__init__.py b/src/ovirt/node/utils/__init__.py
similarity index 100%
rename from src/tui/src/ovirt/node/utils/__init__.py
rename to src/ovirt/node/utils/__init__.py
diff --git a/src/tui/src/ovirt/node/utils/console.py b/src/ovirt/node/utils/console.py
similarity index 100%
rename from src/tui/src/ovirt/node/utils/console.py
rename to src/ovirt/node/utils/console.py
diff --git a/src/tui/src/ovirt/node/utils/fs.py b/src/ovirt/node/utils/fs.py
similarity index 100%
rename from src/tui/src/ovirt/node/utils/fs.py
rename to src/ovirt/node/utils/fs.py
diff --git a/src/tui/src/ovirt/node/utils/network.py b/src/ovirt/node/utils/network.py
similarity index 100%
rename from src/tui/src/ovirt/node/utils/network.py
rename to src/ovirt/node/utils/network.py
diff --git a/src/tui/src/ovirt/node/utils/process.py b/src/ovirt/node/utils/process.py
similarity index 100%
rename from src/tui/src/ovirt/node/utils/process.py
rename to src/ovirt/node/utils/process.py
diff --git a/src/tui/src/ovirt/node/utils/security.py b/src/ovirt/node/utils/security.py
similarity index 100%
rename from src/tui/src/ovirt/node/utils/security.py
rename to src/ovirt/node/utils/security.py
diff --git a/src/tui/src/ovirt/node/utils/storage.py b/src/ovirt/node/utils/storage.py
similarity index 100%
rename from src/tui/src/ovirt/node/utils/storage.py
rename to src/ovirt/node/utils/storage.py
diff --git a/src/tui/src/ovirt/node/utils/system.py b/src/ovirt/node/utils/system.py
similarity index 100%
rename from src/tui/src/ovirt/node/utils/system.py
rename to src/ovirt/node/utils/system.py
diff --git a/src/tui/src/ovirt/node/utils/virt.py b/src/ovirt/node/utils/virt.py
similarity index 100%
rename from src/tui/src/ovirt/node/utils/virt.py
rename to src/ovirt/node/utils/virt.py
diff --git a/src/tui/src/ovirt/node/valid.py b/src/ovirt/node/valid.py
similarity index 100%
rename from src/tui/src/ovirt/node/valid.py
rename to src/ovirt/node/valid.py
diff --git a/src/tui/makefile.legacy b/src/tui/makefile.legacy
deleted file mode 100644
index 75fd139..0000000
--- a/src/tui/makefile.legacy
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-NAME=ovirt-node-molch-plugin
-
-HASH=$(shell git describe --always)
-DATE=$(shell date '+%Y%m%d%H%M%S')
-VERSION=git$(HASH)
-
-DISTARCHIVE=$(NAME)-$(VERSION).tar.gz
-
-ifndef python
- python := "python"
-endif
-
-
-.PHONY: rpm scm_hash.txt
-
-
-all:
- @echo targets: rpm, build, dist, install
-
-
-rpm: clean dist check
- rpmbuild -ta dist/$(DISTARCHIVE)
-
-scm_hash.txt:
- echo "$(HASH)" > scm_hash.txt
-
-check: scm_hash.txt
- rpmlint -v *.spec
-
-dist: clean-dist scm_hash.txt
- ${python} setup.py sdist --format=tar
- tar rvf dist/*.tar scm_hash.txt *.spec
- gzip dist/*.tar
- cd dist ; ln -s *.tar.gz $(DISTARCHIVE)
-
-build:
- ${python} setup.py build
-
-install:
- ${python} setup.py install --prefix=$(prefix) --root=$(root)
-
-clean: clean-dist
- -rm -f *~ scm_hash.txt
-
-clean-dist:
- -rm -f dist/*
diff --git a/src/tui/setup.py b/src/tui/setup.py
deleted file mode 100644
index 4f4a6e5..0000000
--- a/src/tui/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-
-from distutils.core import setup
-
-setup(name='ovirt-node-molch',
- version='0.0.1',
- description='oVirt Node Configuration TUI',
- author='Fabian Deutsch',
- author_email='fabiand at fedoraproject.org',
- url='http://www.ovirt.org/',
- license="GPLv2+",
- scripts=[
-# "bin/ovirt-config-setup",
-# "bin/ovirt-node-installer",
-# "bin/ovirt-node-doc"
- ],
- package_dir = {'': 'src'},
- packages=[
- 'ovirt',
- 'ovirt.node',
- 'ovirt.node.ui',
- 'ovirt.node.utils',
- 'ovirt.node.config',
- 'ovirt.node.setup',
- 'ovirt.node.installer',
- ],
-# data_files=[('extra', ['scm_hash.txt',
-# 'Makefile'
-# ]),
-# ]
-)
--
To view, visit http://gerrit.ovirt.org/14001
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If2f8b2924014634b6085fb3caca9548b2eaf598a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>
More information about the node-patches
mailing list