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

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-15 10:08:36 +0100 (Tue, 15 Nov 2005)
New Revision: 56

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/include/config.nsi.in
   trunk/src/gpg4win-src.nsi
   trunk/src/gpg4win.nsi
   trunk/src/inst-gpgee.nsi
   trunk/src/installer.nsi
Log:
Use revision number for product version


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-14 18:42:31 UTC (rev 55)
+++ trunk/ChangeLog	2005-11-15 09:08:36 UTC (rev 56)
@@ -1,3 +1,14 @@
+2005-11-15  Werner Koch  <wk at g10code.com>
+
+	* src/installer.nsi: Moved inclusion of g4wihelp.nsi after the
+	language definitions.
+
+	* configure.ac (VERSION): Generate extended version information.
+	* include/config.nsi.in: Define replacements
+	* src/gpg4win.nsi, src/gpg4win-src.nsi: Use them for PROD_VERSION.
+
+	* src/gpg4win-src.nsi: Add our build dir as plugindir.
+
 2005-11-14  Werner Koch  <wk at g10code.com>
 
 	* src/inst-sections.nsi (.onInit): Make sure that only one

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-14 18:42:31 UTC (rev 55)
+++ trunk/configure.ac	2005-11-15 09:08:36 UTC (rev 56)
@@ -38,8 +38,20 @@
 AC_SUBST(VERSION)
 
 
+# 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`
+changequote(,)dnl
+BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
+tmp="`echo '$Revision$' | sed 's/[^0-9]//g'`"
+changequote([,])dnl
+test -z "$tmp" && tmp="0"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}$tmp"
+AC_SUBST(BUILD_TIMESTAMP)
+AC_SUBST(BUILD_FILEVERSION)
+
+
 # Required tools.
-
 AC_PROG_CC
 AC_PROG_CPP
 AC_CHECK_TOOLS(DLLTOOL, dlltool)


Property changes on: trunk/configure.ac
___________________________________________________________________
Name: svn:keywords
   + Revision

Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in	2005-11-14 18:42:31 UTC (rev 55)
+++ trunk/include/config.nsi.in	2005-11-15 09:08:36 UTC (rev 56)
@@ -20,6 +20,8 @@
 
 !define _PACKAGE @PACKAGE@
 !define _VERSION @VERSION@
+!define _BUILD_FILEVERSION @BUILD_FILEVERSION@
+!define _BUILD_TIMESTAMP   @BUILD_TIMESTAMP@
 
 !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	2005-11-14 18:42:31 UTC (rev 55)
+++ trunk/src/gpg4win-src.nsi	2005-11-15 09:08:36 UTC (rev 56)
@@ -20,6 +20,7 @@
 !cd "${BUILD_DIR}"
 !addincludedir "${TOP_SRCDIR}"
 !addincludedir "${SRCDIR}"
+!addplugindir "${BUILD_DIR}"
 !include "../include/config.nsi"
 
 # We need StrRep.
@@ -32,8 +33,7 @@
 !define PRETTY_PACKAGE "GnuPG For Windows Sources"
 !define PRETTY_PACKAGE_SHORT "GPG4WinSrc"
 !define VERSION "${_VERSION}"
-# FIXME
-!define PROD_VERSION "0.0.0.1"
+!define PROD_VERSION "${_BUILD_FILEVERSION}"
 !define COMPANY "g10 Code GmbH"
 !define COPYRIGHT "Copyright (C) 2005 g10 Code GmbH"
 !define DESCRIPTION "GPG4Win: The GNU Privacy Guard and tools for Windows (Source Files)"

Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi	2005-11-14 18:42:31 UTC (rev 55)
+++ trunk/src/gpg4win.nsi	2005-11-15 09:08:36 UTC (rev 56)
@@ -31,8 +31,7 @@
 !define PRETTY_PACKAGE "GnuPG For Windows"
 !define PRETTY_PACKAGE_SHORT "GPG4Win"
 !define VERSION "${_VERSION}"
-# FIXME
-!define PROD_VERSION "0.0.0.1"
+!define PROD_VERSION "${_BUILD_FILEVERSION}"
 !define COMPANY "g10 Code GmbH"
 !define COPYRIGHT "Copyright (C) 2005 g10 Code GmbH"
 !define DESCRIPTION "GPG4Win: The GNU Privacy Guard and tools for Windows"

Modified: trunk/src/inst-gpgee.nsi
===================================================================
--- trunk/src/inst-gpgee.nsi	2005-11-14 18:42:31 UTC (rev 55)
+++ trunk/src/inst-gpgee.nsi	2005-11-15 09:08:36 UTC (rev 56)
@@ -29,6 +29,10 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_gpgee_src}"
 !else
+  # Try to unregister first
+  Exec 'regsvr32.exe /u /s "$INSTDIR\GPGee.dll"'
+  Sleep 1000
+
   File ${prefix}/GPGee.dll
   File ${prefix}/GPGee.DEU
   File ${prefix}/GPGee.hlp

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2005-11-14 18:42:31 UTC (rev 55)
+++ trunk/src/installer.nsi	2005-11-15 09:08:36 UTC (rev 56)
@@ -33,9 +33,6 @@
 # We use the modern UI.
 !include "MUI.nsh"
 
-# Customj functions and macros for gpg4win. 
-!include "g4wihelp.nsi"
-
 # Set the package name.  Note that this name should not be sufficed
 #  with the version because this would get displayed in the start menu.
 Name "${PRETTY_PACKAGE}"
@@ -200,6 +197,9 @@
 
 # Functions
 
+# Custom functions and macros for gpg4win. 
+!include "g4wihelp.nsi"
+
 # PrintNonAdminWarning
 
 # Check whether the current user is in the Administrator group or an