You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/06/26 20:37:51 UTC
svn commit: r550906 - in /harmony/enhanced/buildtest/branches/2.0:
adaptors/hdk/adaptor.xml adaptors/hdk/parameters.xml scripts/cc-project.xml
scripts/templates/cc-project-template.xml
Author: smishura
Date: Tue Jun 26 11:37:50 2007
New Revision: 550906
URL: http://svn.apache.org/viewvc?view=rev&rev=550906
Log:
Apply patch from HARMONY-3501 that adds support for multiple SVN repositories
Modified:
harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml
harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml
harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml
harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml
Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml?view=diff&rev=550906&r1=550905&r2=550906
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml Tue Jun 26 11:37:50 2007
@@ -29,20 +29,6 @@
<echo message="Checkout HDK trunk into ${hdk.trunk.dir}"/>
<svn-co url="${svn.url}" trunk="${hdk.trunk.dir}"/>
- <!-- CC does not handle the modifications in 'switched' sub-trunks,
- so manually add each of sub-trunks to modificationset -->
- <copy file="${scripts.dir}/templates/cc-project-template.xml"
- tofile="${cc.hdk.config.template}"/>
- <property name="nl" value="${line.separator}"/>
- <replace file="${cc.hdk.config.template}">
- <replacefilter
- token="<!-- @BT.MODIFICATIONSET@ -->"
- value="${nl}
- <svn localWorkingCopy='${hdk.trunk.dir}' property='repository.updated'/>${nl}
- <svn localWorkingCopy='${hdk.classlib.trunk.dir}' property='repository.updated'/>${nl}
- <svn localWorkingCopy='${hdk.drlvm.trunk.dir}' property='repository.updated'/>${nl}
- <svn localWorkingCopy='${hdk.jdktools.trunk.dir}' property='repository.updated'/>${nl}"/>
- </replace>
</target>
<target name="run">
Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml?view=diff&rev=550906&r1=550905&r2=550906
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml Tue Jun 26 11:37:50 2007
@@ -21,15 +21,21 @@
<shared>
<svn.url value="https://svn.apache.org/repos/asf/harmony/enhanced/trunk"/>
<trunk.dir location="${checkouts.dir}/hdk" id="trunk.dir.id"/>
- <classlib.trunk.dir location="${checkouts.dir}/hdk/working_classlib"/>
- <drlvm.trunk.dir location="${checkouts.dir}/hdk/working_vm"/>
- <jdktools.trunk.dir location="${checkouts.dir}/hdk/working_jdktools"/>
+ <classlib.trunk.dir location="${checkouts.dir}/hdk/working_classlib"
+ id="classlib.trunk.dir.id"/>
+ <drlvm.trunk.dir location="${checkouts.dir}/hdk/working_vm"
+ id="drlvm.trunk.dir.id"/>
+ <jdktools.trunk.dir location="${checkouts.dir}/hdk/working_jdktools"
+ id="jdktools.trunk.dir.id"/>
<binaries.jre.dir location="${checkouts.dir}/hdk/target/hdk/jdk/jre"/>
<hy.cfg value="debug"/>
</shared>
<!-- CC specific configuration -->
- <cc config="${cc.hdk.config.template}">
+ <cc>
<usesvn refid="trunk.dir.id"/>
+ <usesvn.classlib refid="classlib.trunk.dir.id"/>
+ <usesvn.drlvm refid="drlvm.trunk.dir.id"/>
+ <usesvn.jdktools refid="jdktools.trunk.dir.id"/>
</cc>
</parameters>
Modified: harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml?view=diff&rev=550906&r1=550905&r2=550906
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml Tue Jun 26 11:37:50 2007
@@ -40,7 +40,7 @@
</sequential>
</target>
- <target name="create-cc-configuration" depends="define-tasks, -prepare-cc, init-framework, init-suites">
+ <target name="create-cc-configuration" depends="init-framework, init-suites, -prepare-cc">
<!-- Create Main CC Configuration File -->
<delete file="${cc.config.file}"/>
<copy file="${cc.config.template}"
@@ -328,14 +328,15 @@
token="<!-- @BT.VETO@ -->"
value="<!-- veto on execution before superior with svn modifications -->@NL@
<veto>@NL@
- <triggers>@NL@
- <svn localWorkingCopy='${@{dependency}.parameters.cc.usesvn}'/>@NL@
+ <triggers>@NL@<!-- @BT.USESVN@ -->@NL@
</triggers>@NL@
<buildstatus logdir='${cc.log.dir}/@{dependency}'/>@NL@
</veto>@NL@
<!-- @BT.VETO@ -->"
/>
</replace>
+ <insert-usesvn suite="@{dependency}" ccfile="@{ccfile}"
+ indent=" "/>
</then>
</if>
<if>
@@ -367,6 +368,39 @@
</sequential>
</macrodef>
+ <!-- replaces @BT.USESVN@ tag with the list of pointer to local svn dirs -->
+ <macrodef name="insert-usesvn">
+ <attribute name="suite"/>
+ <attribute name="ccfile"/>
+ <attribute name="indent" default=""/>
+ <attribute name="task" default="svn"/>
+ <attribute name="property" default=""/>
+ <sequential>
+ <var name="tmp.usesvns.list" value=""/>
+ <propertyselector
+ property="tmp.usesvns.list"
+ override="true"
+ delimiter=","
+ match="^@{suite}\.parameters\.cc\.usesvn.*$"
+ distinct="true"
+ />
+ <for list="${tmp.usesvns.list}" param="svndir">
+ <sequential>
+ <replace file="@{ccfile}">
+ <replacefilter
+ token="<!-- @BT.USESVN@ -->"
+ value="@{indent}<@{task} localWorkingCopy='${@{svndir}}' @{property}/>@NL@<!-- @BT.USESVN@ -->"/>
+ </replace>
+ </sequential>
+ </for>
+ <replace file="@{ccfile}">
+ <replacefilter
+ token="@NL@<!-- @BT.USESVN@ -->"
+ value=""/>
+ </replace>
+ </sequential>
+ </macrodef>
+
<!-- insert modification sets defined for test suite
see: test-insert-modification-sets for unit test -->
<macrodef name="insert-modification-sets">
@@ -391,9 +425,11 @@
<replace file="@{ccfile}">
<replacefilter
token="<!-- @BT.BOOTSTRAPPER@ -->"
- value="<svnbootstrapper localWorkingCopy='${@{suite}.parameters.cc.usesvn}'/>"
+ value="<!-- @BT.USESVN@ -->"
/>
</replace>
+ <insert-usesvn suite="@{suite}" ccfile="@{ccfile}"
+ task="svnbootstrapper" indent=" "/>
</then>
</if>
<if>
@@ -460,20 +496,23 @@
<isset property="@{suite}.parameters.cc.usesvn"/>
<then>
<!-- echo message=" -::: @{suite}-svn"/ -->
- <property name="@{property}" value=""/>
- <var name="@{property}"
- value="${@{property}}@{indent}<svn localWorkingCopy"/>
- <var name="@{property}"
- value="${@{property}}='${@{suite}.parameters.cc.usesvn}'"/>
+ <echo file="${temp.files.dir}/usesvn.tmp"
+ message="<!-- @BT.USESVN@ -->"/>
+ <var name="tmp.change.property" value=""/>
<if>
<istrue value="@{top}"/>
<then>
- <var name="@{property}"
- value="${@{property}} property='repository.updated'"/>
+ <var name="tmp.change.property"
+ value="property='repository.updated'"/>
</then>
</if>
- <var name="@{property}"
- value="${@{property}}/>@{nl}"/>
+ <insert-usesvn suite="@{suite}"
+ ccfile="${temp.files.dir}/usesvn.tmp"
+ indent="@{indent}"
+ property="${tmp.change.property}"/>
+ <var name="@{property}" unset="true"/>
+ <loadfile property="@{property}" srcFile="${temp.files.dir}/usesvn.tmp"/>
+ <var name="@{property}" value="${@{property}}@{nl}"/>
</then>
</if>
<if>
@@ -504,8 +543,7 @@
@{indent}<triggers>@{nl}
@{indent} <buildstatus logdir='${cc.log.dir}/@{dependency}'/>@{nl}
@{indent}</triggers>@{nl}
-@{indent}<targets>@{nl}
-${tmp.@{property}.@{dependency}}
+@{indent}<targets>@{nl}${tmp.@{property}.@{dependency}}
@{indent}</targets>@{nl}@{indent}</compound>@{nl}"/>
</then>
<else>
Modified: harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml?view=diff&rev=550906&r1=550905&r2=550906
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml Tue Jun 26 11:37:50 2007
@@ -22,7 +22,7 @@
if we use SVN for sources, i.e.
${suite.name}.parameters.cc.usesvn="${sources.location}"
is set -->
- <!-- @BT.BOOTSTRAPPER@ -->
+<!-- @BT.BOOTSTRAPPER@ -->
</bootstrappers>
<modificationset quietperiod="${framework.parameters.cc.quietperiod}">