Automagically add a BETA warning if the version number includes

one of the substrings "svn", "rc" or "beta".

diff --git a/ChangeLog b/ChangeLog
index c59fca9..f491482 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-02  Werner Koch  <wk@g10code.com>
+
+       * src/gpg4win.mk.in (README.$(1).txt): Implement beta-warning hack.
+
 2010-02-01  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
 
        * NEWS: Update claws and kleaopatra.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index c7579b4..5eaf5ca 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-02  Werner Koch  <wk@g10code.com>
+
+       * beta-warning.txt: New.
+       * README.en.txt, README.de.txt: Add Beta warning tag.
+
 2010-02-01  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
  
         * logo/gpg4win-nsis-wizard-uninstall-164x314.bmp: Update image.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 170be53..0d48a1c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-EXTRA_DIST = nsi-mode.el pkg-copyright.txt \
+EXTRA_DIST = nsi-mode.el pkg-copyright.txt beta-warning.txt \
             README.ar.txt README.de.txt README.en.txt README.es.txt \
             README.fr.txt README.ru.txt
 

diff --git a/doc/README.ar.txt b/doc/README.ar.txt
index 40e9dd9..b3fcb32 100644 (file)
--- a/doc/README.ar.txt
+++ b/doc/README.ar.txt
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 +++ You are welcome to translate this file into Arabic!
 Please contact the Gpg4win developer mailing list for contributing
 and look at http://gpg4win.de/localize-gpg4win.html +++

diff --git a/doc/README.de.txt b/doc/README.de.txt
index fdefe44..2c72321 100644 (file)
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -7,7 +7,7 @@
 
                   Deutsche README Datei für Gpg4win
                   =================================
-
+!BETA-WARNING!
 Dies ist Gpg4win, Version !VERSION!.
 
 Inhalt:

diff --git a/doc/README.en.txt b/doc/README.en.txt
index 9d3b4da..1f71c8d 100644 (file)
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 This is Gpg4win, version !VERSION!.
 
 Content:

diff --git a/doc/README.es.txt b/doc/README.es.txt
index 046c407..bfcc0e8 100644 (file)
--- a/doc/README.es.txt
+++ b/doc/README.es.txt
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 +++ You are welcome to translate this file into Spanish!
 Please contact the Gpg4win developer mailing list for contributing
 and look at http://gpg4win.de/localize-gpg4win.html +++

diff --git a/doc/README.fr.txt b/doc/README.fr.txt
index 0886fc2..6f3039f 100644 (file)
--- a/doc/README.fr.txt
+++ b/doc/README.fr.txt
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 +++ You are welcome to translate this file into French!
 Please contact the Gpg4win developer mailing list for contributing
 and look at http://gpg4win.de/localize-gpg4win.html +++

diff --git a/doc/README.ru.txt b/doc/README.ru.txt
index f752b3a..60e63e6 100644 (file)
--- a/doc/README.ru.txt
+++ b/doc/README.ru.txt
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 +++ You are welcome to translate this file into Russian!
 Please contact the Gpg4win developer mailing list for contributing
 and look at http://gpg4win.de/localize-gpg4win.html +++

diff --git a/doc/beta-warning.txt b/doc/beta-warning.txt
new file mode 100644 (file)
index 0000000..c7c3334
--- /dev/null
+++ b/doc/beta-warning.txt
@@ -0,0 +1,10 @@
+
+   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+   Attention: This is a BETA version of Gpg4win.  This means, some
+   functionalities might be missing or NOT WORKING CORRECTLY.
+
+   Beta versions are intended for testing by experienced users or
+   administrators to learn about the upcoming version and to suggest
+   changes.  They should not be used in a production environment.
+   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+

diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 6efa6a5..9e20bf9 100644 (file)
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -310,16 +310,20 @@ endef
 # Template for README files
 
 define README_template
-README.$(1).txt : versioninfo.txt NEWS.tmp $(top_srcdir)/doc/README.$(1).txt
+README.$(1).txt : versioninfo.txt NEWS.tmp $(top_srcdir)/doc/README.$(1).txt \
+                  $(top_srcdir)/doc/beta-warning.txt
        sed -e '/^;.*/d;/!VERSIONINFO!/{r versioninfo.txt' -e 'd;}' \
        -e '/!NEWSFILE!/{r NEWS.tmp' -e 'd;}' \
+       -e '/!NEWSFILE!/{r NEWS.tmp' -e 'd;}' \
         -e '/!PKG-COPYRIGHT!/{r $(top_srcdir)/doc/pkg-copyright.txt' -e 'd;}' \
         -e 's,!VERSION!,$(VERSION),g' \
           < $(top_srcdir)/doc/README.$(1).txt \
+          | (if echo "$(VERSION)" | egrep 'svn|rc|beta' >/dev/null; then \
+              sed -e '/!BETA-WARNING!/{r $(top_srcdir)/doc/beta-warning.txt' \
+               -e 'd;}'; else sed -e 's,!BETA-WARNING!,,g'; fi) \
            | awk '{printf "%s\r\n", $$$$0}' >README.$(1).txt
 endef
 
-
 # Insert the template for each source package.
 $(foreach spkg, $(gpg4win_spkgs), $(eval $(call SPKG_template,$(spkg))))