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

X2Go dev team git-admin at x2go.org
Thu Mar 29 13:05:34 CEST 2012


The branch, master has been updated
       via  65bfa51a7d23aeba4c6517d6a5b11dfa5a8ecdad (commit)
      from  37ad86afa0b4aba68d66e2399d364d7c0987d5ba (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 65bfa51a7d23aeba4c6517d6a5b11dfa5a8ecdad
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 29 13:05:32 2012 +0200

    improve file bundling

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

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

The diff of changes is:
diff --git a/setup.py b/setup.py
index 044c2a0..6b8234e 100755
--- a/setup.py
+++ b/setup.py
@@ -42,19 +42,21 @@ import pyhoca.wxgui
 cmd_class = {}
 data_files = []
 
-def filelist(basepath):
-    fileList = []
-    for root, subFolders, files in os.walk(basepath):
-        for file in files:
-            fileList.append(os.path.join(root,file))
-    return fileList
+def datafilelist(installbase, sourcebase):
+    datafileList = []
+    for root, subFolders, files in os.walk(sourcebase):
+        fileList = []
+        for f in files:
+            fileList.append(os.path.join(root, f))
+        datafileList.append((root.replace(sourcebase, installbase), fileList))
+    return datafileList
 
 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", filelist(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0'))]
+    xserver_files = [datafilelist('vcxsrv', 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