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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-06-23 00:00:35 +0200 (Tue, 23 Jun 2009)
New Revision: 1202

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/Makefile.am
   trunk/src/inst-libiconv.nsi
   trunk/src/uninst-libiconv.nsi
Log:
Another attempt to build 2.0


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-06-22 21:44:34 UTC (rev 1201)
+++ trunk/ChangeLog	2009-06-22 22:00:35 UTC (rev 1202)
@@ -1,3 +1,10 @@
+2009-06-22  Werner Koch  <wk at g10code.com>
+
+	* Release 2.0.0.
+
+	* src/gpg4win.mk.in: Remove possible triple make invocation to
+	get again duplicable results.
+
 2009-06-22  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* packages/packages.current: Update kleopatra, kdelibs.
@@ -4,8 +11,13 @@
 
 2009-06-22  Werner Koch  <wk at g10code.com>
 
-	Release 2.0.0.
+	* src/inst-libiconv.nsi: Install in stop dir again and keep a copy
+	in pub for now.
+	* src/uninst-libiconv.nsi: Change rules accordingly.
 
+	* src/Makefile.am (versioninfo.txt): Allow for 0 packages which
+	may happen in a make distcheck.
+
 2009-06-22  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* packages/packages.current: Update kleopatra, kdelibs.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-06-22 21:44:34 UTC (rev 1201)
+++ trunk/NEWS	2009-06-22 22:00:35 UTC (rev 1202)
@@ -524,7 +524,7 @@
 (en) Initial release.
 
 
-# Copyright 2005, 2006, 2007, 2008 g10 Code GmbH
+# Copyright 2005, 2006, 2007, 2008, 2009 g10 Code GmbH
 # 
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-06-22 21:44:34 UTC (rev 1201)
+++ trunk/src/Makefile.am	2009-06-22 22:00:35 UTC (rev 1202)
@@ -449,7 +449,7 @@
 # duplicate entries in case one package has been rebuild (which is
 # common when developing a new version).
 versioninfo.txt:
-	$(SHA1SUM) $(pkg_files) > versioninfo.tmp
+	$(SHA1SUM) $(pkg_files) </dev/null > versioninfo.tmp
 	set -e; \
 	( while read a b; do echo "$$a $$(basename $$b)"; \
             done < versioninfo.tmp \

Modified: trunk/src/inst-libiconv.nsi
===================================================================
--- trunk/src/inst-libiconv.nsi	2009-06-22 21:44:34 UTC (rev 1201)
+++ trunk/src/inst-libiconv.nsi	2009-06-22 22:00:35 UTC (rev 1202)
@@ -29,7 +29,7 @@
 !else
 Section "-libiconv" SEC_libiconv
 !endif
-  SetOutPath "$INSTDIR\pub"
+  SetOutPath "$INSTDIR"
 !ifdef SOURCES
   File "${gpg4win_pkg_libiconv_src}"
 !else
@@ -42,7 +42,18 @@
       File /oname=iconv.dll.tmp "${prefix}/bin/iconv.dll"
       Rename /REBOOTOK iconv.dll.tmp iconv.dll
 
+  # Install a copy in pub; this is a bad hack and should be removed ASAP.
+  SetOutPath "$INSTDIR\pub"
+  ClearErrors
+  SetOverwrite try
+  File "${prefix}/bin/iconv.dll"
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=iconv.dll.tmp "${prefix}/bin/iconv.dll"
+      Rename /REBOOTOK iconv.dll.tmp iconv.dll
 
+  SetOutPath "$INSTDIR"
+
 !ifdef DEBUG
   # We install a couple of binaries that may be useful for testing.
   File ${prefix}/bin/charset.dll

Modified: trunk/src/uninst-libiconv.nsi
===================================================================
--- trunk/src/uninst-libiconv.nsi	2009-06-22 21:44:34 UTC (rev 1201)
+++ trunk/src/uninst-libiconv.nsi	2009-06-22 22:00:35 UTC (rev 1202)
@@ -30,10 +30,11 @@
   Push "${gpg4win_pkg_libiconv_src}"
   Call un.SourceDelete
 !else
+  Delete "$INSTDIR\iconv.dll"
   Delete "$INSTDIR\pub\iconv.dll"
 !ifdef DEBUG
-  Delete "$INSTDIR\pub\charset.dll"
-  Delete "$INSTDIR\pub\iconv.exe"
+  Delete "$INSTDIR\charset.dll"
+  Delete "$INSTDIR\iconv.exe"
 !endif
   RMDir "$INSTDIR"
 !endif