The branch, twofactorauth has been updated via 56c4c6129f854ad28a27ba14852577171e2ec51b (commit) from b22882f4a7f3507b3dcba16ba1e5e607cf85390f (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: setup_py2exe.py | 156 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 76 deletions(-) The diff of changes is: diff --git a/setup_py2exe.py b/setup_py2exe.py index 23ede8c..ba397f4 100644 --- a/setup_py2exe.py +++ b/setup_py2exe.py @@ -1,76 +1,80 @@ -#!/usr/bin/python - -import gevent.monkey -gevent.monkey.patch_all() - -from distutils.core import setup -from glob import glob -import py2exe - -manifest = """ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" -manifestVersion="1.0"> -<assemblyIdentity - version="0.0.15" - processorArchitecture="x86" - name="Controls" - type="win32" -/> -<description>PyHoca-GUI</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> -</dependency> -</assembly> -""" - -""" -installs manifest and icon into the .exe -but icon is still needed as we open it -for the window icon (not just the .exe) -changelog and logo are included in dist -""" - -dll_data_files = [("Microsoft.VC90.CRT", glob(r'contrib\\ms-vc-runtime\\*.*'))] -icon_files = [ - ("icons\\PyHoca\\16x16", glob(r'icons\\PyHoca\\16x16\\*.*')), - ("icons\\PyHoca\\22x22", glob(r'icons\\PyHoca\\22x22\\*.*')), - ("icons\\PyHoca\\32x32", glob(r'icons\\PyHoca\\32x32\\pyhoca-*.*')), - ("icons\\PyHoca\\32x32", glob(r'icons\\PyHoca\\32x32\\x2go*.*')), - ("icons\\PyHoca\\48x48", glob(r'icons\\PyHoca\\48x48\\*.*')), - ("icons\\PyHoca\\64x64", glob(r'icons\\PyHoca\\64x64\\*.*')), - ("icons\\PyHoca\\128x128", glob(r'icons\\PyHoca\\128x128\\*.*')) - ] -img_files = [("img", glob(r'img\\*.*'))] -nxproxy_files = [("nxproxy", glob(r'contrib\\nxproxy-mswin\\*.*'))] - -setup( - windows = [ - { - "script": "pyhoca-gui", - "icon_resources": [(1, "pixmaps/pyhoca-gui.ico")], - #"other_resources": [(24,1,manifest)] - } - ], - data_files=[ - "pixmaps/pyhoca-gui.ico", - ] + - dll_data_files + - icon_files + - img_files + - nxproxy_files, - options={ - 'py2exe': { - 'dll_excludes': ['MSVCP90.DLL'], - } - } -) - +#!/usr/bin/python + +# +# run on Windows with: ,,python setup_py2exe.py py2exe -p greenlet'' +# + +import gevent.monkey +gevent.monkey.patch_all() + +from distutils.core import setup +from glob import glob +import py2exe + +manifest = """ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" +manifestVersion="1.0"> +<assemblyIdentity + version="0.0.15" + processorArchitecture="x86" + name="Controls" + type="win32" +/> +<description>PyHoca-GUI</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> +</dependency> +</assembly> +""" + +""" +installs manifest and icon into the .exe +but icon is still needed as we open it +for the window icon (not just the .exe) +changelog and logo are included in dist +""" + +dll_data_files = [("Microsoft.VC90.CRT", glob(r'contrib\\ms-vc-runtime\\*.*'))] +icon_files = [ + ("icons\\PyHoca\\16x16", glob(r'icons\\PyHoca\\16x16\\*.*')), + ("icons\\PyHoca\\22x22", glob(r'icons\\PyHoca\\22x22\\*.*')), + ("icons\\PyHoca\\32x32", glob(r'icons\\PyHoca\\32x32\\pyhoca-*.*')), + ("icons\\PyHoca\\32x32", glob(r'icons\\PyHoca\\32x32\\x2go*.*')), + ("icons\\PyHoca\\48x48", glob(r'icons\\PyHoca\\48x48\\*.*')), + ("icons\\PyHoca\\64x64", glob(r'icons\\PyHoca\\64x64\\*.*')), + ("icons\\PyHoca\\128x128", glob(r'icons\\PyHoca\\128x128\\*.*')) + ] +img_files = [("img", glob(r'img\\*.*'))] +nxproxy_files = [("nxproxy", glob(r'contrib\\nxproxy-mswin\\*.*'))] + +setup( + windows = [ + { + "script": "pyhoca-gui", + "icon_resources": [(1, "pixmaps/pyhoca-gui.ico")], + #"other_resources": [(24,1,manifest)] + } + ], + data_files=[ + "pixmaps/pyhoca-gui.ico", + ] + + dll_data_files + + icon_files + + img_files + + nxproxy_files, + options={ + 'py2exe': { + 'dll_excludes': ['MSVCP90.DLL'], + } + } +) + 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)).