svn commit: r157724 - httpd/httpd/dist/tools/release.sh

[st...@apache.org]

Author: striker
Date: Wed Mar 16 00:36:47 2005
New Revision: 157724

URL: http://svn.apache.org/viewcvs?view=rev&rev=157724
Log:
* tools/release.sh

  Add a --rev argument to accomodate easy rolling of snapshots.

  Update the apr/apr-util tags required for httpd-2.1.

Modified:
    httpd/httpd/dist/tools/release.sh

Modified: httpd/httpd/dist/tools/release.sh
URL: http://svn.apache.org/viewcvs/httpd/httpd/dist/tools/release.sh?view=diff&r1=157723&r2=157724
==============================================================================
--- httpd/httpd/dist/tools/release.sh (original)
+++ httpd/httpd/dist/tools/release.sh Wed Mar 16 00:36:47 2005
@@ -2,7 +2,8 @@
 #
 # release.sh : build a release tarball
 #
-# USAGE: release.sh [--security] [--tag TAG POSTFIX] PROJECT VERSION [SIGNING-USER]
+# USAGE: release.sh [--security] [--tag TAG] [--postfix POSTFIX]
+#                   [--rev REV] PROJECT VERSION [SIGNING-USER]
 #
 #   The project is either 'httpd-2.0' or 'httpd-2.1'
 #
@@ -40,9 +41,14 @@
       shift 2 
       ;;
 
+    --rev)
+      rev="$2"
+      shift 2
+      ;;
+
     --*)
      echo "Unknown option '$1'" >&2
-     echo "USAGE: $0 [--security] [--tag TAG POSTFIX] [--postfix POSTFIX] PROJECT VERSION [SIGNING-USER]" >&2
+     echo "USAGE: $0 [--security] [--tag TAG POSTFIX] [--postfix POSTFIX] [--rev REV] PROJECT VERSION [SIGNING-USER]" >&2
      echo "  see the comments in this script for more info." >&2
      exit 1
      ;;
@@ -55,7 +61,7 @@
 done
 
 if test "$#" != 2 && test "$#" != 3; then
-  echo "USAGE: $0 [--security] [--tag TAG POSTFIX] [--postfix POSTFIX] PROJECT VERSION [SIGNING-USER]" >&2
+  echo "USAGE: $0 [--security] [--tag TAG POSTFIX] [--postfix POSTFIX] [--rev REV] PROJECT VERSION [SIGNING-USER]" >&2
   echo "  see the comments in this script for more info." >&2
   exit 1
 fi
@@ -75,8 +81,11 @@
     expected_major="2"
     expected_minor="0"
 
+    branch="branches/2.0.x"
+
     apr_xxx_in_srclib=1
     apr_tag="0.9.5"
+    apu_tag="0.9.5"
     ;;
   httpd-2.1)
     ver_path="include/ap_release.h"
@@ -85,8 +94,11 @@
     expected_major="2"
     expected_minor="1"
 
+    branch="trunk"
+
     apr_xxx_in_srclib=1
-    apr_tag="1.0.1"
+    apr_tag="1.1.1"
+    apu_tag="1.1.2"
     ;;
   *)
     echo "ERROR: '$1' is an unknown project." >&2
@@ -109,11 +121,18 @@
 if test "${postfix}" != ""; then
   postfix="-${postfix}"
   dirname="${dirname}${postfix}"
+elif test "${rev}" != ""; then
+  postfix="-r${rev}"
+  dirname="${dirname}${postfix}"
 fi
 if test ${security_release}; then
   dirname="${dirname}-security"
 fi
 
+if test "$rev" != ""; then
+  rev="-r ${rev}"
+fi
+
 split="---------------------------------------------------------------------"
 
 echo $split
@@ -146,15 +165,19 @@
 echo "Starting SVN export of ${project} to ${dirname} ..."
 echo ""
 
-svn export http://svn.apache.org/repos/asf/httpd/httpd/tags/${tagname} ${dirname} > /dev/null || exit 1
+if test "${rev}" != ""; then
+  svn export ${rev} http://svn.apache.org/repos/asf/httpd/httpd/${branch} ${dirname} > /dev/null || exit 1
+else
+  svn export http://svn.apache.org/repos/asf/httpd/httpd/tags/${tagname} ${dirname} > /dev/null || exit 1
+fi
 
 ### Add a check to see if what was checked out matches $vsn
 
 if test ${apr_xxx_in_srclib}; then
   echo "Starting SVN export of apr-${apr_tag} to ${dirname}/srclib ..."
   svn export http://svn.apache.org/repos/asf/apr/apr/tags/${apr_tag} ${dirname}/srclib/apr > /dev/null || exit 1
-  echo "Starting SVN export of apr-util-${apr_tag} to ${dirname}/srclib ..."
-  svn export http://svn.apache.org/repos/asf/apr/apr-util/tags/${apr_tag} ${dirname}/srclib/apr-util > /dev/null || exit 1
+  echo "Starting SVN export of apr-util-${apu_tag} to ${dirname}/srclib ..."
+  svn export http://svn.apache.org/repos/asf/apr/apr-util/tags/${apu_tag} ${dirname}/srclib/apr-util > /dev/null || exit 1
 fi
 
 echo $split