[Gpg4win-commits] r47 - in trunk: . src

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-07 21:47:57 +0100 (Mon, 07 Nov 2005)
New Revision: 47

Modified:
   trunk/ChangeLog
   trunk/src/gpg4win-splash.wav
   trunk/src/inst-gpgee.nsi
   trunk/src/inst-sections.nsi
   trunk/src/installer-finish.nsi
   trunk/src/installer.nsi
Log:
Minor fixes.  Changed WAV file; Windows can't cope with a simply truncated one.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-07 17:47:18 UTC (rev 46)
+++ trunk/ChangeLog	2005-11-07 20:47:57 UTC (rev 47)
@@ -1,5 +1,10 @@
 2005-11-07  Werner Koch  <wk at g10code.com>
 
+	* src/installer-finish.nsi: Fixed dereferencing of variable.
+
+	* src/inst-sections.nsi, src/installer-finish.nsi: Ensure that the
+	menu gets written for all users.
+
 	* packages/download.sh: Add dummy manual pages.
 
 	* src/installer.nsi: Move compression type to ...

Modified: trunk/src/gpg4win-splash.wav
===================================================================
(Binary files differ)

Modified: trunk/src/inst-gpgee.nsi
===================================================================
--- trunk/src/inst-gpgee.nsi	2005-11-07 17:47:18 UTC (rev 46)
+++ trunk/src/inst-gpgee.nsi	2005-11-07 20:47:57 UTC (rev 47)
@@ -50,4 +50,8 @@
     den Explorer, die es ermöglicht, Dateien über das Kontextmenü zu \
     verschlüsseln."
 
+LangString DESC_Menu_gpgee_hlp ${LANG_ENGLISH} \
+   "Show the online manula of GPGee"
+LangString DESC_Menu_gpgee_hlp ${LANG_German} \
+   "Das englische Handbuch zu GPGee anzeigen"
 

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2005-11-07 17:47:18 UTC (rev 46)
+++ trunk/src/inst-sections.nsi	2005-11-07 20:47:57 UTC (rev 47)
@@ -333,7 +333,14 @@
 # This also must be in a central place.  Also Urgs.
 
 Section "-startmenu"
+
 !ifdef HAVE_STARTMENU
+  # Make sure that the context of the automatic variables has been set to
+  # the "all users" shell folder.  This guarantees that the menu gets written
+  # for all users.  We have already checked that we are running as Admin; or
+  # we printed a warning that installation will not succeed.
+  SetShellVarContext all
+
 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
 
@@ -378,7 +385,7 @@
     IntOp $R0 $R0 & ${SF_SELECTED} 
     IntCmp $R0 ${SF_SELECTED} 0 no_gpgee_menu 
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GPGee Manual.lnk" \
-	"$INSTDIR\GPGee.hlp"
+	"$INSTDIR\GPGee.hlp" "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpgee_hlp)
   no_gpgee_menu:
 !endif
 

Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi	2005-11-07 17:47:18 UTC (rev 46)
+++ trunk/src/installer-finish.nsi	2005-11-07 20:47:57 UTC (rev 47)
@@ -24,21 +24,28 @@
   WriteUninstaller "$INSTDIR\${PACKAGE}-uninstall.exe"
 
   # Windows Add/Remove Programs support
-  StrCpy $MYTMP "Software\Microsoft\Windows\CurrentVersion\Uninstall\{PRETTY_PACKAGE_SHORT}"
+  StrCpy $MYTMP "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRETTY_PACKAGE_SHORT}"
   WriteRegExpandStr HKLM $MYTMP "UninstallString" '"$INSTDIR\${PACKAGE}-uninstall.exe"'
   WriteRegExpandStr HKLM $MYTMP "InstallLocation" "$INSTDIR"
   WriteRegStr       HKLM $MYTMP "DisplayName"     "${PRETTY_PACKAGE}"
   WriteRegStr       HKLM $MYTMP "DisplayIcon"     "$INSTDIR\gpg.exe,0"
   WriteRegStr       HKLM $MYTMP "DisplayVersion"  "${VERSION}"
   WriteRegStr       HKLM $MYTMP "Publisher"       "g10 Code GmbH"
-  WriteRegStr       HKLM $MYTMP "URLInfoAbout"    "http://www.gnupg.org/"
+  WriteRegStr       HKLM $MYTMP "URLInfoAbout"    "http://www.gpg4win.org/"
   WriteRegDWORD     HKLM $MYTMP "NoModify"        "1"
   WriteRegDWORD     HKLM $MYTMP "NoRepair"        "1"
 SectionEnd
 
 
 Section Uninstall
+
 !ifdef HAVE_STARTMENU
+  # Make sure that the context of the automatic variables has been set to
+  # the "all users" shell folder.  This guarantees that the menu gets written
+  # for all users.  We have already checked that we are running as Admin; or
+  # we printed a warning that installation will not succeed.
+  SetShellVarContext all
+
 !insertmacro MUI_STARTMENU_GETFOLDER ${STARTMENU_FOLDER} $R0
 !ifdef HAVE_PKG_WINPT
   Delete "$SMPROGRAMS\$R0\WinPT.lnk"

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2005-11-07 17:47:18 UTC (rev 46)
+++ trunk/src/installer.nsi	2005-11-07 20:47:57 UTC (rev 47)
@@ -33,10 +33,7 @@
 # We use the modern UI.
 !include "MUI.nsh"
 
-# Fix some translations
 
-
-
 # Set the package name.  Note that this name should not be sufficed
 #  with the version because this would get displayed in the start menu.
 Name "${PRETTY_PACKAGE}"
@@ -146,10 +143,10 @@
 
 !insertmacro MUI_RESERVEFILE_LANGDLL
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-ReserveFile "${NSISDIR}/Plugins/advsplash.dll"
-ReserveFile "${TOP_SRCDIR}/src/gpg4win-splash.bmp"
-ReserveFile "${TOP_SRCDIR}/src/gpg4win-splash.wav"
-ReserveFile "${TOP_SRCDIR}/COPYING"
+ReserveFile "${NSISDIR}\Plugins\advsplash.dll"
+ReserveFile "${TOP_SRCDIR}\src\gpg4win-splash.bmp"
+ReserveFile "${TOP_SRCDIR}\src\gpg4win-splash.wav"
+ReserveFile "${TOP_SRCDIR}\COPYING"
 
 # Language support