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

Author: jfrederic.clere(a)jboss.com Date: 2009-07-08 02:57:14 -0400 (Wed, 08 Jul 2009) New Revision: 2473 Modified: trunk/build/unix/buildbin.mod_cluster.sh trunk/build/unix/buildtest.mod_cluster.sh Log: Oops the NOSPACE stuff was a nonsense... Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2009-07-07 17:01:08 UTC (rev 2472) +++ trunk/build/unix/buildbin.mod_cluster.sh 2009-07-08 06:57:14 UTC (rev 2473) @@ -233,24 +233,14 @@ # Install httpd using the ant script in mod_cluster (cd ../mod_cluster/test/java - BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` - BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` - if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ] - then - BASELOC=${BASELOCNOSPACES} - fi + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` echo "Running: ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=${output_loc} -Dbase.apache=${BASELOC}" ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=${output_loc} -Dbase.apache=${BASELOC} ) # Build the *.so for any httpd-2.2.x using the httpd install done before if [ "${BUILD_SYS}" != "windows" ]; then - BASELOC=`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::')` - BASELOCNOSPACES=`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g')` - if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ] - then - BASELOC=${BASELOCNOSPACES} - fi + BASELOC==`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g')` for dir in `echo mod_proxy mod_manager advertise mod_slotmem mod_proxy_cluster` do (cd ../mod_cluster/native/$dir Modified: trunk/build/unix/buildtest.mod_cluster.sh =================================================================== --- trunk/build/unix/buildtest.mod_cluster.sh 2009-07-07 17:01:08 UTC (rev 2472) +++ trunk/build/unix/buildtest.mod_cluster.sh 2009-07-08 06:57:14 UTC (rev 2473) @@ -54,14 +54,9 @@ ;; esac mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}.jar -echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}" (cd $anttestsdir - BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` - BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` - if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ] - then - BASELOC=${BASELOCNOSPACES} - fi + BASELOC==`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` + echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache=${BASELOC}" ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache=${BASELOC} ) || exit 1