Hi,
per a wrowe request, I added the following target httpd-apr-trunk which
is httpd-trunk against ap{r,u}-trunk as apposed to httpd-trunk against
ap{r,u} against 1.2.7.
I also did s/CVS/SVN/ and s/snv/svn/
I should note that as 2.3.x has no tags yet, this isn't really testable
since there is not httpd tag to check out.
HTH
[Patch attached]
--
------------------------------------------------------------------------
Philip M. Gollucci ([EMAIL PROTECTED]) 323.219.4708
Consultant / http://p6m7g8.net/Resume/resume.shtml
Senior Software Engineer - TicketMaster - http://ticketmaster.com
1024D/A79997FA F357 0FDD 2301 6296 690F 6A47 D55A 7172 A799 97F
"It takes a minute to have a crush on someone, an hour to like someone,
and a day to love someone, but it takes a lifetime to forget someone..."
Index: release.sh
===================================================================
--- release.sh (revision 406855)
+++ release.sh (working copy)
@@ -5,10 +5,10 @@
# USAGE: release.sh [--security] [--tag TAG POSTFIX] [--postfix POSTFIX]
# [--rev REV] PROJECT VERSION [SIGNING-USER]
#
-# The project is either 'httpd-2.0', 'httpd-2.2', 'httpd-2.3'
+# The project is either 'httpd-2.0', 'httpd-2.2', 'httpd-2.3',
'httpd-apr-trunk'
#
# The version number is specified as MAJOR.MINOR.PATCH (and will be used in
-# the output tarball name). The script will then look for a CVS tag named
+# the output tarball name). The script will then look for a SVN tag named
# "MAJOR.MINOR.PATCH" and export it into a subdirectory (of the current
# directory). Next, it will run the appropriate commands to prepare and
# construct the tarball. The subdirectory will be cleaned up upon exit.
@@ -114,6 +114,21 @@
apr_tag="1.2.7"
apu_tag="1.2.7"
;;
+
+ httpd-apr-trunk)
+ ver_path="include/ap_release.h"
+ ver_define="AP_SERVER_PATCHLEVEL"
+
+ expected_major="2"
+ expected_minor="3"
+
+ branch="trunk"
+
+ apr_xxx_in_srclib=1
+ apr_tag="trunk"
+ apu_tag="trunk"
+ ;;
+
*)
echo "ERROR: '$1' is an unknown project." >&2
echo " choose one of: httpd-2.0, httpd-2.2, or httpd-2.3" >&2
@@ -185,13 +200,25 @@
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
+### Add a check to see if what was checked out matches $svn
if test ${apr_xxx_in_srclib}; then
+ apr_svn_uri="http://svn.apache.org/repos/asf/apr/apr";
+ apu_svn_uri="http://svn.apache.org/repos/asf/apr/apr-util";
+
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
+ if test ${apr_tag} = "trunk"; then
+ svn export ${apr_svn_uri}/trunk ${dirname}/srclib/apr > /dev/null || exit 1
+ else
+ svn export ${apr_svn_uri}/tags/${apr_tag} ${dirname}/srclib/apr >
/dev/null || exit 1
+ fi
+
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
+ if test ${apu_tag} = "trunk"; then
+ svn export ${apu_svn_uri}/trunk ${dirname}/srclib/apr-util > /dev/null ||
exit 1
+ else
+ svn export ${apu_svn_uri}/tags/${apu_tag} ${dirname}/srclib/apr-util >
/dev/null || exit 1
+ fi
fi
echo $split
