harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r575175 - in /harmony/enhanced/buildtest/branches/2.0/adaptors: hdk_by_hdk/adaptor.xml make-snapshot/adaptor.xml
Date Thu, 13 Sep 2007 05:42:55 GMT
Author: varlax
Date: Wed Sep 12 22:42:55 2007
New Revision: 575175

URL: http://svn.apache.org/viewvc?rev=575175&view=rev
Log:
Fixed adaptors to update HDK workspace before each run

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/make-snapshot/adaptor.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml?rev=575175&r1=575174&r2=575175&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml Wed Sep 12 22:42:55
2007
@@ -32,25 +32,23 @@
                 trim="yes" />
     </condition>
 
-    <condition property="is.checkout_ws">
-        <and>
-            <isset property="is.snapshot" />
-            <not>
-                <available file="${hdk_by_hdk.parameters.required.trunk.dir}/build.xml"
/>
-            </not>
-        </and>
-    </condition>
-
-    <target name="setup" depends="-setup-hdk-ws" />
-
-    <target name="-setup-hdk-ws" if="is.checkout_ws">
+    <target name="setup">
         <mkdir dir="${hdk_by_hdk.parameters.required.trunk.dir}" />
+    </target>
 
-        <svn-co url="${hdk_by_hdk.parameters.required.trunk.url}"
-                trunk="${hdk_by_hdk.parameters.required.trunk.dir}" />
+    <target name="-get-revision" if="is.snapshot">
+        <property file="${snapshot.svn.revision.file}"/>
+        <property name="co.target" value="-r${svn.revision}"/>
     </target>
 
-    <target name="run">
+    <target name="run" depends="-get-revision">
+        <echo message="Checkout HDK trunk ${co.target} into ${hdk_by_hdk.parameters.required.trunk.dir}"/>
+        <property name="co.target" value=""/>
+        <exec executable="svn" dir="${hdk_by_hdk.parameters.required.trunk.dir}" 
+            failonerror="true">
+            <arg line="co ${co.target} ${hdk_by_hdk.parameters.required.trunk.url} ."
/>
+        </exec>
+
         <exec-ant dir="${trunk.dir}" javaVM="${tested.jdk}/bin/java">
             <jvmarg line="-Xmx800M -Dtarget.dir=${target.dir}"/>
             <env key="JAVA_HOME" value="${tested.jdk}"/>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/make-snapshot/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/make-snapshot/adaptor.xml?rev=575175&r1=575174&r2=575175&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/make-snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/make-snapshot/adaptor.xml Wed Sep 12
22:42:55 2007
@@ -20,13 +20,20 @@
     <!-- initial setup of the HDK workspace -->
     <target name="setup">
         <mkdir dir="${trunk.dir}"/>
-        <echo message="Checkout HDK trunk into ${trunk.dir}"/>
-        <svn-co url="${svn.url}" trunk="${trunk.dir}"/>
     </target>
 
     <target name="run" depends="do-build,upload"/>
 
     <target name="do-build">
+        <property file="${trunk.dir}/release.properties" prefix="make"/>
+        <condition property="co.target" value="-r${make.svn.revision}" else="">
+            <isset property="make.svn.revision"/>
+        </condition>
+        <echo message="Checkout HDK trunk ${co.target} into ${trunk.dir}"/>
+        <exec executable="svn" dir="${trunk.dir}" failonerror="true">
+            <arg line="co ${co.target} ${svn.url} ." />
+        </exec>
+
         <exec-ant dir="${trunk.dir}" targets="make-snapshot">
             <jvmarg line="-Xmx1000M"/> 
             <sysproperty key="target.dir" value="${target.dir}"/>
@@ -41,10 +48,9 @@
     </target>
 
     <target name="upload" if="do.upload">
-        <property file="${trunk.dir}/release.properties" prefix="upload"/>
-        <condition property="upload.dir" value="${make-snapshot.parameters.optional.upload.dir}/r${upload.svn.revision}"

+        <condition property="upload.dir" value="${make-snapshot.parameters.optional.upload.dir}/r${make.svn.revision}"

             else="${make-snapshot.parameters.optional.upload.dir}">
-            <isset property="upload.svn.revision"/>
+            <isset property="make.svn.revision"/>
         </condition>
         <mkdir dir="${upload.dir}"/>
         <chmod file="${target.dir}" perm="ugo+rw"/>



Mime
View raw message