The branch, twofactorauth has been updated via b06df313b1a98fb79d3ac89d995f872214caa1c1 (commit) from 9b92411cdd18e31b8f62f9a4497b4dada17ca046 (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.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/setup.py b/setup.py index 621e326..99a921d 100755 --- a/setup.py +++ b/setup.py @@ -21,9 +21,10 @@ import gevent.monkey gevent.monkey.patch_all() -from glob import glob -import py2exe import platform +if platform.system() == 'Windows': + import py2exe +from glob import glob from setuptools import setup, find_packages from distutils.core import setup @@ -39,12 +40,12 @@ import pyhoca.wxgui # - +data_files = [] if platform.system() == 'Windows': try: - # building from trunk + # building from trunk dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\..\\contrib\\ms-vc-runtime\\*.*'))] - nxproxy_files = [("nxproxy", glob(r'..\\..\\contrib\\nxproxy-mswin\\nxproxy-3.0.4-2\\*.*'))] + nxproxy_files = [("nxproxy", glob(r'..\\..\\contrib\\nxproxy-mswin\\nxproxy-3.0.4-2\\*.*'))] pulseaudio_files = [("pulseaudio", glob(r'..\\..\\contrib\\pulseaudio-mswin\\pulseaudio-0.9.6\\*.*'))] except: # building from tag @@ -63,7 +64,15 @@ if platform.system() == 'Windows': ("icons", glob(r'pixmaps\\*.ico')), ] img_files = [("img", glob(r'img\\*.*'))] - + + data_files = data_files.extend([ "pixmaps/pyhoca-gui.ico", ] + + dll_data_files + + icon_files + + img_files + + nxproxy_files + ) + + setup( name = "pyhoca-gui", version = pyhoca.wxgui.__VERSION__, @@ -77,20 +86,14 @@ setup( cmdclass = { "build" : build_extra.build_extra, "build_i18n" : build_i18n.build_i18n, "clean": clean_i18n.clean_i18n, - } + }, windows = [ { "script": "pyhoca-gui", "icon_resources": [(0, "pixmaps/pyhoca_x2go-logo-ubuntu.ico")], - } + }, ], - data_files=[ - "pixmaps/pyhoca-gui.ico", - ] + - dll_data_files + - icon_files + - img_files + - nxproxy_files, + data_files=data_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)).