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/03/21 07:55:11 UTC
svn commit: r520776 - in /harmony/enhanced/buildtest/trunk: build.xml
modules/classlib-drlvm/build.xml modules/classlib/build.xml
modules/drlvm-test/build.xml modules/drlvm/build.xml properties.xml
Author: smishura
Date: Tue Mar 20 23:55:10 2007
New Revision: 520776
URL: http://svn.apache.org/viewvc?view=rev&rev=520776
Log:
Move projects setup to modules/${project.name}/build.xml files
The update relates to HARMONY-3115:
([testing][buildtest module] the structure of buildtest module should be changed a little bit to improve testing capabilities)
Modified:
harmony/enhanced/buildtest/trunk/build.xml
harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml
harmony/enhanced/buildtest/trunk/modules/classlib/build.xml
harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml
harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml
harmony/enhanced/buildtest/trunk/properties.xml
Modified: harmony/enhanced/buildtest/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/build.xml?view=diff&rev=520776&r1=520775&r2=520776
==============================================================================
--- harmony/enhanced/buildtest/trunk/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/build.xml Tue Mar 20 23:55:10 2007
@@ -43,10 +43,6 @@
<property name="configfile" location="${target.dir}/config.xml" />
<property name="propertyfile" location="${target.dir}/cc.properties" />
- <!-- url of the classlib and drlvm in SVN -->
- <property name="svn.classlib.url" value="https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk" />
- <property name="svn.drlvm.url" value="https://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk" />
-
<condition property="is.windows">
<os family="windows" />
</condition>
@@ -208,42 +204,18 @@
<subant target="gen-config" buildpath="." />
<copy file="config/copyres.xml" tofile="${target.dir}/copyres.xml" />
- <mkdir dir="${target.dir}/projects/classlib" />
- <mkdir dir="${target.dir}/projects/drlvm" />
-
- <!-- now do the checkouts and load external libs -->
-
- <antcall target="co-classlib" />
- <subant target="fetch-depends" buildpath="${target.dir}/projects/classlib/trunk" />
- <subant target="rebuild" buildpath="${target.dir}/projects/classlib/trunk" failonerror="true" />
-
- <antcall target="co-drlvm" />
<antcall target="process-drlvm" />
- </target>
-
- <!-- ================================================
- Checkout classlib trunk tree into place for CC
- ================================================ -->
- <target name="co-classlib">
- <echo>Checking out Harmony classlib. This can take a while. Please be patient...</echo>
-
- <exec executable="svn" dir="${target.dir}/projects/classlib" failonerror="true">
- <arg line="co" />
- <arg line="${svn.classlib.url}" />
- </exec>
- </target>
+ <subant target="setup" >
+ <dirset dir="modules" includes="${modules}" />
+ <property name="configfile" value="${configfile}" />
+ <property name="propertyfile" value="${propertyfile}" />
+ <property name="target.dir" value="${target.dir}" />
+ <property name="vm.proxy.h" value="${vm.proxy.h}" />
+ <property name="vm.proxy.p" value="${vm.proxy.p}" />
+ <property name="build_configuration" value="${build_configuration}" />
+ </subant>
- <!-- ================================================
- Checkout DRLVM trunk tree into place for CC
- ================================================ -->
- <target name="co-drlvm">
- <echo>Checking out Harmony DRLVM. This can take a while. Please be patient...</echo>
-
- <exec executable="svn" dir="${target.dir}/projects/drlvm" failonerror="true">
- <arg line="co" />
- <arg line="${svn.drlvm.url}" />
- </exec>
</target>
<target name="drlvm-win" if="is.windows">
@@ -270,10 +242,6 @@
</replacevalue>
</replace>
<replace file="${target.dir}/cruisecontrol.bat" token='@vmdir@' value='${target.dir}/projects/drlvm/trunk/build' />
- <exec executable="cmd" dir="${target.dir}/projects/drlvm/trunk/build">
- <env key="BUILD_CFG" value="${build_configuration}" />
- <arg line="/c build.bat ${vm.proxy.h} ${vm.proxy.p} -Dexternal.dep.CLASSLIB.loc=${target.dir}/projects/classlib/trunk update clean build" />
- </exec>
</target>
<target name="drlvm-other" unless="is.windows">
@@ -289,14 +257,10 @@
<replace file="${target.dir}/cruisecontrol.sh" token='# CC_OPTS="-Xms128m -Xmx256m"' value='CC_OPTS="-Xmx500m"' />
<replace file="${target.dir}/cruisecontrol.sh" token="$LIBDIR/ant.jar" value="$LIBDIR/ant.jar:$ANT_HOME/lib/ant-apache-regexp.jar:$ANT_HOME/lib/ecj_3.2.jar:$ANT_HOME/lib/ant-nodeps.jar:$ANT_HOME/lib/ant-xslp.jar:$ANT_HOME/lib/ant-trax.jar:@vmdir@/make/tmp/ant-contrib.jar:@vmdir@/make/tmp/cpptasks/patched.classes:@vmdir@/make/tmp/cpptasks.jar" />
<replace file="${target.dir}/cruisecontrol.sh" token='@vmdir@' value='${target.dir}/projects/drlvm/trunk/build' />
- <exec executable="sh" dir="${target.dir}/projects/drlvm/trunk/build">
- <arg line="build.sh ${vm.proxy.h} ${vm.proxy.p} -Dexternal.dep.CLASSLIB.loc=${target.dir}/projects/classlib/trunk update clean build"/>
- </exec>
- </target>
- <target name="process-drlvm" depends="drlvm-win,drlvm-other">
- <echo>download external libs for Harmony DRLVM.</echo>
</target>
+ <target name="process-drlvm" depends="drlvm-win,drlvm-other"/>
+
<!-- =========================================================
cleanup to new state. Leaves the .zip around to save
time on a setup
@@ -310,14 +274,13 @@
========================================================= -->
<property name="modules" value="drlvm-test,classlib-drlvm" />
- <target name="gen-config" depends="set.proxy,no.proxy">
+ <delete>
+ <fileset dir="modules">
+ <include name="**/*.done" />
+ </fileset>
+ </delete>
- <!-- clean up before generation -->
- <delete>
- <fileset dir="modules">
- <include name="**/*.done" />
- </fileset>
- </delete>
+ <target name="gen-config" depends="set.proxy,no.proxy">
<!-- generate cruisecontrol property file -->
<echo file="${propertyfile}" append="true">
@@ -338,20 +301,13 @@
<property file="cc.properties" />
</echo>
- <subant target="-gen-config">
+ <subant target="gen-config" >
<dirset dir="modules" includes="${modules}" />
<property name="configfile" value="${configfile}" />
<property name="propertyfile" value="${propertyfile}" />
- <property name="is.windows" value="${is.windows}" />
</subant>
<echo file="${configfile}" message="</cruisecontrol>" append="true" />
- <!-- clean up after generation -->
- <delete>
- <fileset dir="modules">
- <include name="**/*.done" />
- </fileset>
- </delete>
</target>
</project>
Modified: harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml?view=diff&rev=520776&r1=520775&r2=520776
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/build.xml Tue Mar 20 23:55:10 2007
@@ -19,10 +19,14 @@
<import file="../../properties.xml" />
- <target name="-gen-config" unless="setup.done">
- <subant target="-gen-config" buildpath="../drlvm" />
- <process-project-template project="classlib-drlvm" />
- <touch file="setup.done" />
+ <target name="-setup">
+ <subant target="setup" buildpath="../drlvm" />
+ </target>
+
+ <target name="-gen-config">
+ <subant target="gen-config" buildpath="../drlvm" />
+
+ <process-project-template />
</target>
</project>
Modified: harmony/enhanced/buildtest/trunk/modules/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/classlib/build.xml?view=diff&rev=520776&r1=520775&r2=520776
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/classlib/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/modules/classlib/build.xml Tue Mar 20 23:55:10 2007
@@ -19,8 +19,20 @@
<import file="../../properties.xml" />
- <target name="-gen-config" unless="setup.done">
- <process-project-template project="classlib" />
- <touch file="setup.done" />
+ <property name="svn.classlib.url" value="https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk" />
+
+ <target name="-setup">
+
+ <mkdir dir="${target.dir}/projects/classlib" />
+
+ <echo>Checking out Harmony classlib. This can take a while. Please be patient...</echo>
+ <co-project dir="${target.dir}/projects/classlib" url="${svn.classlib.url}" />
+
+ <subant target="fetch-depends" buildpath="${target.dir}/projects/classlib/trunk" />
+ <subant target="rebuild" buildpath="${target.dir}/projects/classlib/trunk" failonerror="true" />
+ </target>
+
+ <target name="-gen-config">
+ <process-project-template />
</target>
</project>
Modified: harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml?view=diff&rev=520776&r1=520775&r2=520776
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/modules/drlvm-test/build.xml Tue Mar 20 23:55:10 2007
@@ -19,9 +19,13 @@
<import file="../../properties.xml" />
- <target name="-gen-config" unless="setup.done">
- <subant target="-gen-config" buildpath="../drlvm" />
- <process-project-template project="drlvm-test" />
- <touch file="setup.done" />
+ <target name="-setup">
+ <subant target="setup" buildpath="../drlvm" />
+ </target>
+
+ <target name="-gen-config">
+ <subant target="gen-config" buildpath="../drlvm" />
+
+ <process-project-template />
</target>
</project>
Modified: harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml?view=diff&rev=520776&r1=520775&r2=520776
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/modules/drlvm/build.xml Tue Mar 20 23:55:10 2007
@@ -19,34 +19,52 @@
<import file="../../properties.xml" />
- <target name="-gen-config" unless="setup.done">
- <subant target="-gen-config" buildpath="../classlib" />
- <process-project-template project="drlvm" />
+ <property name="svn.drlvm.url" value="https://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk" />
- <subant target="-gen-config-win" buildpath="." />
- <subant target="-gen-config-other" buildpath="." />
+ <target name="-setup" depends="-set-properties">
+ <subant target="setup" buildpath="../classlib" />
- <touch file="setup.done" />
+ <mkdir dir="${target.dir}/projects/drlvm" />
+ <echo>Checking out Harmony DRLVM. This can take a while. Please be patient...</echo>
+ <co-project dir="${target.dir}/projects/drlvm" url="${svn.drlvm.url}" />
+
+ <echo>download external libs for Harmony DRLVM.</echo>
+ <exec executable="${sh}" dir="${target.dir}/projects/drlvm/trunk/build" failonerror="true">
+ <env key="BUILD_CFG" value="${build_configuration}" />
+ <arg line="${cmd.prefix} ${cmd} ${vm.proxy.h} ${vm.proxy.p} -Dexternal.dep.CLASSLIB.loc=${target.dir}/projects/classlib/trunk update clean build" />
+ </exec>
</target>
- <target name="-gen-config-win" if="is.windows">
+ <target name="-gen-config" depends="-set-properties">
+ <subant target="gen-config" buildpath="../classlib" />
+
+ <process-project-template />
+
<echo file="${propertyfile}" append="true">
-os=win
-sh=cmd
-cmd.prefix=/c
-cmd=build.bat
-cc=msvc
+os=${os}
+sh=${sh}
+cmd.prefix=${cmd.prefix}
+cmd=${cmd}
+cc=${cc}
</echo>
</target>
- <target name="-gen-config-other" unless="is.windows">
- <echo file="${propertyfile}" append="true">
-os=lnx
-sh=sh
-cmd.prefix=
-cmd=build.sh
-cc=gcc
-</echo>
+ <target name="-set-properties" depends="-set-properties-win,-set-properties-other" />
+
+ <target name="-set-properties-win" if="is.windows">
+ <property name="os" value="win" />
+ <property name="sh" value="cmd" />
+ <property name="cmd.prefix" value="/c" />
+ <property name="cmd" value="build.bat" />
+ <property name="cc" value="msvc" />
+ </target>
+
+ <target name="-set-properties-other" unless="is.windows">
+ <property name="os" value="lnx" />
+ <property name="sh" value="sh" />
+ <property name="cmd.prefix" value="" />
+ <property name="cmd" value="build.sh" />
+ <property name="cc" value="gcc" />
</target>
</project>
Modified: harmony/enhanced/buildtest/trunk/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/properties.xml?view=diff&rev=520776&r1=520775&r2=520776
==============================================================================
--- harmony/enhanced/buildtest/trunk/properties.xml (original)
+++ harmony/enhanced/buildtest/trunk/properties.xml Tue Mar 20 23:55:10 2007
@@ -17,10 +17,28 @@
-->
<project>
+ <condition property="is.windows">
+ <os family="windows" />
+ </condition>
+
+ <condition property="is.unix">
+ <os family="unix" />
+ </condition>
+
<available property="setup.done" file="setup.done" />
+ <available property="config.done" file="config.done" />
+
+ <target name="setup" unless="setup.done">
+ <subant target="-setup" buildpath="." />
+ <touch file="setup.done" />
+ </target>
+
+ <target name="gen-config" unless="config.done">
+ <subant target="-gen-config" buildpath="." />
+ <touch file="config.done" />
+ </target>
<macrodef name="process-project-template">
- <attribute name="project" />
<sequential>
<concat destfile="${configfile}" append="true">
<fileset dir=".">
@@ -36,4 +54,14 @@
</sequential>
</macrodef>
+ <macrodef name="co-project">
+ <attribute name="dir" />
+ <attribute name="url" />
+ <sequential>
+ <exec executable="svn" dir="@{dir}" failonerror="true">
+ <arg line="co" />
+ <arg line="@{url}" />
+ </exec>
+ </sequential>
+ </macrodef>
</project>