[Gpg4win-commits] r1362 - trunk

[scm-commit@wald.intevation.org]

Author: werner
Date: 2010-03-16 15:27:13 +0100 (Tue, 16 Mar 2010)
New Revision: 1362

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
Log:
Add a copy-release target


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-16 11:44:33 UTC (rev 1361)
+++ trunk/ChangeLog	2010-03-16 14:27:13 UTC (rev 1362)
@@ -1,3 +1,11 @@
+2010-03-16  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (copy-release): New.
+
+	* configure.ac (IS_BETA_BUILD): New.
+	(RELEASEHOST): New.
+	* src/gpg4win.mk (README.$(1).txt): Repalce egrep by IS_BETA_BUILD.
+
 2010-03-16  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* packages/packages.current: Update kleopatra

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2010-03-16 11:44:33 UTC (rev 1361)
+++ trunk/Makefile.am	2010-03-16 14:27:13 UTC (rev 1362)
@@ -67,3 +67,20 @@
 copy-news:
 	cp NEWS doc/website/NEWS.last
 
+
+copy-release: gpg4win-$(VERSION).tar.bz2 src/gpg4win-$(VERSION).exe
+	@echo Copying $(VERSION) to $(RELEASEHOST) >&2
+	@set -e;\
+	if ssh "$$(echo $(RELEASEHOST)|cut -d: -f -1)" \
+        test -f "$$(echo $(RELEASEHOST)/gpg4win-$(VERSION).exe|cut -d: -f2-)";\
+	then echo "This release has already been copied to the server" >&2 ;\
+	else scp gpg4win-$(VERSION).tar.bz2 \
+	         src/gpg4win-$(VERSION).exe \
+	         src/gpg4win-light-$(VERSION).exe \
+	         src/gpg4win-src-$(VERSION).exe  $(RELEASEHOST)/ ;\
+	     for f in en de ; do \
+	       echo scp src/README.$$f.txt \
+	             $(RELEASEHOST)/README-$(VERSION).$$f.txt; \
+	     done;\
+	fi
+

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-03-16 11:44:33 UTC (rev 1361)
+++ trunk/configure.ac	2010-03-16 14:27:13 UTC (rev 1362)
@@ -25,8 +25,8 @@
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 # Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [2.0.2rc2])
-m4_define([my_issvn], [no])
+m4_define([my_version], [2.0.2])
+m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
           ||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
@@ -81,6 +81,12 @@
 AC_SUBST(COMPENDIUM_VERSION_DE)
 AC_SUBST(COMPENDIUM_DATE_DE)
 
+if echo "${PACKAGE_VERSION}" | egrep 'svn|rc|beta|git' >/dev/null ; then 
+  IS_BETA_BUILD=yes
+else
+  IS_BETA_BUILD=no
+fi
+AC_SUBST(IS_BETA_BUILD)
 
 # Generate extended version information.  Note, that for NSIS use we
 # must not translate the dots to commas in the BUILD_FILEVERSION.
@@ -94,8 +100,7 @@
 AC_SUBST(BUILD_ISODATE)
 AC_SUBST(BUILD_FILEVERSION)
 
-
-# To test tye manuals using an actual web server, the preview target
+# To test the manuals using an actual web server, the preview target
 # may be used in doc/manuals.  The default is my (wk) test environment
 # but may be overriden using another preview variable.  PREVIEWHOST is
 # expected to be the target for an rsync command.
@@ -104,6 +109,15 @@
 fi
 AC_SUBST(PREVIEWHOST)
 
+# The final release is copied to an archive server.  The default
+# location may be changed by setting the RELEASEHOST envvar.
+if test -z "$RELEASEHOST" ; then
+   RELEASEHOST="vigenere:tarballs/gpg4win"
+   if test "${IS_BETA_BUILD}" = yes ; then
+      RELEASEHOST="${RELEASEHOST}/Beta"
+   fi
+fi
+AC_SUBST(RELEASEHOST)
 
 # For development of this package it is useful to build without
 # creating the source installer (takes a long time).  This option may
@@ -113,7 +127,6 @@
                    [Do not create the Source installer]),
                     build_source_installer=$enableval,
                     build_source_installer=yes)
-AC_MSG_RESULT($source_installer)
 AM_CONDITIONAL(BUILD_SOURCE_INSTALLER, test "$build_source_installer" = yes)
 
 
@@ -124,7 +137,6 @@
                    [Do not create the light version of the installer]),
                     build_light_installer=$enableval,
                     build_light_installer=yes)
-AC_MSG_RESULT($light_installer)
 AM_CONDITIONAL(BUILD_LIGHT_INSTALLER, test "$build_light_installer" = yes)
 
 AC_ARG_ENABLE(fast-makensis,
@@ -132,7 +144,6 @@
                    [Use a less efficient compressor to speed up building]),
                     use_fast_makensis=$enableval,
                     use_fast_makensis=no)
-AC_MSG_RESULT($light_installer)
 if test "$use_fast_makensis" = yes; then
   EXTRA_MAKENSIS_FLAGS="${EXTRA_MAKENSIS_FLAGS} -DDISABLE_LZMA=1"
 fi