[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-152-g4e59e6a

X2Go dev team git-admin at x2go.org
Tue Aug 27 13:22:12 CEST 2013


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  4e59e6aa657b0f49f43a923c1336954da7cd55e3 (commit)
      from  98d21490291ad4781df8ca7859b91c40e587d035 (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:
 nsis_template.py |  112 +++++++++++++++++++++++++++---------------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

The diff of changes is:
diff --git a/nsis_template.py b/nsis_template.py
index b70ac07..88bc15e 100644
--- a/nsis_template.py
+++ b/nsis_template.py
@@ -18,7 +18,7 @@ Caption "{program_desc}"
 !define py2exeOutputDirectory '{output_dir}'
 
 ; The file to write
-OutFile "installers\{program_name}_${VERSION}_win32-setup.exe"
+OutFile "installers\{program_name}_${{VERSION}}_win32-setup.exe"
 
 ; The default installation directory
 InstallDir $PROGRAMFILES\{program_name}
@@ -34,7 +34,7 @@ RequestExecutionLevel admin
 
 ; Installer Language Configuration
 
-!include ${PROGRAMFILES}\NSIS\Include\LogicLib.nsh
+!include ${{PROGRAMFILES}}\NSIS\Include\LogicLib.nsh
 
 var LC_MESSAGES
 
@@ -46,73 +46,73 @@ var WITHOUT_PULSEAUDIO
 var GSPRINT
 
 ; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Dutch.nlf"
-;LoadLanguageFile "${NSISDIR}\Contrib\Language files\French.nlf"
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
-;LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"
-;LoadLanguageFile "${NSISDIR}\Contrib\Language files\Russian.nlf"
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Spanish.nlf"
-;LoadLanguageFile "${NSISDIR}\Contrib\Language files\Swedish.nlf"
-;LoadLanguageFile "${NSISDIR}\Contrib\Language files\TradChinese.nlf"
-;LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf"
-;LoadLanguageFile "${NSISDIR}\Contrib\Language files\Slovak.nlf"
+LoadLanguageFile "${NSISDIR}}\Contrib\Language files\English.nlf"
+LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\Dutch.nlf"
+;LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\French.nlf"
+LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\German.nlf"
+;LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\Korean.nlf"
+;LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\Russian.nlf"
+LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\Spanish.nlf"
+;LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\Swedish.nlf"
+;LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\TradChinese.nlf"
+;LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\SimpChinese.nlf"
+;LoadLanguageFile "${{NSISDIR}}\Contrib\Language files\Slovak.nlf"
 
 ; License data
 ; Not exactly translated, but it shows what's needed
-LicenseLangString myLicenseData ${LANG_ENGLISH} "LICENSE.txt"
-LicenseLangString myLicenseData ${LANG_DUTCH} "LICENSE.txt"
-;LicenseLangString myLicenseData ${LANG_FRENCH} "LICENSE.txt"
-LicenseLangString myLicenseData ${LANG_GERMAN} "LICENSE.txt"
-;LicenseLangString myLicenseData ${LANG_KOREAN} "LICENSE.txt"
-;LicenseLangString myLicenseData ${LANG_RUSSIAN} "LICENSE.txt"
-LicenseLangString myLicenseData ${LANG_SPANISH} "LICENSE.txt"
-;LicenseLangString myLicenseData ${LANG_SWEDISH} "LICENSE.txt"
-;LicenseLangString myLicenseData ${LANG_TRADCHINESE} "LICENSE.txt"
-;LicenseLangString myLicenseData ${LANG_SIMPCHINESE} "LICENSE.txt"
-;LicenseLangString myLicenseData ${LANG_SLOVAK} "LICENSE.txt"
+LicenseLangString myLicenseData ${{LANG_ENGLISH}}} "LICENSE.txt"
+LicenseLangString myLicenseData ${LANG_DUTCH}}} "LICENSE.txt"
+;LicenseLangString myLicenseData ${{LANG_FRENCH}} "LICENSE.txt"
+LicenseLangString myLicenseData ${{LANG_GERMAN}} "LICENSE.txt"
+;LicenseLangString myLicenseData ${{LANG_KOREAN}} "LICENSE.txt"
+;LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt"
+LicenseLangString myLicenseData ${{LANG_SPANISH}} "LICENSE.txt"
+;LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt"
+;LicenseLangString myLicenseData ${{LANG_TRADCHINESE}} "LICENSE.txt"
+;LicenseLangString myLicenseData ${{LANG_SIMPCHINESE}} "LICENSE.txt"
+;LicenseLangString myLicenseData ${{LANG_SLOVAK}} "LICENSE.txt"
 
 LicenseData $(myLicenseData)
 
 ; Set name using the normal interface (Name command)
-LangString Name ${LANG_ENGLISH} "English"
-LangString Name ${LANG_DUTCH} "Dutch"
-;LangString Name ${LANG_FRENCH} "French"
-LangString Name ${LANG_GERMAN} "German"
-;LangString Name ${LANG_KOREAN} "Korean"
-;LangString Name ${LANG_RUSSIAN} "Russian"
-LangString Name ${LANG_SPANISH} "Spanish"
-;LangString Name ${LANG_SWEDISH} "Swedish"
-;LangString Name ${LANG_TRADCHINESE} "Traditional Chinese"
-;LangString Name ${LANG_SIMPCHINESE} "Simplified Chinese"
-;LangString Name ${LANG_SLOVAK} "Slovak"
+LangString Name ${{LANG_ENGLISH}} "English"
+LangString Name ${{LANG_DUTCH}} "Dutch"
+;LangString Name ${{LANG_FRENCH}} "French"
+LangString Name ${{LANG_GERMAN}} "German"
+;LangString Name ${{LANG_KOREAN}} "Korean"
+;LangString Name ${{LANG_RUSSIAN}} "Russian"
+LangString Name ${{LANG_SPANISH}} "Spanish"
+;LangString Name ${{LANG_SWEDISH}} "Swedish"
+;LangString Name ${{LANG_TRADCHINESE}} "Traditional Chinese"
+;LangString Name ${{LANG_SIMPCHINESE}} "Simplified Chinese"
+;LangString Name ${{LANG_SLOVAK}} "Slovak"
 
 Function .onInit
 
         ;Language selection dialog
 
         Push ""
-        Push ${LANG_ENGLISH}
+        Push ${{LANG_ENGLISH}}
         Push English
-        Push ${LANG_DUTCH}
+        Push ${{LANG_DUTCH}}
         Push Dutch
-;       Push ${LANG_FRENCH}
+;       Push ${{LANG_FRENCH}}
 ;       Push French
-        Push ${LANG_GERMAN}
+        Push ${{LANG_GERMAN}}
         Push German
-;       Push ${LANG_KOREAN}
+;       Push ${{LANG_KOREAN}}
 ;       Push Korean
-;       Push ${LANG_RUSSIAN}
+;       Push ${{LANG_RUSSIAN}}
 ;       Push Russian
-        Push ${LANG_SPANISH}
+        Push ${{LANG_SPANISH}}
         Push Spanish
-;       Push ${LANG_SWEDISH}
+;       Push ${{LANG_SWEDISH}}
 ;       Push Swedish
-;       Push ${LANG_TRADCHINESE}
+;       Push ${{LANG_TRADCHINESE}}
 ;       Push "Traditional Chinese"
-;       Push ${LANG_SIMPCHINESE}
+;       Push ${{LANG_SIMPCHINESE}}
 ;       Push "Simplified Chinese"
-;       Push ${LANG_SLOVAK}
+;       Push ${{LANG_SLOVAK}}
 ;       Push Slovak
         Push A ; A means auto count languages
                ; for the auto count to work the first empty push (Push "") must remain
@@ -120,24 +120,24 @@ Function .onInit
 
         Pop $LANGUAGE
 
-        ${Switch} $LANGUAGE
-          ${Case} 1031
+        ${{Switch}} $LANGUAGE
+          ${{Case}} 1031
             StrCpy $LC_MESSAGES "de"
             !include nsis_include\de.nsi
-            ${Break}
-          ${Case} 1033
+            ${{Break}}
+          ${{Case}} 1033
             StrCpy $LC_MESSAGES "en"
             !include nsis_include\en.nsi
-            ${Break}
-          ${Case} 1043
+            ${{Break}}
+          ${{Case}} 1043
             StrCpy $LC_MESSAGES "nl"
             !include nsis_include\nl.nsi
-            ${Break}
-          ${Case} 1034
+            ${{Break}}
+          ${{Case}} 1034
             StrCpy $LC_MESSAGES "es"
             !include nsis_include\es.nsi
-            ${Break}
-        ${EndSwitch}
+            ${{Break}}
+        ${{EndSwitch}}
 
         StrCmp $LANGUAGE "cancel" 0 +2
                 Abort


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