Author: jfrederic.clere(a)jboss.com Date: 2009-09-17 04:18:43 -0400 (Thu, 17 Sep 2009) New Revision: 2558 Modified: trunk/build/unix/buildsrc.jboss-native.sh trunk/build/unix/package.list Log: Build a jbossnative 1.1.17-dev Modified: trunk/build/unix/buildsrc.jboss-native.sh =================================================================== --- trunk/build/unix/buildsrc.jboss-native.sh 2009-09-01 15:37:06 UTC (rev 2557) +++ trunk/build/unix/buildsrc.jboss-native.sh 2009-09-17 08:18:43 UTC (rev 2558) @@ -37,15 +37,27 @@ native_tag=$1 native_dist=$2 -if [ $native_tag = "trunk" ]; then - native_svn=http://svn.apache.org/repos/asf/tomcat/native/trunk - native_tag_opt="-r HEAD" - native_ext=current -else - # here we convert something like TOMCAT_NATIVE_1_1_11 to 1.1.11 - native_ext=`echo ${native_tag} | awk -F _ '{ print $3 "." $4 "." $5 }'` - native_svn=http://svn.apache.org/repos/asf/tomcat/native/tags/${native_ta... -fi +case $native_tag in + trunk) + native_svn=http://svn.apache.org/repos/asf/tomcat/native/trunk + native_ext=current + ;; + branches/*) + native_svn=http://svn.apache.org/repos/asf/tomcat/native/$native_tag + native_ext=`echo ${native_tag} | awk -F / '{ print $2}'` + ;; + *) + # XXX the guess is that TOMCAT_NATIVE_1_1_17 and up we won't need jni... + native_val=`echo ${native_tag} | awk -F _ '{ print $3 "0" $4 "0" $5 }'` + native_ext=`echo ${native_tag} | awk -F _ '{ print $3 "." $4 "." $5 }'` + if [ $native_val=-gt 101016 ]; then + native_svn=http://svn.apache.org/repos/asf/tomcat/native/$native_tag + else + native_svn=http://svn.apache.org/repos/asf/tomcat/native/$native_tag/jni + fi + ;; +esac + svn export --native-eol=${NATIVEEOL} ${native_tag_opt} ${native_svn}/native ${native_dist}/srclib/tomcat-native-${native_ext} if [ $? -ne 0 ]; then echo "svn export ${native_tag_opt} failed" Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2009-09-01 15:37:06 UTC (rev 2557) +++ trunk/build/unix/package.list 2009-09-17 08:18:43 UTC (rev 2558) @@ -8,6 +8,7 @@ jboss-native|2.0.6-mac|TOMCAT_NATIVE_1_1_16|apr:v:1.3.3|apu:v:1.3.4|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3 jboss-native|2.0.6|TOMCAT_NATIVE_1_1_16|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3 jboss-native|2.1.0-dev|trunk|apr:v:1.3.3|apu:v:1.3.4|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3 +jboss-native|2.0.7-dev|branches/1.1.x|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3 # SIGHT jboss-sight|1.0.0|trunk|apr:v:1.2.9|apu:v:1.2.8|api:v:1.2.1 jboss-sight|1.0.1|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1