Author: rjung Date: Wed Sep 16 23:10:03 2009 New Revision: 816004 URL: http://svn.apache.org/viewvc?rev=816004&view=rev Log: Bring jni (native) release script in trunk closer to the 1.1.x branch version.
Major difference still there: branch still uses the now obsolete "jni" sub directory in order to not confuse existing users by changing the distribution structure in the middle of the branch. Modified: tomcat/native/trunk/jnirelease.sh Modified: tomcat/native/trunk/jnirelease.sh URL: http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=816004&r1=816003&r2=816004&view=diff ============================================================================== --- tomcat/native/trunk/jnirelease.sh (original) +++ tomcat/native/trunk/jnirelease.sh Wed Sep 16 23:10:03 2009 @@ -20,7 +20,7 @@ apr_src_dir=`pwd`/srclib/apr JKJNIEXT="" JKJNIVER="" -SVNBASE=https://svn.apache.org/repos/asf/tomcat/native/ +SVNBASE=https://svn.apache.org/repos/asf/tomcat/native for o do @@ -55,7 +55,7 @@ echo "" echo "Problem finding apr source in: \`$apr_src_dir'" echo "Use:" - echo " --with-apr=<directory>" + echo " --with-apr=<directory>" echo "" exit 1 fi @@ -64,7 +64,7 @@ echo "" echo "Unknown SVN version" echo "Use:" - echo " --ver=<version>|trunk" + echo " --ver=<version>|<branch>|trunk" echo "" exit 1 fi @@ -91,13 +91,25 @@ exit 1 fi -echo "Using SVN repo : \`$SVNBASE/${JKJNIEXT}'" +echo $JKJNIEXT | egrep -e 'x$' > /dev/null 2>&1 +if [ $? -eq 0 ]; then + USE_BRANCH=1 +else + USE_BRANCH=0 +fi + +JKJNISVN=$SVNBASE/${JKJNIEXT} if [ "x$JKJNIEXT" = "xtrunk" ]; then - JKJNIVER=`svn info $SVNBASE | awk '$1 == "Revision:" {print $2}'` + 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}'` else JKJNIVER=$JKJNIEXT - JKJNIEXT="tags/other/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`" + JKJNISVN="${SVNBASE}/tags/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`" fi +echo "Using SVN repo : \`${JKJNISVN}'" echo "Using version : \`${JKJNIVER}'" @@ -105,7 +117,7 @@ rm -rf ${JKJNIDIST} -svn export $SVNBASE/${JKJNIEXT} ${JKJNIDIST} +svn export ${JKJNISVN} ${JKJNIDIST} if [ $? -ne 0 ]; then echo "svn export failed" exit 1 @@ -138,10 +150,10 @@ JKWINDIST=tomcat-native-${JKJNIVER}-win32-src rm -rf ${JKWINDIST} mkdir -p ${JKWINDIST} -svn export --native-eol CRLF $SVNBASE/${JKJNIEXT}/native ${JKWINDIST}/native -svn cat $SVNBASE/${JKJNIEXT}/KEYS > ${JKWINDIST}/KEYS -svn cat $SVNBASE/${JKJNIEXT}/LICENSE > ${JKWINDIST}/LICENSE -svn cat $SVNBASE/${JKJNIEXT}/NOTICE > ${JKWINDIST}/NOTICE -svn cat $SVNBASE/${JKJNIEXT}/README.txt > ${JKWINDIST}/README.txt +svn export --native-eol CRLF ${JKJNISVN}/native ${JKWINDIST}/native +svn cat ${JKJNISVN}/KEYS > ${JKWINDIST}/KEYS +svn cat ${JKJNISVN}/LICENSE > ${JKWINDIST}/LICENSE +svn cat ${JKJNISVN}/NOTICE > ${JKWINDIST}/NOTICE +svn cat ${JKJNISVN}/README.txt > ${JKWINDIST}/README.txt cp ${JKJNIDIST}/CHANGELOG.txt ${JKWINDIST}/ zip -9rqyo ${JKWINDIST}.zip ${JKWINDIST} --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org