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/03/06 07:25:50 UTC
svn commit: r634174 - in /harmony/enhanced/buildtest/trunk/infra: build.xml
scripts/framework.xml
Author: smishura
Date: Wed Mar 5 22:25:48 2008
New Revision: 634174
URL: http://svn.apache.org/viewvc?rev=634174&view=rev
Log:
Move ant patching to build.xml + make the target free from antcontrib
Modified:
harmony/enhanced/buildtest/trunk/infra/build.xml
harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml
Modified: harmony/enhanced/buildtest/trunk/infra/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/build.xml?rev=634174&r1=634173&r2=634174&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Wed Mar 5 22:25:48 2008
@@ -69,8 +69,27 @@
<!-- ==================================================================
Framework Setup Functionality
================================================================== -->
+ <target name="-init-setup">
+
+ <!-- create dirs -->
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${checkouts.dir}" />
+ <mkdir dir="${results.dir}" />
+ <mkdir dir="${temp.files.dir}" />
+ <mkdir dir="${classes.dir}" />
+
+ <!-- init properties -->
+ <condition property="is.ant.1.6.5">
+ <contains string="${ant.version}" substring="1.6.5" />
+ </condition>
+ <condition property="is.ant.1.7.0">
+ <contains string="${ant.version}" substring="1.7.0" />
+ </condition>
+ </target>
+
<target name="setup"
- depends="fetch-depends,
+ depends="-init-setup,
+ fetch-depends,
checkout-projects,
create-local-configuration,
setup-framework,
@@ -114,7 +133,7 @@
</echo>
</target>
- <target name="fetch-depends">
+ <target name="fetch-depends" depends="-init-setup">
<property name="download.xml" location="${scripts.dir}/download.xml" />
<!-- create empty file -->
@@ -134,7 +153,7 @@
</subant>
</target>
- <target name="checkout-projects" depends="make-dirs">
+ <target name="checkout-projects" depends="-init-setup">
<property name="svn.xml" location="${scripts.dir}/svn.xml" />
<!-- download suites dependencies -->
@@ -145,6 +164,46 @@
</subant>
</target>
+ <!-- Tasks to patch Ant's Bug described at:
+ http://issues.apache.org/bugzilla/show_bug.cgi?id=30569
+ -->
+ <target name="-patch-ant-1.6.5" depends="-init-setup" if="is.ant.1.6.5">
+ <property name="ant.to.patch" value="1.6.5" />
+ <property name="ant.patch.url"
+ value="http://issues.apache.org/bugzilla/attachment.cgi?id=15681" />
+ </target>
+ <target name="-patch-ant-1.7.0" depends="-init-setup" if="is.ant.1.7.0">
+ <property name="ant.to.patch" value="1.7.0" />
+ <property name="ant.patch.url"
+ value="http://issues.apache.org/bugzilla/attachment.cgi?id=19566" />
+ </target>
+
+ <target name="patch-ant"
+ depends="-patch-ant-1.6.5,-patch-ant-1.7.0,-setup-proxy"
+ if="ant.to.patch">
+
+ <mkdir dir="${temp.files.dir}/${ant.to.patch}" />
+ <property name="ant.patch.file"
+ location="${temp.files.dir}/${ant.to.patch}/SubAnt.java" />
+
+ <!-- FIXME: download only if required (i.e. no patch file) -->
+ <get src="${ant.patch.url}"
+ dest="${ant.patch.file}"
+ usetimestamp="true"
+ verbose="true" />
+
+ <javac srcdir="${temp.files.dir}/${ant.to.patch}"
+ destdir="${classes.dir}"
+ includesfile="${ant.patch.file}">
+ <depend targetdir="${classes.dir}/org/apache/tools/ant/taskdefs">
+ <mapper>
+ <globmapper from="*.java" to="*.class" />
+ </mapper>
+ </depend>
+ </javac>
+ </target>
+
+
<!-- ==================================================================
Test Execution Functionality
================================================================== -->
@@ -225,5 +284,9 @@
depends="init-framework, clean-suites" />
<target name="distclean" description="distclean" />
+
+ <target name="-setup-proxy" if="http.proxyHost">
+ <setproxy proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}" />
+ </target>
</project>
Modified: harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml?rev=634174&r1=634173&r2=634174&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml Wed Mar 5 22:25:48 2008
@@ -51,7 +51,7 @@
<!-- Sets up the framework -->
<target name="setup-framework"
- depends="load-depends, define-tasks, make-dirs, patch-ant,
+ depends="load-depends, define-tasks,
check-selected-names, reorder-suites, -delete-temporal-properties"/>
<!-- Initialize the framework for test execution -->
@@ -98,61 +98,6 @@
obtained on setup stage -->
<target name="load-suites-configuration" depends="define-ant-contrib">
<var file="${selected.suites.configuration}"/>
- </target>
-
- <condition property="ant.to.patch" value="1.6.5">
- <contains string="${ant.version}" substring="1.6.5"/>
- </condition>
-
- <condition property="ant.to.patch" value="1.7.0">
- <contains string="${ant.version}" substring="1.7.0"/>
- </condition>
-
- <!-- Fixes Ant's Bug described at:
- http://issues.apache.org/bugzilla/show_bug.cgi?id=30569
- -->
- <target name="patch-ant" depends="make-dirs, define-ant-contrib" if="ant.to.patch">
-
- <condition
- property="ant.patch.url"
- value="http://issues.apache.org/bugzilla/attachment.cgi?id=15681"
- else="http://issues.apache.org/bugzilla/attachment.cgi?id=19566">
- <equals arg1="${ant.to.patch}" arg2="1.6.5"/>
- </condition>
-
- <mkdir dir="${temp.files.dir}/${ant.to.patch}"/>
- <property name="ant.patch.file"
- value="${temp.files.dir}/${ant.to.patch}/SubAnt.java"/>
-
- <if>
- <not><available file="${ant.patch.file}"/></not>
- <then>
- <get src="${ant.patch.url}"
- dest="${ant.patch.file}"
- usetimestamp="true"
- verbose="true"
- />
- </then>
- </if>
- <javac
- srcdir="${temp.files.dir}/${ant.to.patch}"
- destdir="${classes.dir}"
- includesfile="${ant.patch.file}">
- <depend targetdir="${classes.dir}/org/apache/tools/ant/taskdefs">
- <mapper>
- <globmapper from="*.java" to="*.class"/>
- </mapper>
- </depend>
- </javac>
- </target>
-
- <target name="make-dirs">
- <!-- Make Dirs -->
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${checkouts.dir}"/>
- <mkdir dir="${results.dir}"/>
- <mkdir dir="${temp.files.dir}"/>
- <mkdir dir="${classes.dir}"/>
</target>
<target name="define-tasks" depends="define-ant-contrib"/>