From 4884435c2d95dbd2f7cae089839369aa0fa3f222 Mon Sep 17 00:00:00 2001 From: Enrico Faulhaber Date: Fri, 11 Oct 2019 10:38:02 +0200 Subject: [PATCH] fix packaging Change-Id: I073e9208fe6d7655d5bd89cd21252d8b10d46755 --- debian/rules | 39 ++++++--------------------------------- debian/secop-core.install | 34 ++++++---------------------------- debian/secop-demo.install | 5 +---- debian/secop-ess.install | 3 +-- debian/secop-gui.install | 31 ------------------------------- debian/secop-mlz.install | 4 +--- debian/secop-psi.install | 2 +- etc/secop.target | 5 ++--- 8 files changed, 18 insertions(+), 105 deletions(-) diff --git a/debian/rules b/debian/rules index f5a393e..c6d88ba 100755 --- a/debian/rules +++ b/debian/rules @@ -4,42 +4,15 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -DEBPYTHON_DEFAULT=3.6 -DEBPYTHON_SUPPORTED=3.6 -export DEBPYTHON_DEFAULT DEBPYTHON_SUPPORTED - -export PYBUILD_NAME = secop -export PYBUILD_TEST_PYTEST = 1 +export PYBUILD_DESTDIR_python3=debian/tmp/ +export PYBUILD_NAME=secop +export PYBUILD_TEST_PYTEST=1 override_dh_install: - @find debian -name '*.pyc' -exec rm \{\} \; - @find debian -type d -name '__pycache__' | xargs rmdir - - cp -aR debian/python3-secop/* debian/tmp - mv debian/tmp/usr/lib/python3.? debian/tmp/usr/lib/python3 - - @echo "regen debian/secop-core.install" - @echo "usr/bin/secop-server" > debian/secop-core.install - @echo "usr/bin/secop-console" >> debian/secop-core.install - @(cd debian/tmp; find . -name '*.py'| grep -v gui|grep /secop/; \ - find . -type f| grep egg-info; \ - find . -type f| grep RELEASE-VERSION; \ - find ./lib -type f; \ - find ./var -type f) | \ - while read f;do echo $${f#./}; done | cat >> debian/secop-core.install - - @echo "regen debian/secop-gui.install" - @echo "usr/bin/secop-gui" > debian/secop-gui.install - @echo "usr/bin/secop-cfg-editor" >> debian/secop-gui.install - @(cd debian/tmp; find . -type f|grep gui|grep /secop/) | \ - while read f;do echo $${f#./};done | cat >> debian/secop-gui.install - - @for facility in demo ess mlz psi;do \ - echo "regen debian/secop-$${facility}.install"; \ - (cd debian/tmp; find . -name '*.py'|grep /secop_$${facility}/) | \ - while read f;do echo $${f#./};done | cat > debian/secop-$${facility}.install; \ - done + rmdir debian/tmp + mv debian/python3-secop debian/tmp + #find debian/tmp -depth -name __pycache__ -type d -exec rm -r \{\} \; dh_install -i -O--buildsystem=pybuild dh_missing --fail-missing diff --git a/debian/secop-core.install b/debian/secop-core.install index acb1751..8de0915 100644 --- a/debian/secop-core.install +++ b/debian/secop-core.install @@ -1,5 +1,6 @@ usr/bin/secop-server usr/bin/secop-console +usr/lib/python3.7/dist-packages/secop/__init__.py usr/lib/python3.7/dist-packages/secop/errors.py usr/lib/python3.7/dist-packages/secop/modules.py usr/lib/python3.7/dist-packages/secop/features.py @@ -10,38 +11,15 @@ usr/lib/python3.7/dist-packages/secop/paths.py usr/lib/python3.7/dist-packages/secop/metaclass.py usr/lib/python3.7/dist-packages/secop/parse.py usr/lib/python3.7/dist-packages/secop/simulation.py -usr/lib/python3.7/dist-packages/secop/__init__.py usr/lib/python3.7/dist-packages/secop/params.py usr/lib/python3.7/dist-packages/secop/version.py -usr/lib/python3.7/dist-packages/secop/client/baseclient.py -usr/lib/python3.7/dist-packages/secop/client/__init__.py usr/lib/python3.7/dist-packages/secop/properties.py -usr/lib/python3.7/dist-packages/secop/protocol/__init__.py -usr/lib/python3.7/dist-packages/secop/protocol/messages.py -usr/lib/python3.7/dist-packages/secop/protocol/dispatcher.py -usr/lib/python3.7/dist-packages/secop/protocol/interface/zmq.py -usr/lib/python3.7/dist-packages/secop/protocol/interface/tcp.py -usr/lib/python3.7/dist-packages/secop/protocol/interface/__init__.py usr/lib/python3.7/dist-packages/secop/server.py -usr/lib/python3.7/dist-packages/secop/lib/pidfile.py -usr/lib/python3.7/dist-packages/secop/lib/parsing.py -usr/lib/python3.7/dist-packages/secop/lib/sequence.py -usr/lib/python3.7/dist-packages/secop/lib/__init__.py -usr/lib/python3.7/dist-packages/secop/lib/enum.py -usr/lib/python3.7/dist-packages/secop_core-0.8.1.post7+g697c.egg-info -usr/lib/python3.7/dist-packages/secop_core-0.8.1.post7+g697c.egg-info/PKG-INFO -usr/lib/python3.7/dist-packages/secop_core-0.8.1.post7+g697c.egg-info/dependency_links.txt -usr/lib/python3.7/dist-packages/secop_core-0.8.1.post7+g697c.egg-info/top_level.txt +usr/lib/python3.7/dist-packages/secop/__pycache__ +usr/lib/python3.7/dist-packages/secop/client +usr/lib/python3.7/dist-packages/secop/protocol +usr/lib/python3.7/dist-packages/secop/lib +usr/lib/python3.7/dist-packages/secop_core-* usr/lib/python3.7/dist-packages/secop/RELEASE-VERSION -lib lib/systemd -lib/systemd/system -lib/systemd/system/secop@.service -lib/systemd/system/secop.target -lib/systemd/system-generators -lib/systemd/system-generators/secop-generator -var -var/log var/log/secop -var/run -var/run/secop diff --git a/debian/secop-demo.install b/debian/secop-demo.install index cd5a898..10e29ea 100644 --- a/debian/secop-demo.install +++ b/debian/secop-demo.install @@ -1,4 +1 @@ -usr/lib/python3.7/dist-packages/secop_demo/modules.py -usr/lib/python3.7/dist-packages/secop_demo/cryo.py -usr/lib/python3.7/dist-packages/secop_demo/test.py -usr/lib/python3.7/dist-packages/secop_demo/__init__.py +usr/lib/python3.7/dist-packages/secop_demo diff --git a/debian/secop-ess.install b/debian/secop-ess.install index 6fc6087..91eea2a 100644 --- a/debian/secop-ess.install +++ b/debian/secop-ess.install @@ -1,2 +1 @@ -usr/lib/python3.7/dist-packages/secop_ess/__init__.py -usr/lib/python3.7/dist-packages/secop_ess/epics.py +usr/lib/python3.7/dist-packages/secop_ess diff --git a/debian/secop-gui.install b/debian/secop-gui.install index 6e8ee5a..a6dfe46 100644 --- a/debian/secop-gui.install +++ b/debian/secop-gui.install @@ -1,34 +1,3 @@ usr/bin/secop-gui usr/bin/secop-cfg-editor usr/lib/python3.7/dist-packages/secop/gui -usr/lib/python3.7/dist-packages/secop/gui/nodectrl.py -usr/lib/python3.7/dist-packages/secop/gui/icon_rc_qt4.py -usr/lib/python3.7/dist-packages/secop/gui/params -usr/lib/python3.7/dist-packages/secop/gui/params/__init__.py -usr/lib/python3.7/dist-packages/secop/gui/paramview.py -usr/lib/python3.7/dist-packages/secop/gui/qt.py -usr/lib/python3.7/dist-packages/secop/gui/icon_rc_qt5.py -usr/lib/python3.7/dist-packages/secop/gui/cfg_editor -usr/lib/python3.7/dist-packages/secop/gui/cfg_editor/utils.py -usr/lib/python3.7/dist-packages/secop/gui/cfg_editor/config_file.py -usr/lib/python3.7/dist-packages/secop/gui/cfg_editor/tree_widget_item.py -usr/lib/python3.7/dist-packages/secop/gui/cfg_editor/mainwindow.py -usr/lib/python3.7/dist-packages/secop/gui/cfg_editor/__init__.py -usr/lib/python3.7/dist-packages/secop/gui/cfg_editor/widgets.py -usr/lib/python3.7/dist-packages/secop/gui/cfg_editor/node_display.py -usr/lib/python3.7/dist-packages/secop/gui/modulectrl.py -usr/lib/python3.7/dist-packages/secop/gui/mainwindow.py -usr/lib/python3.7/dist-packages/secop/gui/__init__.py -usr/lib/python3.7/dist-packages/secop/gui/valuewidgets.py -usr/lib/python3.7/dist-packages/secop/gui/miniplot.py -usr/lib/python3.7/dist-packages/secop/gui/util.py -usr/lib/python3.7/dist-packages/secop/gui/ui -usr/lib/python3.7/dist-packages/secop/gui/ui/parambuttons.ui -usr/lib/python3.7/dist-packages/secop/gui/ui/modulectrl.ui -usr/lib/python3.7/dist-packages/secop/gui/ui/nodectrl.ui -usr/lib/python3.7/dist-packages/secop/gui/ui/modulebuttons.ui -usr/lib/python3.7/dist-packages/secop/gui/ui/parambuttons_select.ui -usr/lib/python3.7/dist-packages/secop/gui/ui/cmddialog.ui -usr/lib/python3.7/dist-packages/secop/gui/ui/cmdbuttons.ui -usr/lib/python3.7/dist-packages/secop/gui/ui/mainwindow.ui -usr/lib/python3.7/dist-packages/secop/gui/ui/paramview.ui diff --git a/debian/secop-mlz.install b/debian/secop-mlz.install index 7d0859b..a36d9cd 100644 --- a/debian/secop-mlz.install +++ b/debian/secop-mlz.install @@ -1,3 +1 @@ -usr/lib/python3.7/dist-packages/secop_mlz/amagnet.py -usr/lib/python3.7/dist-packages/secop_mlz/__init__.py -usr/lib/python3.7/dist-packages/secop_mlz/entangle.py +usr/lib/python3.7/dist-packages/secop_mlz diff --git a/debian/secop-psi.install b/debian/secop-psi.install index 2b8c974..aaeaabd 100644 --- a/debian/secop-psi.install +++ b/debian/secop-psi.install @@ -1 +1 @@ -usr/lib/python3.7/dist-packages/secop_psi/__init__.py +usr/lib/python3.?/dist-packages/secop_psi diff --git a/etc/secop.target b/etc/secop.target index 562789b..14deeb9 100644 --- a/etc/secop.target +++ b/etc/secop.target @@ -1,8 +1,7 @@ [Unit] Description=Start all SECoP SEC-nodes -Requires=network-online.service -Wants=network-online.service -After=network-online.service +Requires=network-online.target +After=network-online.target [Install] WantedBy=multi-user.target