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

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-15 12:15:07 +0100 (Tue, 15 Nov 2005)
New Revision: 58

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/inst-gpgol.nsi
   trunk/src/uninst-gpgee.nsi
   trunk/src/uninst-gpgol.nsi
Log:
More reboot fixes


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-15 10:34:16 UTC (rev 57)
+++ trunk/ChangeLog	2005-11-15 11:15:07 UTC (rev 58)
@@ -1,7 +1,13 @@
 2005-11-15  Werner Koch  <wk at g10code.com>
 
+	* src/Makefile.am (EXTRA_DIST): Add g4wihelp.nsi.
+	(CLEANFILES): Add g4wihelp.dll.
+
 	* src/inst-gpgee.nsi: Use RegDLL and UnRegDLL.  Print warning on
 	registration failure.  Use move approach for active extension.
+	* src/inst-gpgol.nsi: Ditto.
+	* src/uninst-gpgol.nsi: Use UnRegDLL and allow rebooting.
+	* src/uninst-gpgee.nsi: Ditto.
 
 	* src/installer.nsi: Moved inclusion of g4wihelp.nsi after the
 	language definitions.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-11-15 10:34:16 UTC (rev 57)
+++ trunk/src/Makefile.am	2005-11-15 11:15:07 UTC (rev 58)
@@ -20,8 +20,11 @@
 
 EXTRA_DIST = pkg-config $(common_nsi) gpg4win.nsi gpg4win-src.nsi \
 	libiconv.def libintl.def  gpg4win-splash.bmp gpg4win-splash.wav \
-	exdll.h g4wihelp.c
+	exdll.h g4wihelp.c g4wihelp.nsi
 
+# Need to clean the dll because we bypassed automake.
+CLEANFILES = g4wihelp.dll 
+
 # Supported source packages.
 gpg4win_spkgs := gnupg libgpg-error gpgme gpgol gpa winpt \
 		 man_novice_de man_advanced_de

Modified: trunk/src/inst-gpgol.nsi
===================================================================
--- trunk/src/inst-gpgol.nsi	2005-11-15 10:34:16 UTC (rev 57)
+++ trunk/src/inst-gpgol.nsi	2005-11-15 11:15:07 UTC (rev 58)
@@ -28,14 +28,30 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_gpgol}"
 !else
+
+  ClearErrors
+  SetOverwrite try
   File ${prefix}/bin/gpgol.dll
+  SetOverwrite lastused
+  ifErrors 0 +4
+      File /oname=gpgol.dll.tmp ${prefix}/bin/gpgol.dll
+      Rename /REBOOTOK gpgol.dll.tmp gpgol.dll
 
   # Register the DLL.
-  Exec 'regsvr32.exe /s "$INSTDIR\gpgol.dll"'
+  RegDLL "$INSTDIR\gpgol.dll"
+  ifErrors 0 +2
+     MessageBox MB_OK "$(T_GPGol_RegFailed)"
+
 !endif
 SectionEnd
 
 
+LangString T_GPGol_RegFailed ${LANG_ENGLISH} \
+   "Warning: Registration of the GPGol Outlook pluginfailed."
+LangString T_GPGol_RegFailed ${LANG_GERMAN} \
+   "Warnung: Registration des GPGol Outlook Plugin ist fehlgeschlagen. "
+
+
 LangString DESC_SEC_gpgol ${LANG_ENGLISH} \
    "GnuPG for Outlook"
 LangString DESC_SEC_gpgol ${LANG_GERMAN} \

Modified: trunk/src/uninst-gpgee.nsi
===================================================================
--- trunk/src/uninst-gpgee.nsi	2005-11-15 10:34:16 UTC (rev 57)
+++ trunk/src/uninst-gpgee.nsi	2005-11-15 11:15:07 UTC (rev 58)
@@ -30,11 +30,11 @@
   Push "${gpg4win_pkg_gpgee}"
   Call un.SourceDelete
 !else
-  # Unregister the DLL
-  Exec 'regsvr32.exe /s /u "$INSTDIR\GPGee.dll"'
 
-  Delete "$INSTDIR\GPGee.dll"
-  Delete "$INSTDIR\GPGee.DEU"
+  UnRegDLL "$INSTDIR\GPGee.dll"
+
+  Delete /REBOOTOK "$INSTDIR\GPGee.dll"
+  Delete /REBOOTOK "$INSTDIR\GPGee.DEU"
   Delete "$INSTDIR\GPGee.hlp"
 
   Delete "$INSTDIR\share\gpgee\gpl.txt"

Modified: trunk/src/uninst-gpgol.nsi
===================================================================
--- trunk/src/uninst-gpgol.nsi	2005-11-15 10:34:16 UTC (rev 57)
+++ trunk/src/uninst-gpgol.nsi	2005-11-15 11:15:07 UTC (rev 58)
@@ -30,10 +30,9 @@
   Call un.SourceDelete
 !else
 
-  # Unregister the DLL
-  Exec 'regsvr32.exe /s /u "$INSTDIR\gpgol.dll"'
+  UnRegDLL "$INSTDIR\gpgol.dll"
 
-  Delete "$INSTDIR\gpgol.dll"
+  Delete /REBOOTOK "$INSTDIR\gpgol.dll"
   RMDir "$INSTDIR"
 !endif
 SectionEnd