Author: jfrederic.clere(a)jboss.com Date: 2007-12-14 05:02:17 -0500 (Fri, 14 Dec 2007) New Revision: 1212 Modified: trunk/build/unix/build.sh trunk/build/unix/package.list Log: Modify the package.list to allow missing subcomponents/dependencies. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2007-12-14 08:00:33 UTC (rev 1211) +++ trunk/build/unix/build.sh 2007-12-14 10:02:17 UTC (rev 1212) @@ -42,11 +42,13 @@ has_posix_tar=true # parameters -has_zlib=true -has_openssl=false has_apr=true has_apu=true has_api=true +has_openssl=true +has_zlib=true +has_jk=true + build_api=false build_zlib=false has_cache=false @@ -144,14 +146,15 @@ fi export patch -# Read apr and openssl version. +# Read tag and version of subcomponent/dependencies. parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep "|$build_version|"` -apr_version=`echo "${parg}" | ${awk} -F'|' '{print $3}'` -apu_version=`echo "${parg}" | ${awk} -F'|' '{print $4}'` -api_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'` -ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $6}'` -zlib_version=`echo "${parg}" | ${awk} -F'|' '{print $7}'` -svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $8}'` +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}'` if [ "x" = "x${zlib_version}" ]; then has_zlib=false @@ -168,6 +171,9 @@ if [ "x" = "x${api_version}" ]; then has_api=false fi +if [ "x" = "x${jk_version}" ]; then + has_jk=false +fi # Get plaform information so_extension=so @@ -237,6 +243,29 @@ BUILD_SYS=windows ;; esac + +# +# Display what we are going to do. +echo "Building ${PACKAGE} on ${BUILD_SYS} ${BUILD_CPU}" +if $has_apr; then +echo "using apr: ${apr_version}" +fi +if $has_apu; then +echo "using apr-util: ${apu_version}" +fi +if $has_api; then +echo "using apr-iconv: ${api_version}" +fi +if $has_openssl; then +echo "using openSSL: ${ssl_version}" +fi +if $has_zlib; then +echo "using zlib: ${zlib_version}" +fi +if $has_jk; then +echo "using mod_jk: ${jk_version}" +fi + export so_extension export NATIVEEOL export BUILD_SYS Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2007-12-14 08:00:33 UTC (rev 1211) +++ trunk/build/unix/package.list 2007-12-14 10:02:17 UTC (rev 1212) @@ -1,13 +1,13 @@ # list of the packages # add new versions of package after existing ones. -jboss-native|2.0.1|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3|TOMCAT_NATIVE_1_1_11 -jboss-native|2.0.2|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3|TOMCAT_NATIVE_1_1_11 -jboss-native|2.0.3-dev|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3|trunk -jboss-native|2.0.3|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3|TOMCAT_NATIVE_1_1_11 +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-dev|trunk|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3 +jboss-native|2.0.3|TOMCAT_NATIVE_1_1_11|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3 # SIGHT -jboss-sight|1.0.0|1.2.9|1.2.8|1.2.1|||trunk -jboss-sight|1.0.1|1.2.8|1.2.8|1.2.1|||trunk -jboss-sight|1.0.2|1.2.8|1.2.8|1.2.1|||trunk +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 # httpd -jboss-httpd|0.0.1||||||2.2.6 -rhel-httpd|0.0.1||||||httpd-2_2_3-11_el5 +jboss-httpd|0.0.1|2.2.6 +rhel-httpd|0.0.1|httpd-2_2_3-11_el5