Author: nickboldt
Date: 2010-04-26 19:16:14 -0400 (Mon, 26 Apr 2010)
New Revision: 21715
Modified:
branches/modular_build/build/build.xml
Log:
switch back to using <info> because <wcversion> doesn't look at server
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-04-26 23:13:37 UTC (rev 21714)
+++ branches/modular_build/build/build.xml 2010-04-26 23:16:14 UTC (rev 21715)
@@ -188,18 +188,11 @@
<wcVersion path="${WORKINGDIR}/@{COMPONENT}"
prefix="svn.info.(a){COMPONENT}." />
</svn>
<if>
- <!--
<isset property="svn.info.(a){COMPONENT}.rev" />
<then>
<echo
file="${WORKINGDIR}/svn.info-@{COMPONENT}.txt">svn.info.(a){COMPONENT}.rev =
${svn.info.(a){COMPONENT}.rev}
</echo>
</then>
- -->
- <isset property="svn.info.(a){COMPONENT}.revision.max" />
- <then>
- <echo
file="${WORKINGDIR}/svn.info-@{COMPONENT}.txt">svn.info.(a){COMPONENT}.revision.max
= ${svn.info.(a){COMPONENT}.revision.max}
-</echo>
- </then>
</if>
<echo file="build.cfg" message="@{COMPONENT},"
append="true" />
</sequential>
@@ -224,18 +217,12 @@
<property file="${WORKINGDIR}/svn.info-(a){COMPONENT}.txt" />
<!-- check svn info; if new version found, svn up -->
<svn javahl="false" svnkit="true"
failonerror="false">
- <!--
<info target="${WORKINGDIR}/@{COMPONENT}"
propprefix="svn.info.(a){COMPONENT}.check"
verbose="false"
/>
- -->
- <wcVersion path="${WORKINGDIR}/@{COMPONENT}"
- prefix="svn.info.(a){COMPONENT}.check."
- />
</svn>
<if>
- <!--
<or>
<not>
<isset property="svn.info.(a){COMPONENT}.rev" />
@@ -249,20 +236,6 @@
/>
</not>
</or>
- -->
- <or>
- <not>
- <isset property="svn.info.(a){COMPONENT}.revision.max" />
- </not>
- <not>
- <isset property="svn.info.(a){COMPONENT}.check.revision.max" />
- </not>
- <not>
- <equals arg1="${svn.info.(a){COMPONENT}.revision.max}"
- arg2="${svn.info.(a){COMPONENT}.check.revision.max}"
- />
- </not>
- </or>
<then>
<svn.fetch component="@{COMPONENT}" op="up" />
</then>
Show replies by date