Author: jfrederic.clere(a)jboss.com Date: 2009-08-07 09:55:41 -0400 (Fri, 07 Aug 2009) New Revision: 2532 Modified: trunk/build/patch/apr-util-1.3.4.patch trunk/build/unix/build.sh Log: Allow to patch the common NMAKEmakefile (for apr/apr-util etc). Modified: trunk/build/patch/apr-util-1.3.4.patch =================================================================== --- trunk/build/patch/apr-util-1.3.4.patch 2009-08-07 10:00:58 UTC (rev 2531) +++ trunk/build/patch/apr-util-1.3.4.patch 2009-08-07 13:55:41 UTC (rev 2532) @@ -41,3 +41,25 @@ #define APR_HAS_TIVOLI_LDAPSDK 0 #define APR_HAS_ZOS_LDAPSDK 0 #define APR_HAS_OTHER_LDAPSDK 0 + +--- NMAKEmakefile (revision 2530) ++++ NMAKEmakefile (working copy) +@@ -81,18 +81,6 @@ + $(WORKDIR)\apr_sha1.obj \ + $(WORKDIR)\getuuid.obj \ + $(WORKDIR)\uuid.obj \ +- $(WORKDIR)\apr_dbd.obj \ +- $(WORKDIR)\apr_dbd_pgsql.obj \ +- $(WORKDIR)\apr_dbd_sqlite2.obj \ +- $(WORKDIR)\apr_dbd_sqlite3.obj \ +- $(WORKDIR)\apr_dbm.obj \ +- $(WORKDIR)\apr_dbm_berkeleydb.obj \ +- $(WORKDIR)\apr_dbm_gdbm.obj \ +- $(WORKDIR)\apr_dbm_sdbm.obj \ +- $(WORKDIR)\sdbm.obj \ +- $(WORKDIR)\sdbm_hash.obj \ +- $(WORKDIR)\sdbm_lock.obj \ +- $(WORKDIR)\sdbm_pair.obj \ + $(WORKDIR)\apr_base64.obj \ + $(WORKDIR)\apr_hooks.obj \ + $(WORKDIR)\apr_ldap_init.obj \ Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-08-07 10:00:58 UTC (rev 2531) +++ trunk/build/unix/build.sh 2009-08-07 13:55:41 UTC (rev 2532) @@ -1135,6 +1135,24 @@ fi # +# Copy other files +cp ../NMAKEcommon.inc $package_src_dir +svn export --force ../../licenses $package_src_dir/licenses + +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 +if $has_zlib; then + cp ../../srclib/zlib/NMAKEmakefile $package_src_dir/srclib/zlib-${zlib_version}/ +fi + +# # Get the repository of what we build. override ${build_top}/buildsrc.${PACKAGE}.sh ${svn_tagname} ${package_src_dir} if [ $? -ne 0 ]; then @@ -1158,23 +1176,6 @@ EOF -# Copy other files -cp ../NMAKEcommon.inc $package_src_dir -svn export --force ../../licenses $package_src_dir/licenses - -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 -if $has_zlib; then - cp ../../srclib/zlib/NMAKEmakefile $package_src_dir/srclib/zlib-${zlib_version}/ -fi - # Build the source tarball buildtar ${build_working_dir} ${package_src_name} ${build_output_dir} ${package_src_name}