From: Scott M S. <st...@us...> - 2002-05-19 16:52:30
|
User: starksm Date: 02/05/19 09:52:30 Modified: jboss build.xml Log: Fix the run-nightly target Revision Changes Path 1.137 +13 -10 build/jboss/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/build/jboss/build.xml,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- build.xml 18 May 2002 20:50:41 -0000 1.136 +++ build.xml 19 May 2002 16:52:28 -0000 1.137 @@ -12,7 +12,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.136 2002/05/18 20:50:41 starksm Exp $ --> +<!-- $Id: build.xml,v 1.137 2002/05/19 16:52:28 starksm Exp $ --> <project default="main" name="JBoss/Build"> @@ -294,6 +294,8 @@ <property name="run.nightly.email.tolist" value="jbo...@li..."/> <property name="run.nightly.email.from" value="no...@jb..."/> <property name="run.nightly.email.mailhost" value="localhost"/> + <property name="run.home.dir" value="${module.output}/${release.id}" /> + <property name="run.bin.dir" value="${run.home.dir}/bin" /> <!-- Bits for building source archives --> <patternset id="source.ignore"> @@ -1501,8 +1503,9 @@ <!-- this is sloppy --> <target name="run-jboss-unix" depends="init" if="run.jboss.unix"> - <exec executable="${module.output}/${release.id}/bin/run.sh" - dir="${module.output}/${release.id}" + <echo message="run.home.dir=${run.home.dir}"/> + <exec executable="${run.bin.dir}/run.sh" + dir="${run.home.dir}" output="${basedir}/run.log" newenvironment="true"> <arg line="${run.jboss.flags}"/> @@ -1510,9 +1513,9 @@ </target> <target name="run-jboss-win32" depends="init" if="run.jboss.win32"> - <echo message="${module.output}/${release.id}"/> - <exec executable="${module.output}/${release.id}/bin/run.bat" - dir="${module.output}/${release.id}/bin" + <echo message="run.home.dir=${run.home.dir}"/> + <exec executable="${run.bin.dir}/run.bat" + dir="${run.home.dir}" output="${basedir}/run.log" newenvironment="true"> <arg line="${run.jboss.flags}"/> @@ -1534,7 +1537,7 @@ <cvs command="update -d" dest="${module.root}"/> </target> - <target name="run-nightly"> + <target name="run-nightly" depends="init"> <!-- perhaps refresh cvs --> <call target="update-project" unless="test.skipupdate"/> @@ -1543,7 +1546,7 @@ <call target="clobber" if="test.clobber"/> <!-- build most everything --> - <call target="most"/> + <call target="most" unless="test.skipbuild" /> <!-- run the server in a seperate thread--> <parallel> @@ -1564,11 +1567,11 @@ <echo>Stopping JBoss</echo> <java classname="org.jboss.Shutdown"> <classpath> - <pathelement location="${release.lib}"/> + <pathelement location="${run.bin.dir}/shutdown.jar"/> </classpath> <arg value="localhost"/> - <arg value="1099"/> + <arg value="8082"/> </java> </sequential> </parallel> |