This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 90c832e961f351d42df3851c5596e9c11882c20d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 20 22:35:55 2014 +0100 CVix: start on the inclusion of gsprint.exe in the installer --- CVix_nsis_template.py | 25 +++++++++++++++++++++++-- CVix_setup.py | 5 ++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 7503968..0fd256d 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -24,6 +24,14 @@ NSIS_SCRIPT_TEMPLATE = """ !define VERSION {program_version} +var GSCRIPT_VERSION +var GSVIEW_VERSION +var GSCRIPT_INSTALLER + +StrgCopy $GSCRIPT_VERSION "9.10" +StrgCopy $GSVIEW_VERSION "5.0" +StrgCopy $GSCRIPT_INSTALLER "gs910w32.exe" + ;-------------------------------- ; The name of the installer @@ -159,7 +167,6 @@ var REQUIRED var DESKTOP_LINKS var STARTMENU_LINKS var WITHOUT_PULSEAUDIO -var GSPRINT Function .onInit @@ -247,7 +254,7 @@ Section "{program_name} ($REQUIRED)" ; Empty $INSTDIR before writing new files to it. RmDir /r "$INSTDIR\\*.*" ; Install new files... - File /r /x .svn /x .git "${{distOutputDirectory}}\\*.*" + File /r /x .svn /x .git /x ghostscript /x gsview "${{distOutputDirectory}}\\*.*" ; Copy CVix_customer and CVix_customer.key into $INSTDIR CopyFiles "$EXEDIR\\CVix_customer" "$INSTDIR" @@ -265,6 +272,20 @@ Section "{program_name} ($REQUIRED)" SectionEnd +Section "Ghostscript ($GSCRIPT_VERSION)" + + File "ghostscript\\$GSCRIPT_INSTALLER" + ExecWait "ghostscript\\$GSCRIPT_INSTALLER /S" + +SectionEnd + +Section "GSView ($GSVIEW_VERSION)" + + File "gsview\\setup.exe" + ExecWait "gsview\\setup.exe" + +SectionEnd + ; Optional section (can be disabled by the user) Section "$STARTMENU_LINKS" diff --git a/CVix_setup.py b/CVix_setup.py index 23683d3..9c42124 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -20,6 +20,7 @@ import sys import os +from glob import glob PROGRAM_NAME = 'CVix' SCRIPT_NAME = 'CVix.py' @@ -52,7 +53,9 @@ pyhoca_setup.PROGRAM_VERSION = PROGRAM_VERSION if platform.system() == 'Windows': CVix_icon_files = pyhoca_setup.datafilelist('icons\\CVix', r'icons\\CVix') - CVix_data_files = CVix_icon_files + CVix_gscript_files = [("ghostscript", ['..\\pyhoca-contrib\\mswin\\ghostscript-mswin\\gs910w32.exe'])] + CVix_gsview_files = [("ghostview", glob(r'..\\pyhoca-contrib\\mswin\\ghostview-mswin\\gsview-5.0-win32\\*.*'))] + CVix_data_files = CVix_icon_files + CVix_gscript_files + CVix_gsview_files elif platform.system() == 'Linux': CVix_icon_files = pyhoca_setup.datafilelist('{prefix}/share/icons/CVix'.format(prefix=sys.prefix), r'icons/CVix') -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git