[Gpg4win-commits] r236 - in trunk: . include src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2006-03-29 15:44:55 +0200 (Wed, 29 Mar 2006)
New Revision: 236

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/include/config.nsi.in
   trunk/src/gpg4win-src.nsi
   trunk/src/gpg4win.nsi
   trunk/src/installer.nsi
Log:
Show release date.
Detect pre 1.0 gpg4win versions.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-03-28 18:43:29 UTC (rev 235)
+++ trunk/ChangeLog	2006-03-29 13:44:55 UTC (rev 236)
@@ -1,3 +1,9 @@
+2006-03-29  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (BUILD_ISODATE): New.
+	* include/config.nsi.in: Ditto.
+	* src/gpg4win.nsi: Display it on the Welcome page
+
 2006-03-28  Werner Koch  <wk at g10code.com>
 
 	* src/installer.nsi (CustomPageOptions): Write Labels, so that

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-03-28 18:43:29 UTC (rev 235)
+++ trunk/configure.ac	2006-03-29 13:44:55 UTC (rev 236)
@@ -48,6 +48,7 @@
 # Generate extended version information.  Note, that for NSIS use we
 # must not translate the dots to commas in the BUILD_FILEVERSION.
 BUILD_TIMESTAMP=`date --iso-8601=minutes`
+BUILD_ISODATE=`date --iso-8601`
 changequote(,)dnl
 BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
 tmp="`echo '$Revision$' | sed 's/[^0-9]//g'`"
@@ -55,6 +56,7 @@
 test -z "$tmp" && tmp="0"
 BUILD_FILEVERSION="${BUILD_FILEVERSION}$tmp"
 AC_SUBST(BUILD_TIMESTAMP)
+AC_SUBST(BUILD_ISODATE)
 AC_SUBST(BUILD_FILEVERSION)
 
 

Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in	2006-03-28 18:43:29 UTC (rev 235)
+++ trunk/include/config.nsi.in	2006-03-29 13:44:55 UTC (rev 236)
@@ -22,6 +22,7 @@
 !define _VERSION @VERSION@
 !define _BUILD_FILEVERSION @BUILD_FILEVERSION@
 !define _BUILD_TIMESTAMP   @BUILD_TIMESTAMP@
+!define _BUILD_ISODATE     @BUILD_ISODATE@
 
 !define build @build_cpu at -@build_os@
 !define host @host_cpu at -@host_os@

Modified: trunk/src/gpg4win-src.nsi
===================================================================
--- trunk/src/gpg4win-src.nsi	2006-03-28 18:43:29 UTC (rev 235)
+++ trunk/src/gpg4win-src.nsi	2006-03-29 13:44:55 UTC (rev 236)
@@ -51,14 +51,16 @@
   It includes an advanced key management facility and is compliant \
   with the proposed OpenPGP Internet standard as described in RFC2440. \
   \r\n\r\n$_CLICK \
-  \r\n\r\n\r\n\r\n\r\nThis is GnuPG version ${VERSION}\r\n\
-  file version ${PROD_VERSION}"
+  \r\n\r\n\r\n\r\n\r\nThis is GPG4WIN version ${VERSION}\r\n\
+  file version ${PROD_VERSION}\r\n\
+  release date ${_BUILD_ISODATE}"
 !define ABOUT_GERMAN \
   "GnuPG is das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation \
    sowie zum sicheren Speichern von Daten. \
    \r\n\r\n$_CLICK \
-   \r\n\r\n\r\n\r\n\r\nDies ist GnuPG Version ${VERSION}\r\n\
-   Dateiversion ${PROD_VERSION}"
+   \r\n\r\n\r\n\r\n\r\nDies ist GPG4WIN Version ${VERSION}\r\n\
+   Dateiversion ${PROD_VERSION}\r\n\
+   Releasedatum ${_BUILD_ISODATE}"
 
 
 # The copyright license of the package.  Define only one of these.

Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi	2006-03-28 18:43:29 UTC (rev 235)
+++ trunk/src/gpg4win.nsi	2006-03-29 13:44:55 UTC (rev 236)
@@ -51,13 +51,15 @@
   with the proposed OpenPGP Internet standard as described in RFC2440. \
   \r\n\r\n$_CLICK \
   \r\n\r\n\r\n\r\n\r\nThis is GPG4WIN version ${VERSION}\r\n\
-  file version ${PROD_VERSION}"
+  file version ${PROD_VERSION}\r\n\
+  release date ${_BUILD_ISODATE}"
 !define ABOUT_GERMAN \
   "GnuPG is das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation \
    sowie zum sicheren Speichern von Daten. \
    \r\n\r\n$_CLICK \
    \r\n\r\n\r\n\r\n\r\nDies ist GPG4WIN Version ${VERSION}\r\n\
-   Dateiversion ${PROD_VERSION}"
+   Dateiversion ${PROD_VERSION}\r\n\
+   Releasedatum ${_BUILD_ISODATE}"
 
 
 

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2006-03-28 18:43:29 UTC (rev 235)
+++ trunk/src/installer.nsi	2006-03-29 13:44:55 UTC (rev 236)
@@ -334,7 +334,7 @@
 Function CheckExistingVersion
   ClearErrors
   FileOpen $0 "$INSTDIR\VERSION" r
-  IfErrors leave
+  IfErrors nexttest
   FileRead $0 $R0
   FileRead $0 $R1
   FileClose $0
@@ -344,7 +344,15 @@
   Pop $R1
 
   MessageBox MB_YESNO "$(T_FoundExistingVersion)" IDYES leave
+  Abort
+
+ nexttest:
+  ClearErrors
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPG4Win" "DisplayVersion"
+  IfErrors leave 0
+     MessageBox MB_YESNO "$(T_FoundExistingVersionB)" IDYES leave
      Abort
+     
  leave:
 FunctionEnd
 
@@ -441,8 +449,22 @@
      "Version $R1 has already been installed.  $\r$\n\
       Do you want to overwrite it with version ${VERSION}?"
 LangString T_FoundExistingVersion ${LANG_GERMAN} \
-     "Version $R1 ist hier bereits installiert.  $\r$\n\
-      Möchte Sie diese mit Version ${VERSION} überschreiben?"
+     "Version $R1 ist hier bereits installiert. $\r$\n\
+      Möchten Sie diese mit Version ${VERSION} überschreiben? $\r$\n\
+       $\r$\n\
+      (Sie können in jedem Fall mit JA antworten, falls es sich um \
+       eine neuere oder dieselbe Version handelt.)"
+LangString T_FoundExistingVersionB ${LANG_ENGLISH} \
+     "A version of Gpg4Win has already been installed on the system. \
+      There will be no problem installing and thus overwriting this \
+      Version. $\r$\n\
+       $\r$\n\
+      Do you want to continue installing Gpg4win?"
+LangString T_FoundExistingVersionB ${LANG_GERMAN} \
+     "Eine Version von Gpg4Win ist hier bereits installiert. \
+      Es ist problemlos möglich, die Installation fortzuführen.  $\r$\n\
+        $\r$\n\
+      Möchten die die Installation von Gpg4Win fortführen?"
 
 
 #---------------------------------------------