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

[marcus at wald.intevation.org]

Author: marcus
Date: 2005-10-20 20:31:35 +0200 (Thu, 20 Oct 2005)
New Revision: 26

Modified:
   trunk/ChangeLog
   trunk/src/installer-finish.nsi
Log:
2005-10-20  Marcus Brinkmann  <marcus at g10code.de>

	* src/installer-finish.nsi: Add support for Add/Remove Programs.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-10-20 18:20:24 UTC (rev 25)
+++ trunk/ChangeLog	2005-10-20 18:31:35 UTC (rev 26)
@@ -1,3 +1,7 @@
+2005-10-20  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/installer-finish.nsi: Add support for Add/Remove Programs.
+
 2005-10-20  Werner Koch  <wk at g10code.com>
 
 	* m4/gpg4win.m4 (GPG4WIN_FIND): Quote a file variable.

Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi	2005-10-20 18:20:24 UTC (rev 25)
+++ trunk/src/installer-finish.nsi	2005-10-20 18:31:35 UTC (rev 26)
@@ -17,22 +17,23 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
+Var MYTMP
+
 # Last section is a hidden one.
 Section
-
   WriteUninstaller "$INSTDIR\${PACKAGE}-uninstall.exe"
 
-#  StrCpy $MYTMP "Software\Microsoft\Windows\CurrentVersion\Uninstall\GnuPG"
-#  WriteRegExpandStr HKLM $MYTMP "UninstallString" '"$INSTDIR\uninst-gnupg.exe"'
-#  WriteRegExpandStr HKLM $MYTMP "InstallLocation" "$INSTDIR"
-#  WriteRegStr       HKLM $MYTMP "DisplayName"     "GNU Privacy Guard"
-#  WriteRegStr       HKLM $MYTMP "DisplayIcon"     "$INSTDIR\gpg.exe,0"
-#  WriteRegStr       HKLM $MYTMP "DisplayVersion"  "${VERSION}"
-#  WriteRegStr       HKLM $MYTMP "Publisher"       "Free Software Foundation"
-#  WriteRegStr       HKLM $MYTMP "URLInfoAbout"    "http://www.gnupg.org/"
-#  WriteRegDWORD     HKLM $MYTMP "NoModify"        "1"
-#  WriteRegDWORD     HKLM $MYTMP "NoRepair"        "1"
-
+  # Windows Add/Remove Programs support
+  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/"
+  WriteRegDWORD     HKLM $MYTMP "NoModify"        "1"
+  WriteRegDWORD     HKLM $MYTMP "NoRepair"        "1"
 SectionEnd
 
 
@@ -55,4 +56,6 @@
   DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
         "Install Directory"
   DeleteRegKey /ifempty HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
+  # Remove Windows Add/Remove Programs support.
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GnuPG"
 SectionEnd