follows ldns makedist.sh changes for maintainer releases.

git-svn-id: file:///svn/unbound/trunk@1391 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index d0d452b7f0828822870a96ccc8f95baa48f7ea6f..3b05bde5c7e2ff30604e7ef6842506a591d3ed12 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+17 December 2008: Wouter
+       - follows ldns makedist.sh. -rc option. autom4te dir removed.
+
 16 December 2008: Wouter
        - follow makedist improvements from ldns, for maintainers prereleases.
        - snapshot version uses _ not - to help rpm distinguish the

diff --git a/makedist.sh b/makedist.sh
index 7d2b5e5fc55f3d20c5b71e18ad18ee6e3dad2899..be318d5d7966affdbf12e87771827bba1f992fea 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -48,6 +48,9 @@ Generate a distribution tar file for NSD.
     -h           This usage information.
     -s           Build a snapshot distribution file.  The current date is
                  automatically appended to the current NSD version number.
+    -rc <nr>     Build a release candidate, the given string will be added
+                 to the version number 
+                 (which will then be unbound-<version>_rc<number>)
     -d SVN_root  Retrieve the NSD source from the specified repository.
                  Detected from svn working copy if not specified.
     -l ldnsdir   Directory where ldns resides. Detected from Makefile.
@@ -105,6 +108,7 @@ replace_all () {
     
 
 SNAPSHOT="no"
+RC="no"
 LDNSDIR=""
 
 # Parse the command line arguments.
@@ -124,6 +128,10 @@ while [ "$1" ]; do
             LDNSDIR="$2"
             shift
             ;;
+        "-rc")
+            RC="$2"
+            shift
+            ;;
         *)
             error "Unrecognized argument -- $1"
             ;;
@@ -205,6 +213,18 @@ version=`./configure --version | head -1 | awk '{ print $3 }'` || \
 
 info "Unbound version: $version"
 
+RECONFIGURE="no"
+
+if [ "$RC" != "no" ]; then
+    info "Building Unbound release candidate $RC."
+    version2="${version}_rc$RC"
+    info "Version number: $version2"
+
+    replace_text "configure.ac" "AC_INIT(unbound, $version" "AC_INIT(unbound, $version2"
+    version="$version2"
+    RECONFIGURE="yes"
+fi
+
 if [ "$SNAPSHOT" = "yes" ]; then
     info "Building Unbound snapshot."
     version2="$version_`date +%Y%m%d`"
@@ -212,9 +232,13 @@ if [ "$SNAPSHOT" = "yes" ]; then
 
     replace_text "configure.ac" "AC_INIT(unbound, $version" "AC_INIT(unbound, $version2"
     version="$version2"
+    RECONFIGURE="yes"
+fi
 
+if [ "$RECONFIGURE" = "yes" ]; then
     info "Rebuilding configure script (autoconf) snapshot."
     autoreconf || error_cleanup "Autoconf failed."
+    rm -r autom4te* || error_cleanup "Failed to remove autoconf cache directory."
 fi
 
 replace_all doc/README