The branch, twofactorauth has been updated via 9b92411cdd18e31b8f62f9a4497b4dada17ca046 (commit) from ad269f346a3c24fd74d92d10acb7ff6c81e6eca5 (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 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/setup.py b/setup.py index 73557ce..621e326 100755 --- a/setup.py +++ b/setup.py @@ -18,6 +18,13 @@ # Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +import gevent.monkey +gevent.monkey.patch_all() + +from glob import glob +import py2exe +import platform + from setuptools import setup, find_packages from distutils.core import setup from DistUtilsExtra.command import * @@ -26,6 +33,37 @@ import os # import the PyHoca-GUI import pyhoca.wxgui +# +# to build .exe file, run on Windows +# with: ,,python setup.py py2exe -p greenlet'' +# + + + +if platform.system() == 'Windows': + try: + # 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\\*.*'))] + pulseaudio_files = [("pulseaudio", glob(r'..\\..\\contrib\\pulseaudio-mswin\\pulseaudio-0.9.6\\*.*'))] + except: + # building from tag + 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\\*.*'))] + pulseaudio_files = [("pulseaudio", glob(r'..\\..\\..\\..\\contrib\\pulseaudio-mswin\\pulseaudio-0.9.6\\*.*'))] + + 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\\*.*')), + ("PyHoca_GUI.egg-infocons\\PyHoca\\128x128", glob(r'icons\\PyHoca\\128x128\\*.*')), + ("icons", glob(r'pixmaps\\*.ico')), + ] + img_files = [("img", glob(r'img\\*.*'))] + setup( name = "pyhoca-gui", version = pyhoca.wxgui.__VERSION__, @@ -40,5 +78,22 @@ setup( "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, + 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)).