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

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-15 11:34:16 +0100 (Tue, 15 Nov 2005)
New Revision: 57

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/g4wihelp.nsi
   trunk/src/inst-gpgee.nsi
   trunk/src/inst-sections.nsi
Log:
Reboot support for gpgee.dll


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-15 09:08:36 UTC (rev 56)
+++ trunk/ChangeLog	2005-11-15 10:34:16 UTC (rev 57)
@@ -1,5 +1,8 @@
 2005-11-15  Werner Koch  <wk at g10code.com>
 
+	* src/inst-gpgee.nsi: Use RegDLL and UnRegDLL.  Print warning on
+	registration failure.  Use move approach for active extension.
+
 	* src/installer.nsi: Moved inclusion of g4wihelp.nsi after the
 	language definitions.
 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2005-11-15 09:08:36 UTC (rev 56)
+++ trunk/NEWS	2005-11-15 10:34:16 UTC (rev 57)
@@ -1,7 +1,11 @@
 Noteworthy changes in version 0.1.0
 ------------------------------------------------
 
+  * Some visual cleanups, more help texts.      
 
+  * Reboot support for installing an already running GPGee 
+
+
 Noteworthy changes in version 0.0.2 (2005-11-08)
 ------------------------------------------------
 

Modified: trunk/src/g4wihelp.nsi
===================================================================
--- trunk/src/g4wihelp.nsi	2005-11-15 09:08:36 UTC (rev 56)
+++ trunk/src/g4wihelp.nsi	2005-11-15 10:34:16 UTC (rev 57)
@@ -24,15 +24,15 @@
    "Ein Exemplar dieses Installers läuft bereits."
 
 
-Function G4wTest
-  Push $R0
-  Push $R1
-  StrCpy $R0 "mein argument 0"
-  StrCpy $R1 "mein argument 1"
-  g4wihelp::dummy 
-  Pop $R1
-  Pop $R0
-FunctionEnd
+#Function G4wTest
+#  Push $R0
+#  Push $R1
+#  StrCpy $R0 "mein argument 0"
+#  StrCpy $R1 "mein argument 1"
+#  g4wihelp::dummy 
+#  Pop $R1
+#  Pop $R0
+#FunctionEnd
 
 Function G4wRunOnce
   Push $R0

Modified: trunk/src/inst-gpgee.nsi
===================================================================
--- trunk/src/inst-gpgee.nsi	2005-11-15 09:08:36 UTC (rev 56)
+++ trunk/src/inst-gpgee.nsi	2005-11-15 10:34:16 UTC (rev 57)
@@ -30,15 +30,31 @@
   File "${gpg4win_pkg_gpgee_src}"
 !else
   # Try to unregister first
-  Exec 'regsvr32.exe /u /s "$INSTDIR\GPGee.dll"'
-  Sleep 1000
+  UnRegDLL "$INSTDIR\GPGee.dll"
+  Sleep 500
 
+  ClearErrors
+  SetOverwrite try
   File ${prefix}/GPGee.dll
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=GPGee.dll.tmp ${prefix}/GPGee.dll
+      Rename /REBOOTOK GPGee.dll.tmp GPGee.dll
+
+  ClearErrors
+  SetOverwrite try
   File ${prefix}/GPGee.DEU
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=GPGee.DEU.tmp ${prefix}/GPGee.DEU
+      Rename /REBOOTOK GPGee.DEU.tmp GPGee.DEU
+
   File ${prefix}/GPGee.hlp
 
   # Register the DLL.
-  Exec 'regsvr32.exe /s "$INSTDIR\GPGee.dll"'
+  RegDLL "$INSTDIR\GPGee.dll"
+  ifErrors 0 +2
+     MessageBox MB_OK "$(T_GPGee_RegFailed)"
 
   SetOutPath "$INSTDIR\share\gpgee"
   File ${prefix}/gpl.txt
@@ -46,6 +62,10 @@
 !endif
 SectionEnd
 
+LangString T_GPGee_RegFailed ${LANG_ENGLISH} \
+   "Warning: Registration of the GPGee explorer extension failed."
+LangString T_GPGee_RegFailed ${LANG_GERMAN} \
+   "Warnung: Registration der GPGee Explorer Extension ist fehlgeschlagen. "
 
 LangString DESC_SEC_gpgee ${LANG_ENGLISH} \
    "GPG Explorer Extensions"
@@ -59,3 +79,4 @@
 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-15 09:08:36 UTC (rev 56)
+++ trunk/src/inst-sections.nsi	2005-11-15 10:34:16 UTC (rev 57)
@@ -289,16 +289,14 @@
 Function .onInit
   Call G4wRunOnce
 
-  #Call G4wTest
- 
   SetOutPath $TEMP
   File /oname=gpgspltmp.bmp "${TOP_SRCDIR}/src/gpg4win-splash.bmp"
   File /oname=gpgspltmp.wav "${TOP_SRCDIR}/src/gpg4win-splash.wav"
   advsplash::show 3000 600 400 -1 $TEMP\gpgspltmp
   Pop $0 # $0 has '1' if the user closed the splash screen early,
          # '0' if everything closed normal, and '-1' if some error occured.
-  Delete /rebootok $TEMP\gpgspltmp.wav
-  Delete /rebootok $TEMP\gpgspltmp.bmp
+  Delete $TEMP\gpgspltmp.wav
+  Delete $TEMP\gpgspltmp.bmp
 
   Call CalcDepends
 FunctionEnd