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 2008/05/21 16:14:11 UTC
svn commit: r658698 - in /harmony/enhanced/buildtest/trunk/infra/adaptors:
hdk_by_hdk/adaptor.xml hdk_by_hdk/parameters.xml
snapshot/framework.local.properties
Author: smishura
Date: Wed May 21 07:14:11 2008
New Revision: 658698
URL: http://svn.apache.org/viewvc?rev=658698&view=rev
Log:
Fix ANT scenario setup - do checkout and populate-src
Modified:
harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/adaptor.xml
harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/parameters.xml
harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties
Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/adaptor.xml?rev=658698&r1=658697&r2=658698&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/adaptor.xml Wed May 21 07:14:11 2008
@@ -34,10 +34,8 @@
</condition>
<target name="setup">
- <mkdir dir="${hdk_by_hdk.parameters.required.trunk.dir}" />
-
- <!--FIXME: need to do checkout first
- or add corresponding svn value to parameters.xml -->
+ <exec-ant dir="${hdk_by_hdk.parameters.svn.hdk_by_hdk.location}"
+ targets="populate-src" />
</target>
<target name="-get-revision" if="is.snapshot">
@@ -46,19 +44,19 @@
</target>
<target name="run" depends="-get-revision">
- <echo message="Checkout HDK trunk ${co.target} into ${hdk_by_hdk.parameters.required.trunk.dir}" />
+ <echo message="Checkout HDK trunk ${co.target} into ${hdk_by_hdk.parameters.svn.hdk_by_hdk.location}" />
<property name="co.target" value="" />
<exec executable="svn"
- dir="${hdk_by_hdk.parameters.required.trunk.dir}"
+ dir="${hdk_by_hdk.parameters.svn.hdk_by_hdk.location}"
failonerror="true">
- <arg line="up --ignore-externals ${co.target} ." />
+ <arg line="up -N ${co.target} ." />
</exec>
- <exec-ant dir="${trunk.dir}"
+ <exec-ant dir="${hdk_by_hdk.parameters.svn.hdk_by_hdk.location}"
targets="rebuild"
javaVM="${tested.jdk}/bin/java">
- <jvmarg line="-Xmx800M -Dtarget.dir=${target.dir}" />
+ <jvmarg line="-Xmx800M -Dtarget.dir=target.self-built" />
<env key="JAVA_HOME" value="${tested.jdk}" />
<env key="PATH" value="${my.path}" />
<sysproperty key="keep.working" value="true" />
Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/parameters.xml?rev=658698&r1=658697&r2=658698&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/parameters.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/hdk_by_hdk/parameters.xml Wed May 21 07:14:11 2008
@@ -22,12 +22,11 @@
<tested.jdk
description="Path to JDK under test"
value="${hdk.parameters.shared.binaries.jre.dir}/.." />
- <trunk.dir
- description="Path to HDK trunk root directory"
- value="${hdk.parameters.shared.trunk.dir}" />
- <target.dir
- description="Directory to store built HDK"
- value="${hdk.parameters.shared.trunk.dir}/target.self-built" />
</required>
+ <svn>
+ <hdk_by_hdk
+ url="http://svn.apache.org/repos/asf/harmony/enhanced/trunk" />
+ </svn>
+
</parameters>
Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties?rev=658698&r1=658697&r2=658698&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties Wed May 21 07:14:11 2008
@@ -70,12 +70,6 @@
hdk_by_hdk.parameters.required.tested.jdk=${snapshot.parameters.shared.jdk}
hdk_by_hdk.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
-hdk_by_hdk.parameters.required.trunk.url=http://svn.apache.org/repos/asf/harmony/enhanced/trunk
-hdk_by_hdk.trunk.dir=${checkouts.dir}/hdk
-hdk_by_hdk.parameters.required.trunk.dir=${hdk_by_hdk.trunk.dir}
-hdk_by_hdk.target.dir=${checkouts.dir}/hdk/target.self-built
-hdk_by_hdk.parameters.required.target.dir=${hdk_by_hdk.target.dir}
-
#
japi.parameters.depends=snapshot
japi.parameters.required.harmony.home=${snapshot.parameters.shared.jre}