Author: rjung
Date: Thu May 17 08:28:07 2007
New Revision: 538966
URL: http://svn.apache.org/viewvc?view=rev&rev=538966
Log:
Port r538965 from 1.2.23 branch (enhanced jkrelease.sh script).
Modified:
tomcat/connectors/trunk/jk/tools/jkrelease.sh
Modified: tomcat/connectors/trunk/jk/tools/jkrelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/tools/jkrelease.sh?view=diff&rev=538966&r1=538965&r2=538966
==============================================================================
--- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original)
+++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Thu May 17 08:28:07 2007
@@ -11,15 +11,17 @@
# And any one of: w3m, elinks, links
usage() {
- echo "Usage:: $0 -t VERSION [-T]"
+ echo "Usage:: $0 -t VERSION [-b BRANCH | -T]"
echo " -t: version to package"
+ echo " -b: package from branch BRANCH"
echo " -T: package from trunk"
}
-while getopts :t:T c
+while getopts :t:b:T c
do
case $c in
t) tag=$OPTARG;;
+ b) branch=$OPTARG;;
T) trunk=trunk;;
\:) usage
exit 2;;
@@ -42,16 +44,38 @@
#################### NO CHANGE BELOW THIS LINE ##############
-if [ "X$tag" = "X" ]
+if [ -z "$tag" ]
then
usage
exit 2
fi
-if [ "X$trunk" = "Xtrunk" ]
+if [ -n "$trunk" -a -n "$branch" ]
+then
+ usage
+ echo "Only one of the options '-b' and '-T' allowed."
+ exit 2
+fi
+if [ -n "$trunk" ]
then
JK_SVN_URL="${SVNROOT}/${SVNPROJ}/trunk"
JK_REV=`svn info ${JK_SVN_URL} | awk '$1 == "Revision:" {print $2}'`
+ if [ -z "$JK_REV" ]
+ then
+ echo "No Revision found at '$JK_SVN_URL'"
+ exit 3
+ fi
JK_DIST=${JK_CVST}-${tag}-dev-${JK_REV}-src
+elif [ -n "$branch" ]
+then
+ JK_BRANCH=`echo $branch | sed -e 's#/#__#g'`
+ JK_SVN_URL="${SVNROOT}/${SVNPROJ}/branches/$branch"
+ JK_REV=`svn info ${JK_SVN_URL} | awk '$1 == "Revision:" {print $2}'`
+ if [ -z "$JK_REV" ]
+ then
+ echo "No Revision found at '$JK_SVN_URL'"
+ exit 3
+ fi
+ JK_DIST=${JK_CVST}-${tag}-dev-${JK_BRANCH}-${JK_REV}-src
else
JK_VER=$tag
JK_TAG=`echo $tag | sed -e 's#^#JK_#' -e 's#\.#_#g'`
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
