Author: nickboldt
Date: 2010-04-27 09:37:57 -0400 (Tue, 27 Apr 2010)
New Revision: 21725
Modified:
branches/modular_build/build/build.xml
Log:
refactor svn.fetch macro
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-04-27 13:26:50 UTC (rev 21724)
+++ branches/modular_build/build/build.xml 2010-04-27 13:37:57 UTC (rev 21725)
@@ -157,7 +157,7 @@
op: up (update) or co (checkout)
= = = = = = = = = = = = = = = = = -->
<macrodef name="svn.fetch">
- <attribute name="COMPONENT" />
+ <attribute name="component" />
<attribute name="op" />
<sequential>
<!-- check out or update -->
@@ -166,15 +166,15 @@
<equals arg1="@{op}" arg2="up" />
<then>
<svn javahl="false" svnkit="true"
failonerror="false">
- <update recurse="${svn.recurse}" dir="@{COMPONENT}" />
+ <update recurse="${svn.recurse}" dir="@{component}" />
</svn>
</then>
<else>
- <echo level="info">Fetch sources from ${svn.root}/@{COMPONENT} into
${WORKINGDIR}/@{COMPONENT}</echo>
+ <echo level="info">Fetch sources from ${svn.root}/@{component} into
${WORKINGDIR}/@{component}</echo>
<svn javahl="false" svnkit="true"
failonerror="true">
<checkout recurse="${svn.recurse}"
- url="${svn.root}/@{COMPONENT}"
- destpath="${WORKINGDIR}/@{COMPONENT}"
+ url="${svn.root}/@{component}"
+ destpath="${WORKINGDIR}/@{component}"
/>
</svn>
</else>
@@ -182,16 +182,16 @@
<!-- 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" />
+ <info target="${WORKINGDIR}/@{component}"
propprefix="svn.info.@{component}" verbose="false" />
</svn>
<if>
- <isset property="svn.info.(a){COMPONENT}.rev" />
+ <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
file="${WORKINGDIR}/svn.info-@{component}.txt">svn.info.(a){component}.rev =
${svn.info.(a){component}.rev}
</echo>
</then>
</if>
- <echo file="build.cfg" message="@{COMPONENT},"
append="true" />
+ <echo file="build.cfg" message="@{component},"
append="true" />
</sequential>
</macrodef>
Show replies by thread