Author: mladen.turk(a)jboss.com Date: 2007-12-12 02:53:08 -0500 (Wed, 12 Dec 2007) New Revision: 1178 Modified: trunk/build/unix/build.sh trunk/build/unix/package.list Log: Add apr-iconv to the core components builds Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2007-12-12 07:39:05 UTC (rev 1177) +++ trunk/build/unix/build.sh 2007-12-12 07:53:08 UTC (rev 1178) @@ -45,6 +45,7 @@ has_openssl=false has_apr=true has_apu=true +has_api=false has_cache=false has_version=false has_package=false @@ -144,8 +145,9 @@ 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}'` -ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'` -svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $6}'` +api_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'` +ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $6}'` +svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $7}'` if [ "x" = "x${ssl_version}" ]; then has_openssl=false @@ -551,6 +553,46 @@ } # +# Build apr-iconv +# $1 directory of the sources directory +# $2 static or shared +buildapi() +{ + api_srcdir=$1 + api_static=$2 + + if $apu_static ; then + api_common_dir=${build_common_dir}-static + else + api_common_dir=${build_common_dir} + fi + + if [ -f ${api_common_dir}/include/apr-1/apr_iconv.h ]; then + echo "Using cached apr-iconv in ${api_common_dir}" + return + fi + echo "Configuring apr-iconv-${api_version} with --prefix=${api_common_dir}" + if $BUILD_WIN ; then + (cd ${api_srcdir} + echo "Building APR iconv ${api_version} ..." + cygwinpath true WITH_APR=${api_common_dir} PREFIX=${api_common_dir} SRCDIR=`pwd` + if $api_static ; then + nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=true install + else + nmake -f NMAKEmakefile $wrapped_args install + fi + ) + else + (cd ${api_srcdir} + ./configure ${add_conf} --with-apr=${api_common_dir} --prefix=${api_common_dir} + echo "Building APR iconv ${api_version} ..." + make + make install + ) + fi +} + +# # Build the binaries # $1 directory where to put the resulting tarball. # XXX: It is always $build_output_dir ! @@ -630,13 +672,17 @@ if $BUILD_WIN ; then APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver... APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap... + APIURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-iconv-${a... APRURLBACK=http://archive.apache.org/dist/apr/apr-${apu_version}-win32-sr... APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}-win... + APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}-wi... else APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver... APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap... + APIURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-iconv-${a... APRURLBACK=http://archive.apache.org/dist/apr/apr-${apr_version}.tar.gz APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}.tar.gz + APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}.ta... fi SSLURL=http://www.openssl.org/source/openssl-${ssl_version}.tar.gz @@ -652,6 +698,9 @@ if $has_apu; then ckeckdownload apr-util-${apu_version} $APUURL $APUURLBACK fi +if $has_api; then + ckeckdownload apr-iconv-${api_version} $APIURL $APIURLBACK +fi # # Get the repository of what we build. @@ -666,7 +715,7 @@ cat > ${package_src_dir}/package.list << EOF # THIS FILE WAS AUTOGENERATED BY `basename $0` # -${PACKAGE}|${build_version}|${apr_version}|${apu_version}|${ssl_version}|${svn_tagname} +${PACKAGE}|${build_version}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${svn_tagname} EOF @@ -676,6 +725,9 @@ if $has_apr; then cp ../../srclib/apr/NMAKEmakefile $package_src_dir/srclib/apr-${apr_version}/ fi +if $has_api; then + cp ../../srclib/apr-iconv/NMAKEmakefile $package_src_dir/srclib/apr-iconv-${api_version}/ +fi if $has_apu; then cp ../../srclib/apr-util/NMAKEmakefile $package_src_dir/srclib/apr-util-${apu_version}/ fi Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2007-12-12 07:39:05 UTC (rev 1177) +++ trunk/build/unix/package.list 2007-12-12 07:53:08 UTC (rev 1178) @@ -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|0.9.8e|TOMCAT_NATIVE_1_1_11 -jboss-native|2.0.2|1.2.9|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11 -jboss-native|2.0.3-dev|1.2.8|1.2.8|0.9.8e|trunk -jboss-native|2.0.3|1.2.8|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11 +jboss-native|2.0.1|1.2.9|1.2.8|1.2.1|0.9.8e|TOMCAT_NATIVE_1_1_11 +jboss-native|2.0.2|1.2.9|1.2.8|1.2.1|0.9.8e|TOMCAT_NATIVE_1_1_11 +jboss-native|2.0.3-dev|1.2.8|1.2.8|1.2.1|0.9.8e|trunk +jboss-native|2.0.3|1.2.8|1.2.8|1.2.1|0.9.8e|TOMCAT_NATIVE_1_1_11 # SIGHT -jboss-sight|1.0.0|1.2.9|1.2.8||trunk -jboss-sight|1.0.1|1.2.8|1.2.8||trunk -jboss-sight|1.0.2|1.2.8|1.2.8||trunk +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 # 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