Author: nickboldt Date: 2010-04-26 18:27:54 -0400 (Mon, 26 Apr 2010) New Revision: 21707 Modified: branches/modular_build/build/build.xml Log: switch to <wcVersion> instead of <info>; make tests fail on first problem Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-04-26 21:09:51 UTC (rev 21706) +++ branches/modular_build/build/build.xml 2010-04-26 22:27:54 UTC (rev 21707) @@ -103,7 +103,7 @@ <target name="init" depends="local"> <macrodef name="now"> <sequential> - <var name="now" unset="true"/> + <var name="now" unset="true" /> <tstamp> <format property="now" pattern="hh:mm:ss" /> </tstamp> @@ -161,6 +161,7 @@ <attribute name="op" /> <sequential> <!-- check out or update --> + <now /> <if> <equals arg1="@{op}" arg2="up" /> <then> @@ -169,7 +170,6 @@ </svn> </then> <else> - <now/> <echo level="info">Fetch sources from ${svn.root}/@{COMPONENT} into ${WORKINGDIR}/@{COMPONENT}</echo> <svn javahl="false" svnkit="true" failonerror="true"> <checkout recurse="${svn.recurse}" @@ -182,14 +182,24 @@ <!-- Store svn info so we can compare it later and thus not need to update or checkout every time --> <svn javahl="false" svnkit="true" failonerror="false"> + <!-- <info target="${WORKINGDIR}/@{COMPONENT}" propprefix="svn.info.@{COMPONENT}" verbose="false" /> + --> + <wcVersion path="${WORKINGDIR}/@{COMPONENT}" prefix=&quot;svn.info.(a){COMPONENT}.&quot; /> </svn> <if> + <!-- <isset property=&quot;svn.info.(a){COMPONENT}.rev&quot; /> <then> <echo file=&quot;${WORKINGDIR}/svn.info-@{COMPONENT}.txt&quot;&gt;svn.info.(a){COMPONENT}.rev = ${svn.info.(a){COMPONENT}.rev} </echo> </then> + --> + <isset property=&quot;svn.info.(a){COMPONENT}.committed.max&quot; /> + <then> + <echo file=&quot;${WORKINGDIR}/svn.info-@{COMPONENT}.txt&quot;&gt;svn.info.(a){COMPONENT}.committed.max = ${svn.info.(a){COMPONENT}.committed.max} +</echo> + </then> </if> <echo file="build.cfg" message="@{COMPONENT}," append="true" /> </sequential> @@ -200,8 +210,6 @@ <for param="COMPONENT" list="${COMPONENTS}" delimiter=", "> <sequential> - <now/> - <echo level="info">Fetch @{COMPONENT} sources into ${WORKINGDIR}/</echo> <if> <not> <available file="${WORKINGDIR}/@{COMPONENT}" type="dir" /> @@ -216,12 +224,18 @@ <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}" propprefix=&quot;svn.info.(a){COMPONENT}.check&quot; verbose="false" /> + --> + <wcVersion path="${WORKINGDIR}/@{COMPONENT}" + prefix=&quot;svn.info.(a){COMPONENT}.check.&quot; + /> </svn> <if> + <!-- <or> <not> <isset property=&quot;svn.info.(a){COMPONENT}.rev&quot; /> @@ -235,6 +249,20 @@ /> </not> </or> + --> + <or> + <not> + <isset property=&quot;svn.info.(a){COMPONENT}.committed.max&quot; /> + </not> + <not> + <isset property=&quot;svn.info.(a){COMPONENT}.check.committed.max&quot; /> + </not> + <not> + <equals arg1=&quot;${svn.info.(a){COMPONENT}.committed.max}&quot; + arg2=&quot;${svn.info.(a){COMPONENT}.check.committed.max}&quot; + /> + </not> + </or> <then> <svn.fetch component="@{COMPONENT}" op="up" /> </then> @@ -285,7 +313,7 @@ <for param="COMPONENT" list="${COMPONENTS.to.build}" delimiter=", "> <sequential> - <now/> + <now /> <!-- 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}" /> @@ -309,7 +337,7 @@ </antcall> </sequential> </for> - <now/> + <now /> </target> <target name="collect.test.results"> @@ -498,7 +526,7 @@ <for param="expected.dir" list="${get.sources.expected.dirs}" delimiter=", "> <sequential> - <assert failonerror="false" message="Dir @{expected.dir} not found!"> + <assert failonerror="true" message="Dir @{expected.dir} not found!"> <bool> <available file=&quot;(a){expected.dir}&quot; type="dir" /> </bool> @@ -508,7 +536,7 @@ <for param="expected.file" list="${get.sources.expected.files}" delimiter=", "> <sequential> - <assert failonerror="false" message="Dir @{expected.file} not found!"> + <assert failonerror="true" message="Dir @{expected.file} not found!"> <bool> <available file=&quot;(a){expected.file}&quot; type="file" /> </bool> @@ -521,7 +549,7 @@ 2/6: Test build.cfg</echo> <var name="COMPONENTS.to.build" unset="true" /> <antcallback target="get.components.to.build" return="COMPONENTS.to.build" /> - <assert failonerror="false" + <assert failonerror="true" message="expected: [${get.components.to.build.expected.2}] but got: [${COMPONENTS.to.build}]" <bool> @@ -539,7 +567,7 @@ <for param="expected.dir" list="${get.sources.expected.dirs}" delimiter=", "> <sequential> - <assert failonerror="false" message="Dir @{expected.dir} not found!"> + <assert failonerror="true" message="Dir @{expected.dir} not found!"> <bool> <available file=&quot;(a){expected.dir}&quot; type="dir" /> </bool> @@ -549,7 +577,7 @@ <for param="expected.file" list="${get.sources.expected.files}" delimiter=", "> <sequential> - <assert failonerror="false" message="Dir @{expected.file} not found!"> + <assert failonerror="true" message="Dir @{expected.file} not found!"> <bool> <available file=&quot;(a){expected.file}&quot; type="file" /> </bool> @@ -562,7 +590,7 @@ 4/6: Test build.cfg</echo> <var name="COMPONENTS.to.build" unset="true" /> <antcallback target="get.components.to.build" return="COMPONENTS.to.build" /> - <assert failonerror="false" + <assert failonerror="true" message="expected: [${get.components.to.build.expected.4}] but got: [${COMPONENTS.to.build}]" <bool> @@ -577,7 +605,7 @@ <for param="expected.dir" list="${get.sources.expected.dirs}" delimiter=", "> <sequential> - <assert failonerror="false" message="Dir @{expected.dir} not found!"> + <assert failonerror="true" message="Dir @{expected.dir} not found!"> <bool> <available file=&quot;(a){expected.dir}&quot; type="dir" /> </bool> @@ -587,7 +615,7 @@ <for param="expected.file" list="${get.sources.expected.files}" delimiter=", "> <sequential> - <assert failonerror="false" message="Dir @{expected.file} not found!"> + <assert failonerror="true" message="Dir @{expected.file} not found!"> <bool> <available file=&quot;(a){expected.file}&quot; type="file" /> </bool> @@ -600,7 +628,7 @@ 6/6: Test build.cfg</echo> <var name="COMPONENTS.to.build" unset="true" /> <antcallback target="get.components.to.build" return="COMPONENTS.to.build" /> - <assert failonerror="false" + <assert failonerror="true" message="expected: [${get.components.to.build.expected.6}] but got: [${COMPONENTS.to.build}]" <bool>