[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-145-g3d5158e

X2Go dev team git-admin at x2go.org
Thu Mar 29 12:35:52 CEST 2012


The branch, master has been updated
       via  3d5158efbe73b01cc98483e82ce87949abfcf1eb (commit)
      from  153a57fe55d6e1fd5583ae6b1a26e2fa3280e8f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3d5158efbe73b01cc98483e82ce87949abfcf1eb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 29 12:35:49 2012 +0200

    render our own filelist (instead of using glob)

-----------------------------------------------------------------------

Summary of changes:
 setup.py |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/setup.py b/setup.py
index 0092b3e..ebf8603 100755
--- a/setup.py
+++ b/setup.py
@@ -42,17 +42,18 @@ import pyhoca.wxgui
 cmd_class = {}
 data_files = []
 
+def filelist(basepath):
+    for root, subFolders, files in os.walk(basepath):
+        for file in files:
+            fileList.append(os.path.join(root,file))
+    return fileList
+
 if platform.system() == 'Windows':
     # building from trunk
     dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\pyhoca-contrib\\mswin\\ms-vc-runtime\\*.*'))]
     nxproxy_files = [("nxproxy", glob(r'..\\pyhoca-contrib\\mswin\\nxproxy-mswin\\nxproxy-3.0.4-2\\*.*'))]
     pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-1.0dev-1090.4\\*.*'))]
-    xserver_files = [("vcxsrv", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\*'))] + \
-                    [("vcxsrv", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\.Xdefaults'))] + \
-                    [("vcxsrv\\locale", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\locale\\*'))] + \
-                    [("vcxsrv\\locale", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\locale\\*\\*'))] + \
-                    [("vcxsrv\\xkbdata", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\xkbdata\\*'))] + \
-                    [("vcxsrv\\xkbdata", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\xkbdata\\*\\*'))]
+    xserver_files = [("vcxsrv", filelist(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0'))]
 
     icon_files = [
         ("icons\\PyHoca\\16x16", glob(r'icons\\PyHoca\\16x16\\*.*')),


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).




More information about the x2go-commits mailing list