[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-151-g98d2149
X2Go dev team
git-admin at x2go.org
Sun Apr 1 17:41:36 CEST 2012
The branch, master has been updated
via 98d21490291ad4781df8ca7859b91c40e587d035 (commit)
from d09e0a3ca8e61395093bbcd71d2c6e92a02042bf (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 -----------------------------------------------------------------
commit 98d21490291ad4781df8ca7859b91c40e587d035
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Apr 1 17:41:32 2012 +0200
fully add/fix setup support for parameter program version
-----------------------------------------------------------------------
Summary of changes:
setup.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/setup.py b/setup.py
index 1829eaf..ee20f1f 100755
--- a/setup.py
+++ b/setup.py
@@ -70,9 +70,10 @@ class NSISScript(object):
NSIS_COMPILE = "makensis"
- def __init__(self, program_name, program_desc, dist_dir, icon_loc):
+ def __init__(self, program_name, program_desc, program_version, dist_dir, icon_loc):
self.program_name = program_name
self.program_desc = program_desc
+ self.program_version = program_version
self.dist_dir = dist_dir
self.icon_loc = icon_loc
self.pathname = "setup_%s.nsi" % self.program_name
@@ -80,6 +81,7 @@ class NSISScript(object):
def create(self):
contents = NSIS_SCRIPT_TEMPLATE.format(
program_name = self.program_name,
+ program_version = self.program_version,
program_desc = self.program_desc,
output_dir = self.dist_dir,
icon_location = os.path.join(self.dist_dir, self.icon_loc))
@@ -114,6 +116,7 @@ class build_installer(py2exe):
script = NSISScript(
PROGRAM_NAME,
PROGRAM_DESC,
+ PROGRAM_VERSION,
dist_dir,
os.path.normpath(PROGRAM_ICON)
)
@@ -175,7 +178,7 @@ setup(
windows = [
{
"script": "pyhoca-gui",
- "icon_resources": [(0, PROGRAM_ICON)],
+ "icon_resources": [(0, os.path.normpath(PROGRAM_ICON))],
"dest_base": PROGRAM_NAME,
},
],
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