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

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-24 16:36:23 +0100 (Thu, 24 Nov 2005)
New Revision: 69

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/src/installer.nsi
Log:
Preparing for a new release


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-24 14:57:51 UTC (rev 68)
+++ trunk/ChangeLog	2005-11-24 15:36:23 UTC (rev 69)
@@ -1,3 +1,7 @@
+2005-11-24  Werner Koch  <wk at g10code.com>
+
+	* src/installer.nsi (PrintCloseOtherApps): New.
+
 2005-11-21  Werner Koch  <wk at g10code.com>
 
 	Released 0.1.0.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2005-11-24 14:57:51 UTC (rev 68)
+++ trunk/NEWS	2005-11-24 15:36:23 UTC (rev 69)
@@ -1,3 +1,14 @@
+Noteworthy changes in version 0.2.0 (2005-11-24)
+------------------------------------------------
+
+  * The installer tries to stop a running instance of WinPT.
+
+  * A warning message to close other application is displayed if
+    necessary.
+
+  * Cleanups.
+
+
 Noteworthy changes in version 0.1.0 (2005-11-21)
 ------------------------------------------------
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-24 14:57:51 UTC (rev 68)
+++ trunk/configure.ac	2005-11-24 15:36:23 UTC (rev 69)
@@ -22,7 +22,7 @@
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
 
-AC_INIT([gpg4win],[0.1.0],[gpg4win-devel at wald.intevation.org])
+AC_INIT([gpg4win],[0.2.0],[gpg4win-devel at wald.intevation.org])
 
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2005-11-24 14:57:51 UTC (rev 68)
+++ trunk/src/installer.nsi	2005-11-24 15:36:23 UTC (rev 69)
@@ -116,6 +116,7 @@
 !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
 !endif
 
+!insertmacro MUI_PAGE_CUSTOMFUNCTION_PRE PrintCloseOtherApps
 !insertmacro MUI_PAGE_INSTFILES
 
 !define MUI_FINISHPAGE_RUN "$INSTDIR\gpa.exe"
@@ -219,13 +220,43 @@
  leave:
 FunctionEnd
 
+
+# Check whether this is a reinstall and popup a message box to explain
+# that it is better to close other apps before continuing
+Function PrintCloseOtherApps
+    IfFileExists $INSTDIR\gnupg.exe print_warning
+    IfFileExists $INSTDIR\winpt.exe print_warning
+    IfFileExists $INSTDIR\gpa.exe   print_warning
+    IfFileExists $INSTDIR\gpgol.dll print_warning
+    IfFileExists $INSTDIR\gpgee.dll print_warning
+    Return
+   print_warning:
+    MessageBox MB_OK|MB_ICONEXCLAMATION "$(T_CloseOtherApps)"
+    IfFileExists $INSTDIR\winpt.exe 0 +2
+      ExecWait '"$INSTDIR\winpt.exe" --stop'
+   leave:
+FunctionEnd
+
+
 # From Function PrintNonAdminWarning
 LangString T_AdminNeeded ${LANG_ENGLISH} \
    "Warning: Administrator permissions required for a successful installation"
 LangString T_AdminNeeded ${LANG_GERMAN} \
-   "Warnung: Für eine erfolgreiche Installation werden \
+   "Achtung: Für eine erfolgreiche Installation werden \
     Administratorrechte benötigt."
 
+# From Function PrintCloseOtherApps
+LangString T_CloseOtherApps ${LANG_ENGLISH} \
+   "Please make sure that other applications are not running. \
+    In particular you should close Outlook and all Explorer \
+    windows.  Gpg4Win will try to install anyway but a reboot \
+    will be required then."
+LangString T_CloseOtherApps ${LANG_GERMAN} \
+   "Bitte stellen Sie sicher, daß alle anderen Anwendugen geschlossen \
+    sind.  Insbesondere sollten Sie Outlook und alle Explorer Fenster \
+    schliessen bevor sie die Installation fortsetzen.  Gpg4Win wird auf \
+    jeden Fall versuchen eine Instalaltion durchzuführen es ist dann aber \
+    u.U. notwendig das System neu zu starten."
 
 # FIXME: The GetAfterChar function comes from the NSIS wiki.
 Function un.GetAfterChar