2005-10-20 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 20 Oct 2005 18:31:35 +0000 (18:31 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 20 Oct 2005 18:31:35 +0000 (18:31 +0000)
* src/installer-finish.nsi: Add support for Add/Remove Programs.

ChangeLog
src/installer-finish.nsi

index edc3702..4e82f3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-20  Marcus Brinkmann  <marcus@g10code.de>
+
+       * src/installer-finish.nsi: Add support for Add/Remove Programs.
+
 2005-10-20  Werner Koch  <wk@g10code.com>
 
        * m4/gpg4win.m4 (GPG4WIN_FIND): Quote a file variable.
index 65262da..203d786 100644 (file)
 # 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 @@ Section Uninstall
   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