harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r591887 - in /harmony/enhanced/buildtest/branches/2.0: dev-guide.txt scripts/download.xml scripts/framework.xml
Date Mon, 05 Nov 2007 06:01:40 GMT
Author: smishura
Date: Sun Nov  4 22:01:38 2007
New Revision: 591887

URL: http://svn.apache.org/viewvc?rev=591887&view=rev
Log:
Apply modified patch from HARMONY-5059:
[buildtest] Support BTI to download dependence according to local server's platform infomations

Modified:
    harmony/enhanced/buildtest/branches/2.0/dev-guide.txt
    harmony/enhanced/buildtest/branches/2.0/scripts/download.xml
    harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml

Modified: harmony/enhanced/buildtest/branches/2.0/dev-guide.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/dev-guide.txt?rev=591887&r1=591886&r2=591887&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/dev-guide.txt (original)
+++ harmony/enhanced/buildtest/branches/2.0/dev-guide.txt Sun Nov  4 22:01:38 2007
@@ -565,14 +565,17 @@
             md5="87A617D7E65979AE01B5ACE4649EB40B"
             dir="my-dep-dir"
             inc="*/lib/*.jar"
+            if="is.linux"
         />
     </external>
 
 It describes dependency called *my-dependency* which is located at specified
-URL and has particular MD5 check sum. During the local installation of
+URL and has particular MD5 check sum. The dependency will be downloaded only
+when local operation system is linux. During the local installation of
 downloaded archive only jar files from `lib` directory will be unzipped and
 placed under `my-dep-dir` directory. The path to this directory will be
-provided by ``ext.my-dependency.location`` property.
+provided by ``ext.my-dependency.location`` property.The `if` is an optional 
+parameters. There is no special requirement when it isn't set.
 
 This module is under development and provides only simple functionality.
 For working usage examples, please, look at ``./scripts/parameters.xml`` file.

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/download.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/download.xml?rev=591887&r1=591886&r2=591887&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/download.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/download.xml Sun Nov  4 22:01:38 2007
@@ -31,6 +31,8 @@
         <propertyref name="external.arch.dir" />
         <propertyref name="temp.files.dir" />
         <propertyref name="external.resources.location" />
+        <!-- to include all platfroms settings -->
+        <propertyref prefix="is" />
     </propertyset>
 
     <target name="download-all" depends="-make-dep-dirs,-setup-proxy">
@@ -157,18 +159,30 @@
             <echo file="${external.resources.location}" append="true">ext.@{libname}.location=${ext.@{libname}.location}
 </echo>
 
-            <!-- Check for lib file presence -->
-            <condition property="parameters.external.@{libname}.exists">
-                <available file="${ext.@{libname}.location}" />
+            <!-- Check for if download is required -->
+            <condition property="need.to.download">
+                <and>
+                    <not>
+                        <available file="${ext.@{libname}.location}" />
+                    </not>
+                    <or>
+                        <not>
+                            <isset property="parameters.external.@{libname}.if" />
+                        </not>
+                        <and>
+                            <isset property="parameters.external.@{libname}.if" />
+                            <isset property="${parameters.external.@{libname}.if}" />
+                        </and>
+                    </or>
+                </and>
             </condition>
 
             <echo message="===> Library Info: @{libname}" />
             <echo message="         Basename: ${parameters.external.@{libname}.basename}"
/>
             <echo message="         Location: ${ext.@{libname}.location}" />
-            <echo message="         Presence: ${parameters.external.@{libname}.exists}"
/>
 
             <!-- Proceed fetching if the target file does not exist -->
-            <antcall target="-fetch-unless-exists">
+            <antcall target="-fetch-if-necessary">
                 <param name="lib.name" value="@{libname}" />
                 <param name="url.file"
                        value="${parameters.external.@{libname}.url.basename}" />
@@ -181,8 +195,7 @@
     <!-- Determines the type of the resource to be downloaded and sets up
          corresponding properties. The further control flow depends on 
          this target. -->
-    <target name="-fetch-unless-exists"
-            unless="parameters.external.${lib.name}.exists">
+    <target name="-fetch-if-necessary" if="need.to.download">
         <determine-resource-type libname="${lib.name}" />
         <antcall target="-fetch" />
     </target>

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml?rev=591887&r1=591886&r2=591887&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml Sun Nov  4 22:01:38 2007
@@ -46,6 +46,7 @@
 -->
 <project name="framework-implementation" default="run" basedir=".">
 
+    <import file="properties.xml"/>
     <import file="cc-project.xml"/>
 
     <!-- Sets up the framework -->



Mime
View raw message