[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-154-g8fb7bb5
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:12 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 8fb7bb58ac12e283ad978b93500e58d2fd8d9467 (commit)
from 2af9814fdec18b6fedf41c043bbd81e6d41efb7b (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:
pyhoca-gui | 38 ++++++++++++++++++++++++++++++-----
pyhoca/wxgui/frontend.py | 2 +-
setup.py | 49 ++++++++++++++++++++++++++--------------------
3 files changed, 62 insertions(+), 27 deletions(-)
The diff of changes is:
diff --git a/pyhoca-gui b/pyhoca-gui
index 007ffae..852ade5 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -21,6 +21,38 @@
modules ={}
+import sys
+import os
+PROG_NAME = os.path.basename(sys.argv[0]).replace('.exe', '')
+PROG_PID = os.getpid()
+
+if hasattr(sys, 'frozen') and sys.frozen in ("windows_exe", "console_exe"):
+ class Win32_Logging(object):
+ softspace = 0
+ _fname = os.path.join(os.environ['AppData'], PROG_NAME, '%s.log' % PROG_NAME)
+ _file = None
+ def write(self, text, **kwargs):
+ if self._file is None:
+ try:
+ try:
+ os.mkdir(os.path.dirname(self._fname))
+ except:
+ pass
+ self._file = open(self._fname, 'w+')
+ except:
+ pass
+ else:
+ self._file.write(text)
+ self._file.flush()
+
+ def flush(self):
+ if self._file is not None:
+ self._file.flush()
+
+ sys.stdout = Win32_Logging()
+ sys.stderr = Win32_Logging()
+ del Win32_Logging
+
import gevent
import gevent.monkey
gevent.monkey.patch_all()
@@ -38,15 +70,11 @@ except: pass
import argparse
import os
-import sys
import exceptions
import locale
import gettext
import wx
-PROG_NAME = os.path.basename(sys.argv[0])
-PROG_PID = os.getpid()
-
from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS
if _X2GOCLIENT_OS in ('Linux', 'Mac'):
@@ -141,7 +169,6 @@ if _X2GOCLIENT_OS == 'Windows':
_known_xservers = _x.known_xservers
_installed_xservers = _x.installed_xservers
-
if _X2GOCLIENT_OS == 'Windows':
_config_backends = ('FILE', 'WINREG')
elif _X2GOCLIENT_OS == 'Linux':
@@ -338,3 +365,4 @@ def main():
if __name__ == '__main__':
main()
+
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index fb8e32c..e771827 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -67,7 +67,7 @@ import splash
import sessiontitle
wx.SetDefaultPyEncoding("utf-8")
-wx.InitAllImageHandlers()
+#wx.InitAllImageHandlers()
def SetExitHandler(func):
diff --git a/setup.py b/setup.py
index 1ca1150..98ce9b4 100755
--- a/setup.py
+++ b/setup.py
@@ -18,6 +18,21 @@
# Free Software Foundation, Inc.,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# import the PyHoca-GUI
+import sys
+import os
+import pyhoca.wxgui
+
+PROGRAM_NAME = 'PyHoca-GUI'
+PROGRAM_DESC = '%s is a cross-platform (Windows, MacOS X, Linux) graphical X2Go client.' % PROGRAM_NAME
+PROGRAM_VERSION = pyhoca.wxgui.__VERSION__
+PROGRAM_ICON = "pixmaps/pyhoca_x2go-logo-ubuntu.ico"
+LICENSE = 'GPLv3+'
+AUTHOR = 'Mike Gabriel, Dick Kniep'
+URL = 'http://www.x2go.org'
+LIBRARY_ZIP = r"lib\shardlib.zip"
+NSIS_COMPILE = os.path.join(os.environ['ProgramFiles'], 'NSIS', 'makensis.exe')
+
import platform
from setuptools import setup, find_packages
from distutils.core import setup
@@ -25,29 +40,16 @@ if platform.system() == 'Windows':
from py2exe.build_exe import py2exe
import os, os.path
import subprocess
+ sys.path.append(os.path.normpath('../pyhoca-contrib/mswin/ms-vc-runtime'))
elif platform.system() == 'Linux':
from DistUtilsExtra.command import *
py2exe = object
from glob import glob
-import os
-
-# import the PyHoca-GUI
-import pyhoca.wxgui
from nsis_template import NSIS_SCRIPT_TEMPLATE
-PROGRAM_NAME = 'PyHoca-GUI'
-PROGRAM_DESC = '%s is a cross-platform (Windows, MacOS X, Linux) graphical X2Go client.' % PROGRAM_NAME
-PROGRAM_VERSION = pyhoca.wxgui.__VERSION__
-PROGRAM_ICON = "pixmaps/pyhoca_x2go-logo-ubuntu.ico"
-LICENSE = 'GPLv3+'
-AUTHOR = 'Mike Gabriel, Dick Kniep'
-URL = 'http://www.x2go.org'
-
-NSIS_COMPILE = os.path.join(os.environ['ProgramFiles'], 'NSIS', 'makensis.exe')
-
#
# to build .exe file, run on Windows:
# ,,python setup.py py2exe''
@@ -106,12 +108,16 @@ class build_installer(py2exe):
# This class first builds the exe file(s), then creates an NSIS installer
# that runs your program from a temporary directory.
+
def run(self):
+
# First, let py2exe do it's work.
py2exe.run(self)
+
lib_dir = self.lib_dir
dist_dir = self.dist_dir
+
# Create the installer, using the files py2exe has created.
script = NSISScript(
PROGRAM_NAME,
@@ -125,9 +131,6 @@ class build_installer(py2exe):
print "*** compiling the NSIS setup script***"
script.compile()
-
-zipfile = r"lib\shardlib"
-
if platform.system() == 'Windows':
dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\pyhoca-contrib\\mswin\\ms-vc-runtime\\*.*'))]
@@ -137,9 +140,9 @@ if platform.system() == 'Windows':
icon_files = datafilelist('icons\\PyHoca', r'icons\\PyHoca')
img_files = [("img", glob(r'img\\*.*'))]
- i18n_files = datafilelist('mo', r'build\\mo\\en\\LC_MESSAGES')
+ i18n_files = datafilelist('mo', r'build\\mo')
- data_files.extend([ "pixmaps\\pyhoca-gui.ico", ] +
+ data_files.extend([ ('icons', ["pixmaps\\pyhoca-gui.ico"]), ] +
dll_data_files +
icon_files +
img_files +
@@ -183,10 +186,14 @@ setup(
},
],
data_files=data_files,
- zipfile = zipfile,
+ zipfile = LIBRARY_ZIP,
options={
'py2exe': {
- 'dll_excludes': ['MSVCP90.DLL'],
+ 'includes': ['greenlet'],
+ 'compressed': 1,
+ 'optimize': 2,
+ },
+ 'build_exe': {
'includes': ['greenlet'],
'compressed': 1,
'optimize': 2,
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