This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from cdbd31f Correct changelog to specify that last commit was Windows-specific new 0d03b6d Windows: Use Unicode NSIS instead of regular NSIS The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ setup.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 0d03b6dc10d204e1cbae4ee0dfe52a52f7d0d2cb Author: Mike DePaulo <mikedep333@gmail.com> Date: Sun Jul 6 13:27:22 2014 -0400 Windows: Use Unicode NSIS instead of regular NSIS --- debian/changelog | 2 ++ setup.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fbc011d..1a321a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,8 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low * New upstream version (0.5.0.0): - Windows: Upgrade PulseAudio from 1.1 to 5.0-rev18 from OBS. Fixes choppy sound in Adobe Flash Player (Fixes: #533) + - Windows: Use Unicode NSIS instead of regular NSIS. + See x2goclient bug #528 for reasoning. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/setup.py b/setup.py index f8ea22c..1fd6e1e 100755 --- a/setup.py +++ b/setup.py @@ -21,6 +21,7 @@ # import the PyHoca-GUI import sys import os +import platform PROGRAM_NAME = 'PyHoca-GUI' SCRIPT_NAME = 'pyhoca-gui' @@ -35,15 +36,26 @@ AUTHOR = 'Mike Gabriel, Dick Kniep' URL = 'http://www.x2go.org' LIBRARY_ZIP = r"lib\shardlib.zip" +if platform.system() == 'Windows': + REGULAR_NSIS = os.path.join(os.environ['ProgramFiles'], 'NSIS', 'makensis.exe') + UNICODE_NSIS = os.path.join(os.environ['ProgramFiles'], 'NSIS','Unicode', 'makensis.exe') + from setuptools import setup, find_packages from distutils.core import setup, Command -import platform base = None executables = [] if platform.system() == 'Windows': default_win32exe_freezer = 'bbfreeze' - NSIS_COMPILE = os.path.join(os.environ['ProgramFiles'], 'NSIS', 'makensis.exe') + + # Prefer Unicode NSIS over regular NSIS. + # See x2goclient bug #528 for reasoning. + # This should be reevaluated once regular NSIS 3.0 is released. + if os.path.isfile(UNICODE_NSIS): + NSIS_COMPILE = UNICODE_NSIS + else: + NSIS_COMPILE = REGULAR_NSIS + if 'build_with_py2exe' in (sys.argv[1], 'build_with_{freezer}'.format(freezer=default_win32exe_freezer)): from py2exe.build_exe import py2exe Freezer = object -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org