February 2008 - jbossnative-commits

JBoss Native SVN: r1346 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-02-04 07:51:06 -0500 (Mon, 04 Feb 2008) New Revision: 1346 Modified: trunk/build/unix/build.sh trunk/build/unix/buildsrc.rhel-httpd.sh Log: Arrange the rhel apr logic. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-02-04 11:41:18 UTC (rev 1345) +++ trunk/build/unix/build.sh 2008-02-04 12:51:06 UTC (rev 1346) @@ -188,13 +188,17 @@ apr:*) apr_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` apr_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` - has_apr=true + if [ "$apr_type" == "v" ]; then + has_apr=true + fi export apr_version ;; apu:*) apu_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` apu_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` - has_apu=true + if [ "$apu_type" == "v" ]; then + has_apu=true + fi export apu_version ;; api:*) Modified: trunk/build/unix/buildsrc.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 11:41:18 UTC (rev 1345) +++ trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 12:51:06 UTC (rev 1346) @@ -50,14 +50,24 @@ # # Build the sources from the rhel repo according to the information in data. # http://cvs.devel.redhat.com/cgi-bin/cvsweb.cgi/rpms/apr/RHEL-5/ -util/buildrhelsrc.sh http://cvs.devel.redhat.com/repo/dist/apr apr/RHEL-5 trunk ${native_dist} apr rhel-httpd ${build_version} +if [ "x${apr_version}" = "x" ]; then + tag=trunk +else + tag=${apr_version} +fi +util/buildrhelsrc.sh http://cvs.devel.redhat.com/repo/dist/apr apr/RHEL-5 ${tag} ${native_dist} apr rhel-httpd ${build_version} if [ $? -ne 0 ]; then echo "util/buildrhelsrc.sh apr failed" exit 1 fi # http://cvs.devel.redhat.com/cgi-bin/cvsweb.cgi/rpms/apr-util/RHEL-5/ -util/buildrhelsrc.sh http://cvs.devel.redhat.com/repo/dist/apr-util apr-util/RHEL-5 trunk ${native_dist} apr-util rhel-httpd ${build_version} +if [ "x${apu_version}" = "x" ]; then + tag=trunk +else + tag=${apu_version} +fi +util/buildrhelsrc.sh http://cvs.devel.redhat.com/repo/dist/apr-util apr-util/RHEL-5 ${tag} ${native_dist} apr-util rhel-httpd ${build_version} if [ $? -ne 0 ]; then echo "util/buildrhelsrc.sh apr-util failed" exit 1

16 years, 2 months

1
0
0 / 0

JBoss Native SVN: r1345 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-02-04 06:41:18 -0500 (Mon, 04 Feb 2008) New Revision: 1345 Modified: trunk/build/unix/build.sh trunk/build/unix/package.list Log: Fix OpenSSL package version Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-02-04 11:24:53 UTC (rev 1344) +++ trunk/build/unix/build.sh 2008-02-04 11:41:18 UTC (rev 1345) @@ -326,7 +326,7 @@ echo "using apr-iconv: ${api_version}" fi if $has_openssl; then -echo "using openSSL: ${ssl_version}" +echo "using OpenSSL: ${ssl_version}" fi if $has_zlib; then echo "using zlib: ${zlib_version}" Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2008-02-04 11:24:53 UTC (rev 1344) +++ trunk/build/unix/package.list 2008-02-04 11:41:18 UTC (rev 1345) @@ -10,4 +10,4 @@ jboss-sight|1.0.2|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1 # httpd jboss-httpd|0.0.1|2.2.6 -rhel-httpd|0.0.1|httpd-2_2_3-11_el5_1_3|apr:r:apr-1_2_7-11|apu:r:apr-util-1_2_7-7_el5|api:v:1.2.1|ssl:v0.9.8e|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8 +rhel-httpd|0.0.1|httpd-2_2_3-11_el5_1_3|apr:r:apr-1_2_7-11|apu:r:apr-util-1_2_7-7_el5|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8

16 years, 2 months

1
0
0 / 0

JBoss Native SVN: r1344 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-02-04 06:24:53 -0500 (Mon, 04 Feb 2008) New Revision: 1344 Modified: trunk/build/unix/build.sh trunk/build/unix/package.list Log: Arrange the package.list syntax. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-02-04 09:53:00 UTC (rev 1343) +++ trunk/build/unix/build.sh 2008-02-04 11:24:53 UTC (rev 1344) @@ -45,14 +45,14 @@ has_posix_tar=true # parameters -has_apr=true -has_apu=true -has_api=true -has_openssl=true -has_zlib=true -has_jk=true -has_iconv=true -has_expat=true +has_apr=false +has_apu=false +has_api=false +has_openssl=false +has_zlib=false +has_jk=false +has_iconv=false +has_expat=false build_api=false build_zlib=false @@ -174,43 +174,64 @@ export patch # Read tag and version of subcomponent/dependencies. -parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep "|$build_version|"` -svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $3}'` -apr_version=`echo "${parg}" | ${awk} -F'|' '{print $4}'` -apu_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'` -api_version=`echo "${parg}" | ${awk} -F'|' '{print $6}'` -ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $7}'` -zlib_version=`echo "${parg}" | ${awk} -F'|' '{print $8}'` -jk_version=`echo "${parg}" | ${awk} -F'|' '{print $9}'` -iconv_version=`echo "${parg}" | ${awk} -F'|' '{print $10}'` -expat_version=`echo "${parg}" | ${awk} -F'|' '{print $11}'` +parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep "|$build_version|" | sed 's:|: :g'` -if [ "x" = "x${zlib_version}" ]; then - has_zlib=false -fi -if [ "x" = "x${ssl_version}" ]; then - has_openssl=false -fi -if [ "x" = "x${apr_version}" ]; then - has_apr=false -fi -if [ "x" = "x${apu_version}" ]; then - has_apu=false -fi -if [ "x" = "x${api_version}" ]; then - has_api=false -fi -if [ "x" = "x${jk_version}" ]; then - has_jk=false -else - export jk_version -fi -if [ "x" = "x${iconv_version}" ]; then - has_iconv=false -fi -if [ "x" = "x${expat_version}" ]; then - has_expat=false -fi +i=0 +for arg in `echo "${parg}"` +do + i=`expr $i + 1` + if [ $i -eq 3 ]; then + svn_tagname=$arg + fi + if [ $i -gt 3 ]; then + case $arg in + apr:*) + apr_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + apr_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_apr=true + export apr_version + ;; + apu:*) + apu_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + apu_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_apu=true + export apu_version + ;; + api:*) + api_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + api_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_api=true + export api_version + ;; + ssl:*) + ssl_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + ssl_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_ssl=true + ;; + zlib:*) + zlib_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + zlib_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_zlib=true + ;; + jk:*) + jk_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + jk_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_jk=true + export jk_version + ;; + iconv:*) + iconv_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + iconv_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_iconv=true + ;; + expat:*) + expat_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + expat_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_expat=true + ;; + esac + fi +done # Get plaform information so_extension=so Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2008-02-04 09:53:00 UTC (rev 1343) +++ trunk/build/unix/package.list 2008-02-04 11:24:53 UTC (rev 1344) @@ -1,13 +1,13 @@ # list of the packages # add new versions of package after existing ones. -jboss-native|2.0.1|TOMCAT_NATIVE_1_1_11|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3 -jboss-native|2.0.2|TOMCAT_NATIVE_1_1_11|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3 -jboss-native|2.0.3|TOMCAT_NATIVE_1_1_12|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3 -jboss-native|2.0.4-dev|trunk|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3 +jboss-native|2.0.1|TOMCAT_NATIVE_1_1_11|apr:v:1.2.9|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3 +jboss-native|2.0.2|TOMCAT_NATIVE_1_1_11|apr:v:1.2.9|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3 +jboss-native|2.0.3|TOMCAT_NATIVE_1_1_12|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3 +jboss-native|2.0.4-dev|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3 # SIGHT -jboss-sight|1.0.0|trunk|1.2.9|1.2.8|1.2.1 -jboss-sight|1.0.1|trunk|1.2.8|1.2.8|1.2.1 -jboss-sight|1.0.2|trunk|1.2.8|1.2.8|1.2.1 +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 +jboss-sight|1.0.2|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1 # httpd jboss-httpd|0.0.1|2.2.6 -rhel-httpd|0.0.1|httpd-2_2_3-11_el5|||1.2.1||1.2.3|1.2.26|1.11|1.95.8 +rhel-httpd|0.0.1|httpd-2_2_3-11_el5_1_3|apr:r:apr-1_2_7-11|apu:r:apr-util-1_2_7-7_el5|api:v:1.2.1|ssl:v0.9.8e|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8

16 years, 2 months

1
0
0 / 0

JBoss Native SVN: r1343 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-02-04 04:53:00 -0500 (Mon, 04 Feb 2008) New Revision: 1343 Modified: trunk/build/unix/buildbin.rhel-httpd.windows.sh Log: Fix line endings Property changes on: trunk/build/unix/buildbin.rhel-httpd.windows.sh ___________________________________________________________________ Name: svn:eol-style - native + LF

16 years, 2 months

1
0
0 / 0

JBoss Native SVN: r1342 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-02-04 04:40:57 -0500 (Mon, 04 Feb 2008) New Revision: 1342 Modified: trunk/build/unix/buildbin.rhel-httpd.windows.sh Log: Use correct location Modified: trunk/build/unix/buildbin.rhel-httpd.windows.sh =================================================================== --- trunk/build/unix/buildbin.rhel-httpd.windows.sh 2008-02-04 09:21:40 UTC (rev 1341) +++ trunk/build/unix/buildbin.rhel-httpd.windows.sh 2008-02-04 09:40:57 UTC (rev 1342) @@ -61,12 +61,14 @@ fi mkdir -p ${output_loc}/httpd-2.2 +win_output_loc=`cygpath -w -a ${output_loc}/httpd-2.2` + native_sources=srclib/`ls srclib | grep httpd-2.2` src_dir=`cygpath -w -a ${native_sources}` (cd $native_sources echo "Running nmake at `pwd`" - nmake -f NMAKEmakefile PREFIX=${win_prefix_loc} ${add_conf} install + nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install ) echo "Done"

16 years, 2 months

1
0
0 / 0

JBoss Native SVN: r1341 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-02-04 04:21:40 -0500 (Mon, 04 Feb 2008) New Revision: 1341 Modified: trunk/build/unix/buildsrc.rhel-httpd.sh Log: Fix zlib copy Modified: trunk/build/unix/buildsrc.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 09:14:02 UTC (rev 1340) +++ trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 09:21:40 UTC (rev 1341) @@ -91,9 +91,10 @@ mv ${native_dist}/srclib/${apudirsources} ${dirsources}/srclib/apr-util fi if [ "${BUILD_SYS}" == "windows" ]; then + rm -rf ${dirsources}/srclib/zlib zlibdirsources=`ls ${native_dist}/srclib/ | grep zlib-` echo "Replacing ${dirsources}/srclib/zlib by ${native_dist}/srclib/${zlibdirsources}" - mv ${native_dist}/srclib/${zlibdirsources} ${dirsources}/srclib/zlib + cp -rp ${native_dist}/srclib/${zlibdirsources} ${dirsources}/srclib/zlib fi #

16 years, 2 months

1
0
0 / 0

JBoss Native SVN: r1340 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-02-04 04:14:02 -0500 (Mon, 04 Feb 2008) New Revision: 1340 Modified: trunk/build/unix/buildsrc.rhel-httpd.sh Log: Copy zlib to the httpd/srclib only on windows for now Modified: trunk/build/unix/buildsrc.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 09:05:24 UTC (rev 1339) +++ trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 09:14:02 UTC (rev 1340) @@ -90,8 +90,7 @@ echo "Replacing ${dirsources}/srclib/apr-util by ${native_dist}/srclib/${apudirsources}" mv ${native_dist}/srclib/${apudirsources} ${dirsources}/srclib/apr-util fi -if [ -d ${dirsources}/srclib/zlib ]; then - rm -rf ${dirsources}/srclib/zlib +if [ "${BUILD_SYS}" == "windows" ]; then zlibdirsources=`ls ${native_dist}/srclib/ | grep zlib-` echo "Replacing ${dirsources}/srclib/zlib by ${native_dist}/srclib/${zlibdirsources}" mv ${native_dist}/srclib/${zlibdirsources} ${dirsources}/srclib/zlib

16 years, 2 months

1
0
0 / 0

JBoss Native SVN: r1339 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-02-04 04:05:24 -0500 (Mon, 04 Feb 2008) New Revision: 1339 Modified: trunk/build/unix/buildsrc.rhel-httpd.sh Log: Copy zlib to the httpd/srclib Modified: trunk/build/unix/buildsrc.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 08:58:16 UTC (rev 1338) +++ trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 09:05:24 UTC (rev 1339) @@ -86,10 +86,16 @@ fi if [ -d ${dirsources}/srclib/apr-util ]; then rm -rf ${dirsources}/srclib/apr-util - aprdirsources=`ls ${native_dist}/srclib/ | grep apr-util-` - echo "Replacing ${dirsources}/srclib/apr-util by ${native_dist}/srclib/${aprdirsources}" - mv ${native_dist}/srclib/${aprdirsources} ${dirsources}/srclib/apr-util + apudirsources=`ls ${native_dist}/srclib/ | grep apr-util-` + echo "Replacing ${dirsources}/srclib/apr-util by ${native_dist}/srclib/${apudirsources}" + mv ${native_dist}/srclib/${apudirsources} ${dirsources}/srclib/apr-util fi +if [ -d ${dirsources}/srclib/zlib ]; then + rm -rf ${dirsources}/srclib/zlib + zlibdirsources=`ls ${native_dist}/srclib/ | grep zlib-` + echo "Replacing ${dirsources}/srclib/zlib by ${native_dist}/srclib/${zlibdirsources}" + mv ${native_dist}/srclib/${zlibdirsources} ${dirsources}/srclib/zlib +fi # # Add mod_jk sources.

16 years, 2 months

1
0
0 / 0

JBoss Native SVN: r1338 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-02-04 03:58:16 -0500 (Mon, 04 Feb 2008) New Revision: 1338 Modified: trunk/build/unix/package.list Log: Add zlib to the httpd package Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2008-02-04 08:41:51 UTC (rev 1337) +++ trunk/build/unix/package.list 2008-02-04 08:58:16 UTC (rev 1338) @@ -10,4 +10,4 @@ jboss-sight|1.0.2|trunk|1.2.8|1.2.8|1.2.1 # httpd jboss-httpd|0.0.1|2.2.6 -rhel-httpd|0.0.1|httpd-2_2_3-11_el5|||1.2.1|||1.2.26|1.11|1.95.8 +rhel-httpd|0.0.1|httpd-2_2_3-11_el5|||1.2.1||1.2.3|1.2.26|1.11|1.95.8

16 years, 2 months

1
0
0 / 0

JBoss Native SVN: r1337 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-02-04 03:41:51 -0500 (Mon, 04 Feb 2008) New Revision: 1337 Modified: trunk/build/unix/buildbin.jboss-httpd.windows.sh Log: Hmm, this needs to be LF Property changes on: trunk/build/unix/buildbin.jboss-httpd.windows.sh ___________________________________________________________________ Name: svn:eol-style + LF

16 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits February 2008