Author: jfrederic.clere(a)jboss.com Date: 2010-05-06 07:36:55 -0400 (Thu, 06 May 2010) New Revision: 2665 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: Rollback parially MODCLUSTER-150 Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2010-05-05 08:20:50 UTC (rev 2664) +++ trunk/build/unix/buildbin.mod_cluster.sh 2010-05-06 11:36:55 UTC (rev 2665) @@ -257,35 +257,10 @@ </IfModule> EOF -# Arrange pathes so that the stuff can run in ~ -if [ "${BUILD_SYS}" != "windows" ]; then - BASEHTTPD=/opt/jboss/httpd/ - HTTPDCONF=httpd/conf - HTTPDSBIN=sbin - HTTPDBUILD=htdocs/build - files="${HTTPDSBIN}/apachectl ${HTTPDCONF}/httpd.conf ${HTTPDSBIN}/envvars ${HTTPDSBIN}/apxs ${HTTPDBUILD}/config_vars.mk" - for FILE in `echo $files` - do - file=${RPM_BUILD_ROOT}/${BASEHTTPD}/$FILE - echo "$file" - cp -p $file $file.new - sed "s:${BASEHTTPD}::" $file > $file.new - mv $file.new $file - done - # Arrange apachectl - file=$RPM_BUILD_ROOT/${BASEHTTPD}/${BASEHTTPDSBIN}/apachectl - cp -p $file $file.new - echo "s:\$HTTPD -k \$ARGV:\$HTTPD -k \$ARGV -d httpd:" > sed.cmd - sed -f sed.cmd $file > $file.new - mv $file.new $file - - # Arrange httpd.conf (ServerRoot) - file=$RPM_BUILD_ROOT/${BASEHTTPD}/${HTTPDCONF}/httpd.conf - cp -p $file $file.new - echo "s:ServerRoot \".*:ServerRoot \".\":" > sed.cmd - sed -f sed.cmd $file > $file.new - mv $file.new $file -fi +# Copy the install_home scripts +BASEHTTPD=/opt/jboss/httpd/ +HTTPDSBIN=sbin +cp -p ../mod_cluster/native/scripts/*.sh ${RPM_BUILD_ROOT}/${BASEHTTPD}/${HTTPDSBIN}/ # Also build the java part. (cd ../mod_cluster