On 02/26/2012 04:58 PM, Rainer Jung wrote:
On 24.02.2012 13:09, mt...@apache.org wrote:
JKJNISVN=$SVNBASE/${JKJNIEXT}
if [ "x$JKJNIEXT" = "xtrunk" ]; then
- JKJNIVER=`svn info ${JKJNISVN} | awk '$1 == "Revision:" {print $2}'`
-elif [ $USE_BRANCH -eq 1 ]; then
- JKJNIBRANCH=${JKJNIEXT}
- JKJNISVN=$SVNBASE/branches/${JKJNIBRANCH}
- JKJNIVER=${JKJNIBRANCH}-`svn info ${JKJNISVN} | awk '$1 == "Revision:" {print 
$2}'`
+ i="`svn info`"
+ JKJNIVER=`echo "$i" | awk '$1 == "Revision:" {print $2}'`
+ JKJNISVN=`echo "$i" | awk '$1 == "URL:" {print $2}'`

Just in case you didn't notice: before you could run the script without having a 
workspace checked out. Now this needs a local workspace to run "svn info" on 
it. Before it ran the info on the URL computed.


Yes I did that intentionally to simplify the release script.

Note that layouts in trunk and 1.1.x branch are already different so you
cannot release arbitrary tag/branch with it.
This one is specific for 1.1.x branch.
For trunk all branch mechanism should be removed as well because
the premise of branches is that they are different so you will
at least need to run jnirelease.sh from the target branch.



Regards
--
^TM

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to