[X2Go-Commits] [pyhoca-gui] 14/71: CVix: there can only be one setup object, import our setup as pyhoca_setup

git-admin at x2go.org git-admin at x2go.org
Thu Mar 20 00:32:42 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch cvix/2.x
in repository pyhoca-gui.

commit 1c761df827d6f616369ab19ad8f70bd303925014
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 5 23:41:13 2014 +0100

    CVix: there can only be one setup object, import our setup as pyhoca_setup
---
 CVix_setup.py |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/CVix_setup.py b/CVix_setup.py
index 3a7ac84..34306b6 100755
--- a/CVix_setup.py
+++ b/CVix_setup.py
@@ -33,22 +33,23 @@ AUTHOR = 'Mike Gabriel, Dick Kniep'
 URL = 'http://www.lindix.nl'
 LIBRARY_ZIP = r"lib\shardlib.zip"
 
+import setup as pyhoca_setup
+
 from setuptools import setup, find_packages
 from distutils.core import setup, Command
 import platform
 
-import setup
 from CVix_nsis_template import NSIS_SCRIPT_TEMPLATE
-# monkey patch setup.py
-setup.NSIS_SCRIPT_TEMPLATE = NSIS_SCRIPT_TEMPLATE
+# monkey patch pyhoca_setup.py
+pyhoca_setup.NSIS_SCRIPT_TEMPLATE = NSIS_SCRIPT_TEMPLATE
 
 
 if platform.system() == 'Windows':
-    CVix_icon_files = setup.datafilelist('icons\\CVix', r'icons\\CVix')
+    CVix_icon_files = pyhoca_setup.datafilelist('icons\\CVix', r'icons\\CVix')
     CVix_data_files = CVix_icon_files
 
 elif platform.system() == 'Linux':
-    CVix_icon_files = setup.datafilelist('{prefix}/share/icons/CVix'.format(prefix=sys.prefix), r'icons/CVix')
+    CVix_icon_files = pyhoca_setup.datafilelist('{prefix}/share/icons/CVix'.format(prefix=sys.prefix), r'icons/CVix')
     CVix_desktop_files = [
         ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/CVix.desktop')),
         ('{prefix}/share/pixmaps'.format(prefix=sys.prefix), glob('pixmaps/CVix.svg')),
@@ -58,7 +59,7 @@ elif platform.system() == 'Linux':
     ]
     CVix_data_files = CVix_icon_files + CVix_desktop_files + CVix_manpage_files
 
-setup.data_files.extend([ ('icons', ["pixmaps\\CVix.ico"]), ] + CVix_data_files)
+pyhoca_setup.data_files.extend([ ('icons', ["pixmaps\\CVix.ico"]), ] + CVix_data_files)
 
 setup(
     name = PROGRAM_NAME,
@@ -71,7 +72,7 @@ setup(
     packages = [ 'pyhoca.wxgui', ],
     package_dir = {'': '.'},
     install_requires = [ 'setuptools', ],
-    cmdclass = setup.cmd_class,
+    cmdclass = pyhoca_setup.cmd_class,
     windows = [
         {
             "script": "CVix.py",
@@ -79,8 +80,8 @@ setup(
             "dest_base": PROGRAM_NAME,
         },
     ],
-    data_files=setup.data_files,
+    data_files = pyhoca_setup.data_files,
     zipfile = LIBRARY_ZIP,
-    executables = setup.executables,
-    options=setup.cmd_options,
+    executables = pyhoca_setup.executables,
+    options = pyhoca_setup.cmd_options,
 )

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git



More information about the x2go-commits mailing list