Author: nickboldt Date: 2010-04-24 18:13:22 -0400 (Sat, 24 Apr 2010) New Revision: 21666 Modified: branches/modular_build/build/build.xml Log: move svn.info-*.txt files into / so they're not slave-specific Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-04-24 21:48:02 UTC (rev 21665) +++ branches/modular_build/build/build.xml 2010-04-24 22:13:22 UTC (rev 21666) @@ -183,7 +183,7 @@ <if> <isset property=&quot;svn.info.(a){COMPONENT}.rev&quot; /> <then> - <echo file=&quot;svn.info-@{COMPONENT}.txt&quot;&gt;svn.info.(a){COMPONENT}.rev = ${svn.info.(a){COMPONENT}.rev} + <echo file=&quot;${WORKINGDIR}/svn.info-@{COMPONENT}.txt&quot;&gt;svn.info.(a){COMPONENT}.rev = ${svn.info.(a){COMPONENT}.rev} </echo> </then> </if> @@ -196,6 +196,7 @@ <for param="COMPONENT" list="${COMPONENTS}" delimiter=", "> <sequential> + <!-- TODO: add timestamps / elapsed time --> <if> <not> <available file="${WORKINGDIR}/@{COMPONENT}" type="dir" /> @@ -205,9 +206,9 @@ </then> <else> <if> - <available file=&quot;svn.info-(a){COMPONENT}.txt&quot; type="file" /> + <available file=&quot;${WORKINGDIR}/svn.info-(a){COMPONENT}.txt&quot; type="file" /> <then> - <property file=&quot;svn.info-(a){COMPONENT}.txt&quot; /> + <property file=&quot;${WORKINGDIR}/svn.info-(a){COMPONENT}.txt&quot; /> <!-- check svn info; if new version found, svn up --> <svn javahl="false" svnkit="true" failonerror="false"> <info target="${WORKINGDIR}/@{COMPONENT}" @@ -278,6 +279,7 @@ <for param="COMPONENT" list="${COMPONENTS.to.build}" delimiter=", "> <sequential> + <!-- TODO: add timestamps / elapsed time --> <!-- If poms already exist, DO NOT OVERWRITE unless overwrite.existing.pom.xml=true --> <ant antfile="genpom.xml" target="run" dir="${WORKINGDIR}"> <property name="COMPONENT" value="@{COMPONENT}" /> @@ -458,13 +460,13 @@ "> <sequential> <delete dir=&quot;(a){expected.dir}&quot; includeemptydirs="true" /> - <delete file=&quot;svn.info-(a){expected.dir}.txt&quot; /> + <delete file=&quot;${WORKINGDIR}/svn.info-(a){expected.dir}.txt&quot; /> </sequential> </for> <for param="expected.file" list="${get.sources.expected.files}" delimiter=", "> <sequential> - <delete file=&quot;(a){expected.file}&quot; /> + <delete file=&quot;${WORKINGDIR}/(a){expected.file}&quot; /> </sequential> </for> @@ -509,8 +511,8 @@ <echo level="info"> 3/6: Test update</echo> - <delete file="svn.info-tests.txt" /> - <delete file="svn.info-xulrunner.txt" /> + <delete file="${WORKINGDIR}/svn.info-tests.txt" /> + <delete file="${WORKINGDIR}/svn.info-xulrunner.txt" /> <antcall target="get.sources" /> <for param="expected.dir" list="${get.sources.expected.dirs}" delimiter=", ">