harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r652237 - in /harmony/enhanced/buildtest/trunk/infra: build.xml scripts/svn.xml
Date Wed, 30 Apr 2008 03:15:00 GMT
Author: smishura
Date: Tue Apr 29 20:14:59 2008
New Revision: 652237

URL: http://svn.apache.org/viewvc?rev=652237&view=rev
Log:
Flash svn properties to a suite's property file

Modified:
    harmony/enhanced/buildtest/trunk/infra/build.xml
    harmony/enhanced/buildtest/trunk/infra/scripts/svn.xml

Modified: harmony/enhanced/buildtest/trunk/infra/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/build.xml?rev=652237&r1=652236&r2=652237&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Tue Apr 29 20:14:59 2008
@@ -67,6 +67,7 @@
         <propertyref name="framework.properties.file" />
         <propertyref name="framework.implementation.file" />
         <propertyref name="test.suites.names.list" />
+        <propertyref name="external.resources.location" />
     </propertyset>
 
     <!-- ================================================================== 
@@ -144,14 +145,15 @@
         <condition property="framework.local.config.exists">
             <available file="${framework.local.configuration.file}" />
         </condition>
+
+        <!-- create empty file -->
+        <echo file="${external.resources.location}" message="" />
+
     </target>
 
     <target name="fetch-depends" depends="-init-install,-check-selected-names">
         <property name="download.xml" location="${scripts.dir}/download.xml" />
 
-        <!-- create empty file -->
-        <echo file="${external.resources.location}" message="" />
-
         <!-- download framework dependencies -->
         <subant genericantfile="${download.xml}"
                 target="download-all"
@@ -223,6 +225,18 @@
     <target name="generate-config"
             depends="-check-selected-names,create-local-configuration">
 
+        <!-- get SVN properties.
+             TODO: refactor - there should be better way for export
+        -->
+        <property name="svn.xml" location="${scripts.dir}/svn.xml" />
+        <subant genericantfile="${svn.xml}"
+                target="checkout-all"
+                inheritall="true">
+            <dirset dir="${adaptors.dir}" includes="${test.suites}" />
+
+            <property name="flash.properties" value="true" />
+        </subant>
+
         <subant genericantfile="${scripts.dir}/config.xml"
                 target="generate-config"
                 inheritall="true"

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/svn.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/svn.xml?rev=652237&r1=652236&r2=652237&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/svn.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/svn.xml Tue Apr 29 20:14:59 2008
@@ -28,6 +28,10 @@
         <propertyref name="svn.xml" />
         <propertyref name="subcomponent" />
         <propertyref name="checkouts.dir" />
+
+        <!-- store svn parameters in properties file -->
+        <propertyref name="flash.properties" />
+        <propertyref name="external.resources.location" />
     </propertyset>
 
     <target name="checkout-all">
@@ -122,11 +126,8 @@
     <target name="-init">
 
         <!-- set the directory for checkout -->
-        <condition property="dir.to.checkout"
-                   value="${checkouts.dir}/${lib.dir}"
-                   else="${checkouts.dir}/${libname}">
-            <isset property="lib.dir" />
-        </condition>
+        <property name="lib.dir" value="${libname}" />
+        <property name="dir.to.checkout" value="${checkouts.dir}/${lib.dir}" />
 
         <!-- get dir url -->
         <exec executable="svn" dir="${checkouts.dir}">
@@ -196,7 +197,9 @@
 
     </target>
 
-    <target name="-checkout-if-necessary" if="need.to.checkout" depends="-init">
+    <target name="-checkout-if-necessary"
+            if="need.to.checkout"
+            depends="-init,-flash-properties">
 
         <mkdir dir="${dir.to.checkout}" />
 
@@ -204,5 +207,12 @@
             <arg line="co ${svn.url} ${dir.to.checkout}" />
         </exec>
     </target>
+
+    <target name="-flash-properties" if="flash.properties">
+        <echo file="${external.resources.location}" append="true">${subcomponent}.parameters.svn.${libname}.url=${svn.url}
+${subcomponent}.parameters.svn.${libname}.dir=${lib.dir}
+${subcomponent}.parameters.svn.${libname}.location=${dir.to.checkout}
+</echo>
+    </target>
 </project>
 



Mime
View raw message