[jbossnative-commits] JBoss Native SVN: r1322 - trunk/build/unix.

Author: jfrederic.clere(a)jboss.com Date: 2008-02-01 04:48:52 -0500 (Fri, 01 Feb 2008) New Revision: 1322 Modified: trunk/build/unix/build.sh trunk/build/unix/buildsrc.rhel-httpd.sh trunk/build/unix/package.list Log: Add apr-iconv for windows. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-02-01 07:45:38 UTC (rev 1321) +++ trunk/build/unix/build.sh 2008-02-01 09:48:52 UTC (rev 1322) @@ -318,6 +318,11 @@ echo "using expat: ${expat_version}" fi +# XXX: HACK JFCLERE +if [ ${PACKAGE} == "rhel-httpd" ];then + build_api=false +fi + export has_jk export so_extension export NATIVEEOL @@ -903,6 +908,9 @@ ZLIBURL=http://www.zlib.net/zlib-${zlib_version}.tar.gz ICONVURL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconv_version}.ta... EXPATURL=http://belnet.dl.sourceforge.net/sourceforge/expat/expat-${expat... +export APIURL +export APIURLBACK +export api_version rm -rf ${package_src_dir} mkdir -p ${package_src_dir}/srclib Modified: trunk/build/unix/buildsrc.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-01 07:45:38 UTC (rev 1321) +++ trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-01 09:48:52 UTC (rev 1322) @@ -63,16 +63,28 @@ exit 1 fi +# We get apr-iconv +if [ "${BUILD_SYS}" == "windows"]; then + util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top apr-iconv-${api_version} $APIURL $APIURLBACK + if [ $? -ne 0 ]; then + echo "util/ckeckdownload.sh apr-iconv failed" + exit 1 + fi + rm -rf ${dirsources}/srclib/apr-iconv + apidirsources=`ls ${build_cache_dir}/ | grep apr-iconv-` + echo "Replacing ${dirsources}/srclib/apr-iconv by ${build_cache_dir}/${apidirsources}" + cp -rp ${build_cache_dir}/${apidirsources} ${dirsources}/srclib/apr-iconv +fi + + # Copy apr and apr-util to the build location. -if [ -d ${dirsources}/srclib/apr ] -then +if [ -d ${dirsources}/srclib/apr ]; then rm -rf ${dirsources}/srclib/apr - aprdirsources=`ls ${native_dist}/srclib/ | grep apr- | grep -v apr-util` + aprdirsources=`ls ${native_dist}/srclib/ | grep apr- | grep -v apr-util | grep -v apr-iconv` echo "Replacing ${dirsources}/srclib/apr by ${native_dist}/srclib/${aprdirsources}" mv ${native_dist}/srclib/${aprdirsources} ${dirsources}/srclib/apr fi -if [ -d ${dirsources}/srclib/apr-util ] -then +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}" Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2008-02-01 07:45:38 UTC (rev 1321) +++ trunk/build/unix/package.list 2008-02-01 09:48:52 UTC (rev 1322) @@ -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.26|1.11|1.95.8 +rhel-httpd|0.0.1|httpd-2_2_3-11_el5|||1.2.1|||1.2.26|1.11|1.95.8