appmenus: use setuptools for packaging

QubesOS/qubes-issues#1897

appmenus-scripts/qubes.SyncAppMenus

@@ -1 +0,0 @@
-/usr/libexec/qubes-appmenus/qubes-receive-appmenus

appmenus-scripts/qvm-sync-appmenus

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/libexec/qubes-appmenus/qubes-receive-appmenus $@

qubesappmenus/qubes.SyncAppMenus

@@ -0,0 +1 @@
+/usr/bin/qvm-sync-appmenus

qubesappmenus/receive.py

@@ -389,5 +389,3 @@ def main():
             subprocess.call(['kbuildsycoca' + os.environ.get('KDE_SESSION_VERSION', '4')])
         os.unsetenv('SKIP_CACHE_REBUILD')
 
-
-main()

rpm_spec/core-dom0-linux.spec

@@ -75,8 +75,7 @@ ln -sf . %{name}-%{version}
 %setup -T -D
 
 %build
-python -m compileall appmenus-scripts
-python -O -m compileall appmenus-scripts
+python setup.py build
 (cd dom0-updates; make)
 (cd qrexec; make)
 (cd file-copy-vm; make)
@@ -85,21 +84,14 @@ python -O -m compileall appmenus-scripts
 %install
 
 ### Appmenus
-
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/qubes/modules
-cp appmenus-scripts/qubes-core-appmenus.py $RPM_BUILD_ROOT%{python_sitearch}/qubes/modules/10appmenus.py
-cp appmenus-scripts/qubes-core-appmenus.pyc $RPM_BUILD_ROOT%{python_sitearch}/qubes/modules/10appmenus.pyc
-cp appmenus-scripts/qubes-core-appmenus.pyo $RPM_BUILD_ROOT%{python_sitearch}/qubes/modules/10appmenus.pyo
+python setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/usr/libexec/qubes-appmenus
-cp appmenus-scripts/*.sh $RPM_BUILD_ROOT/usr/libexec/qubes-appmenus/
-cp appmenus-scripts/qubes-receive-appmenus $RPM_BUILD_ROOT/usr/libexec/qubes-appmenus/
-
-install -D appmenus-scripts/qvm-sync-appmenus $RPM_BUILD_ROOT/usr/bin/qvm-sync-appmenus
+cp qubesappmenus/*.sh $RPM_BUILD_ROOT/usr/libexec/qubes-appmenus/
 
 mkdir -p $RPM_BUILD_ROOT/etc/qubes-rpc/policy
-cp appmenus-scripts/qubes.SyncAppMenus $RPM_BUILD_ROOT/etc/qubes-rpc/
-cp appmenus-scripts/qubes.SyncAppMenus.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.SyncAppMenus
+cp qubesappmenus/qubes.SyncAppMenus $RPM_BUILD_ROOT/etc/qubes-rpc/
+cp qubesappmenus/qubes.SyncAppMenus.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.SyncAppMenus
 
 mkdir -p $RPM_BUILD_ROOT/usr/share/qubes-appmenus/
 cp -r appmenus-files/* $RPM_BUILD_ROOT/usr/share/qubes-appmenus/
@@ -219,15 +211,15 @@ chmod -x /etc/grub.d/10_linux
 %files
 %attr(2775,root,qubes) %dir /etc/qubes-rpc
 %attr(2775,root,qubes) %dir /etc/qubes-rpc/policy
+%dir %{python_sitelib}/qubeslinux-*.egg-info
+%{python_sitelib}/qubeslinux-*.egg-info/*
+/usr/lib/python2.7/site-packages/qubesappmenus/__init__.py*
+/usr/lib/python2.7/site-packages/qubesappmenus/receive.py*
 /etc/qubes-rpc/policy/qubes.SyncAppMenus
 /etc/qubes-rpc/qubes.SyncAppMenus
-%{python_sitearch}/qubes/modules/10appmenus.py
-%{python_sitearch}/qubes/modules/10appmenus.pyc
-%{python_sitearch}/qubes/modules/10appmenus.pyo
 /usr/libexec/qubes-appmenus/convert-apptemplate2vm.sh
 /usr/libexec/qubes-appmenus/convert-dirtemplate2vm.sh
 /usr/libexec/qubes-appmenus/create-apps-for-appvm.sh
-/usr/libexec/qubes-appmenus/qubes-receive-appmenus
 /usr/libexec/qubes-appmenus/remove-appvm-appmenus.sh
 /usr/share/qubes-appmenus/qubes-appmenu-select.desktop
 /usr/share/qubes-appmenus/qubes-dispvm-firefox.desktop

setup.py

@@ -0,0 +1,25 @@
+# vim: fileencoding=utf-8
+
+import setuptools
+
+if __name__ == '__main__':
+    setuptools.setup(
+        name='qubeslinux',
+        version=open('version').read().strip(),
+        author='Invisible Things Lab',
+        author_email='woju@invisiblethingslab.com',
+        description='Qubes core-linux package',
+        license='GPL2+',
+        url='https://www.qubes-os.org/',
+
+        packages=('qubesappmenus',),
+
+        entry_points={
+            'console_scripts': [
+                'qvm-sync-appmenus = qubesappmenus.receive:main'
+            ],
+            'qubes.ext': [
+                'qubesappmenus = qubesappmenus:AppmenusExtension'
+            ],
+        }
+    )