svn commit: r649385 - in /harmony/enhanced/buildtest/trunk/infra: build.xml scripts/svn.xml

[sm...@apache.org]

Author: smishura
Date: Thu Apr 17 23:49:30 2008
New Revision: 649385

URL: http://svn.apache.org/viewvc?rev=649385&view=rev
Log:
Add svn parameter to specify directory for checkout

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=649385&r1=649384&r2=649385&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Thu Apr 17 23:49:30 2008
@@ -167,7 +167,10 @@
     </target>
 
     <target name="checkout-projects"
-            depends="-init-install,-check-selected-names">
+            depends="-init-install,
+                     -check-selected-names,
+                     generate-config">
+
         <property name="svn.xml" location="${scripts.dir}/svn.xml" />
 
         <!-- download suites dependencies -->
@@ -441,9 +444,7 @@
         </ant>
     </target>
 
-    <target name="clean"
-            description="clean"
-            depends="clean-suites" />
+    <target name="clean" description="clean" depends="clean-suites" />
 
     <target name="distclean" description="distclean" />
 

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/svn.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/svn.xml?rev=649385&r1=649384&r2=649385&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/svn.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/svn.xml Thu Apr 17 23:49:30 2008
@@ -34,6 +34,10 @@
         <!-- default properties file -->
         <property name="props.file" value="parameters.xml" />
 
+        <basename file="${basedir}" property="subcomponent" />
+
+        <property file="${config.dir}/${subcomponent}.properties" />
+
         <xmlproperty file="${props.file}"
                      collapseAttributes="true"
                      semanticAttributes="true" />
@@ -48,8 +52,6 @@
         <property name="tmp.str" refid="tmp.id" />
         <echo message="${tmp.str}" file="${tmp.file}" />
 
-        <basename file="${basedir}" property="subcomponent" />
-
         <!-- iterate over propertyset fetching required dependencies -->
         <ant antfile="${svn.xml}" target="-iterate" inheritall="false">
             <propertyset refid="required.pops" />
@@ -119,11 +121,16 @@
     <!--                                                  -->
     <target name="-init">
 
-        <property name="dir.to.checkout" value="${checkouts.dir}/${libname}" />
+        <!-- set the directory for checkout -->
+        <condition property="dir.to.checkout"
+                   value="${checkouts.dir}/${lib.dir}"
+                   else="${checkouts.dir}/${libname}">
+            <isset property="lib.dir" />
+        </condition>
 
         <!-- get dir url -->
         <exec executable="svn" dir="${checkouts.dir}">
-            <arg line="info ${libname}" />
+            <arg line="info ${dir.to.checkout}" />
             <redirector outputproperty="dir.url" errorproperty="dev.null">
                 <outputfilterchain>
                     <linecontains>
@@ -184,7 +191,7 @@
         <echo>
 =====> Project: ${libname}
        URL:     ${svn.url}
-       Update:  ${need.to.checkout}
+       Dir:     ${dir.to.checkout}
         </echo>
 
     </target>