[Inteproxy-commits] r151 - trunk/packaging/Windows

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2008-06-19 18:42:04 +0200 (Thu, 19 Jun 2008)
New Revision: 151

Modified:
   trunk/packaging/Windows/inteproxy-installer.nsi
Log:
Set folder/links for 'all users'. Set correct multilanguage links for user manual.


Modified: trunk/packaging/Windows/inteproxy-installer.nsi
===================================================================
--- trunk/packaging/Windows/inteproxy-installer.nsi	2008-06-19 16:37:52 UTC (rev 150)
+++ trunk/packaging/Windows/inteproxy-installer.nsi	2008-06-19 16:42:04 UTC (rev 151)
@@ -125,6 +125,8 @@
 
 
     SetOutPath "$INSTDIR"
+    # 'all users' shell folder is used (for $DESKTOP, $SMPROGRAMS, $QUICKLAUNCH,...)
+    SetShellVarContext all
 
     # ** Start menu **
     # Delete old Start menu entries.
@@ -137,13 +139,7 @@
     CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME_SHORT}"
     CreateShortCut  "$SMPROGRAMS\${PRODUCT_NAME_SHORT}\InteProxy.lnk" "$INSTDIR\InteProxy.exe" "--config-file=inteproxy.cfg"
     CreateShortCut  "$SMPROGRAMS\${PRODUCT_NAME_SHORT}\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-    # Create link to german User Manual, if Installer Language 
-    # is german (code: 1031); default = english
-    ReadRegStr $0 HKLM "Software\${PRODUCT_NAME_SHORT}" "Installer Language" 
-    StrCmp $0 "1031" 0 +3
-        CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME_SHORT}\Benutzerhandbuch.lnk" "$INSTDIR\doc\InteProxy-de-${VERSION_NUMBER}.pdf"
-        Goto +2
-        CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME_SHORT}\User Manual.lnk" "$INSTDIR\doc\InteProxy-en-${VERSION_NUMBER}.pdf"
+    CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME_SHORT}\$(UserManualLinkName)" "$INSTDIR\doc\$(UserManualFileName)"
     no_start_menu:
 
     # ** Desktop Icon **
@@ -267,6 +263,11 @@
 LangString T_AdminNeeded ${LANG_GERMAN} \
    "Achtung: Für die Installation von ${PRODUCT_NAME_SHORT} werden Administratorrechte benötigt."
 
+# User Manual Strings
+LangString UserManualLinkName ${LANG_ENGLISH} "User Manual.lnk"
+LangString UserManualLinkName ${LANG_GERMAN} "Benutzerhandbuch.lnk"
+LangString UserManualFileName ${LANG_ENGLISH} "InteProxy-en-${VERSION_NUMBER}.pdf"
+LangString UserManualFileName ${LANG_GERMAN} "InteProxy-de-${VERSION_NUMBER}.pdf"
 
 
 ;--------------------------------