Author: mladen.turk(a)jboss.com Date: 2008-04-21 03:37:19 -0400 (Mon, 21 Apr 2008) New Revision: 1547 Modified: trunk/build/unix/buildbin.jboss-httpd.windows.sh trunk/build/unix/buildsrc.jboss-httpd.sh trunk/build/unix/package.list Log: Fix jboss-httpd builds Modified: trunk/build/unix/buildbin.jboss-httpd.windows.sh =================================================================== --- trunk/build/unix/buildbin.jboss-httpd.windows.sh 2008-04-21 06:47:58 UTC (rev 1546) +++ trunk/build/unix/buildbin.jboss-httpd.windows.sh 2008-04-21 07:37:19 UTC (rev 1547) @@ -47,12 +47,19 @@ win_prefix_loc=`cygpath -w -a ${prefix_loc}` echo "Configuring Httpd" -platform_path="HTTPD-BIN/${BUILD_SYS}/${BUILD_CPU}" -mkdir -p ${output_loc}/${platform_path} +platform_path="HTTPD-BIN/${BUILD_SYS}/${BUILD_CPU}" +mkdir -p ${output_loc}/${platform_path} +win_output_loc=`cygpath -w -a ${output_loc}/${platform_path}` -src_dir=`cygpath -w -a srclib/httpd` +add_conf="PREFIX=${win_output_loc}" +if $has_openssl ; then + add_conf="${add_conf} WITH_OPENSSL=${win_common_loc}" +fi -(cd srclib/httpd* - echo "Building Httpd in `pwd`" - nmake -f Makefile.win INSTDIR="c:\Program Files\Httpd" installr +native_sources=srclib/`ls srclib | grep httpd-2.2` + +(cd $native_sources + echo "Running nmake at `pwd`" + nmake -f NMAKEmakefile ${add_conf} install ) + \ No newline at end of file Modified: trunk/build/unix/buildsrc.jboss-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.jboss-httpd.sh 2008-04-21 06:47:58 UTC (rev 1546) +++ trunk/build/unix/buildsrc.jboss-httpd.sh 2008-04-21 07:37:19 UTC (rev 1547) @@ -47,6 +47,46 @@ URL=http://archive.apache.org/dist/httpd/httpd-${native_tag}-win32-src.zip else URL=http://archive.apache.org/dist/httpd/httpd-${native_tag}.tar.gz - fi + fi util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top httpd-${native_tag} $URL NONE fi + +dirsources=`ls ${native_dist}/srclib/ | grep httpd-` +dirsources=${native_dist}/srclib/${dirsources} + +# We get apr-iconv +if [ "${BUILD_SYS}" = "windows" ]; then + 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 + + rm -rf ${dirsources}/srclib/zlib + zlibdirsources=`ls ${native_dist}/srclib/ | grep zlib-` + echo "Replacing ${dirsources}/srclib/zlib by ${native_dist}/srclib/${zlibdirsources}" + cp -rp ${native_dist}/srclib/${zlibdirsources} ${dirsources}/srclib/zlib +fi + +# +# Copy the windows NMAKE files (and additional stuff). +dirnmake=${build_svn_root}/httpd/httpd-2.2/ +if [ -d ${dirnmake} ]; then + svn export --force ${dirnmake} ${dirsources} +else + echo "Cannot find package sources in ${dirnmake}" + exit 1 +fi + +# mturk Hack. +if [ "${BUILD_SYS}" != "windows" ]; then + rm -rf ${dirsources}/srclib/apr-iconv +fi + +# Remove jk directory after export if not enabled. +if ! $has_jk ; then + rm -rf ${dirsources}/modules/jk +fi + +echo "" +echo "Done : `basename $0`" +echo "" Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2008-04-21 06:47:58 UTC (rev 1546) +++ trunk/build/unix/package.list 2008-04-21 07:37:19 UTC (rev 1547) @@ -11,5 +11,5 @@ jboss-sight|1.0.2|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1 jboss-sight|1.0.3-dev|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 +jboss-httpd|0.0.1|2.2.8|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3 rhel-httpd|2.2.3-11.el5_1.3|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:r:openssl-0_9_8b-8_3_el5_0_2|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8