harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r536813 - /harmony/enhanced/buildtest/branches/2.0/scripts/download.xml
Date Thu, 10 May 2007 10:28:48 GMT
Author: smishura
Date: Thu May 10 03:28:47 2007
New Revision: 536813

URL: http://svn.apache.org/viewvc?view=rev&rev=536813
Log:
Formatting

Modified:
    harmony/enhanced/buildtest/branches/2.0/scripts/download.xml

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?view=diff&rev=536813&r1=536812&r2=536813
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/download.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/download.xml Thu May 10 03:28:47 2007
@@ -37,8 +37,9 @@
         <!-- default properties file -->
         <property name="props.file" value="parameters.xml" />
 
-        <xmlproperty file="${props.file}" collapseAttributes="true"
-            semanticAttributes="true" />
+        <xmlproperty file="${props.file}"
+                     collapseAttributes="true"
+                     semanticAttributes="true" />
 
         <!-- flash propertyset as string to file for iteration   -->
         <!-- the string has the following format:                -->
@@ -50,7 +51,7 @@
         <property name="tmp.str" refid="tmp.id" />
         <echo message="${tmp.str}" file="${tmp.file}" />
 
-        <basename file="${basedir}" property="subcomponent"/>
+        <basename file="${basedir}" property="subcomponent" />
 
         <!-- iterate over propertyset fetching required dependencies -->
         <ant antfile="${download.xml}" target="-iterate" inheritall="false">
@@ -85,7 +86,7 @@
         <echo message="${rest}" file="${tmp.file}" />
 
         <!-- do download for the dependency -->
-        <fetch libname="${name}" subcomponent="${subcomponent}"/>
+        <fetch libname="${name}" subcomponent="${subcomponent}" />
 
         <ant antfile="${download.xml}" target="-iterate" inheritall="false">
             <propertyset refid="required.pops" />
@@ -97,7 +98,9 @@
         <condition property="donext">
             <length file="${tmp.file}" length="0" when="greater" />
         </condition>
-        <ant antfile="${download.xml}" target="-download-next" inheritAll="false">
+        <ant antfile="${download.xml}"
+             target="-download-next"
+             inheritAll="false">
             <propertyset>
                 <propertyset refid="required.pops" />
                 <propertyref name="donext" />
@@ -119,61 +122,60 @@
             ext.@{libname}.location 
          property. -->
     <macrodef name="fetch">
-        <attribute name="libname"/>
-        <attribute name="subcomponent"/>
+        <attribute name="libname" />
+        <attribute name="subcomponent" />
         <sequential>
-            <echo message="Fetching '@{libname}' external dependency for '@{subcomponent}'
subcomponent."/>
+            <echo message="Fetching '@{libname}' external dependency for '@{subcomponent}'
subcomponent." />
 
             <!-- Determine the basename of the URL pointing to library file
                  (further procedure of the library fetching depends on its 
                  type)                                                      -->
             <basename file="${parameters.external.@{libname}.url}"
-                      property="parameters.external.@{libname}.url.basename"/>
+                      property="parameters.external.@{libname}.url.basename" />
 
             <!-- Determine the [base]name of the library file:              -->
             <!-- firstly: check if it was expicitly specified 
                           by 'jar' attribute: -->
             <condition property="parameters.external.@{libname}.basename"
                        value="${parameters.external.@{libname}.jar}">
-                <isset property="parameters.external.@{libname}.jar"/>
+                <isset property="parameters.external.@{libname}.jar" />
             </condition>
             <!-- secondly: check if it was expicitly specified 
                           by 'dir' attribute: -->
             <condition property="parameters.external.@{libname}.basename"
                        value="${parameters.external.@{libname}.dir}">
-                <isset property="parameters.external.@{libname}.dir"/>
+                <isset property="parameters.external.@{libname}.dir" />
             </condition>
             <!-- at last: if the name was not explicitly specified,
                  use URL's basename. -->
             <property name="parameters.external.@{libname}.basename"
-                      value="${parameters.external.@{libname}.url.basename}"/>
-            
+                      value="${parameters.external.@{libname}.url.basename}" />
+
             <!-- Set up the library accessing property: -->
-            <property 
-                name="ext.@{libname}.location" 
-                location="${external.libs.dir}/${parameters.external.@{libname}.basename}"/>
+            <property name="ext.@{libname}.location"
+                      location="${external.libs.dir}/${parameters.external.@{libname}.basename}"
/>
             <echo file="${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}"/>
+                <available file="${ext.@{libname}.location}" />
             </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}"/>
+            <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">
-                <param name="lib.name" value="@{libname}"/>
+                <param name="lib.name" value="@{libname}" />
                 <param name="url.file"
-                       value="${parameters.external.@{libname}.url.basename}"/>
+                       value="${parameters.external.@{libname}.url.basename}" />
                 <param name="lib.file"
-                       value="${parameters.external.@{libname}.basename}"/>
+                       value="${parameters.external.@{libname}.basename}" />
                 <propertyset>
-                    <propertyref regex="^parameters\.external\..*"/>
+                    <propertyref regex="^parameters\.external\..*" />
                 </propertyset>
             </antcall>
         </sequential>
@@ -184,91 +186,88 @@
          this target. -->
     <target name="-fetch-unless-exists"
             unless="parameters.external.${lib.name}.exists">
-        <determine-resource-type libname="${lib.name}"/>
-        <antcall target="-fetch"/>
+        <determine-resource-type libname="${lib.name}" />
+        <antcall target="-fetch" />
     </target>
 
     <!-- Does determination of resource type -->
     <macrodef name="determine-resource-type">
-        <attribute name="libname"/>
+        <attribute name="libname" />
         <sequential>
             <!-- determine if it is an archive -->
             <condition property="parameters.external.@{libname}.is.zip">
-                <contains string="${parameters.external.@{libname}.url.basename}?" 
-                          substring=".zip?"/>
+                <contains string="${parameters.external.@{libname}.url.basename}?"
+                          substring=".zip?" />
             </condition>
             <!-- check availability of the archive -->
             <condition property="parameters.external.${lib.name}.downloaded">
                 <and>
-                    <isset property="parameters.external.@{libname}.is.zip"/>
-                    <available file="${external.arch.dir}/${url.file}"/>
+                    <isset property="parameters.external.@{libname}.is.zip" />
+                    <available file="${external.arch.dir}/${url.file}" />
                 </and>
             </condition>
             <!-- determine if it is a jar library -->
             <condition property="parameters.external.@{libname}.is.jar">
-                <contains string="${parameters.external.@{libname}.url.basename}?" 
-                          substring=".jar?"/>
+                <contains string="${parameters.external.@{libname}.url.basename}?"
+                          substring=".jar?" />
             </condition>
             <!-- check jar for presence -->
             <condition property="parameters.external.${lib.name}.downloaded">
-                <isset property="parameters.external.${lib.name}.exists"/>
+                <isset property="parameters.external.${lib.name}.exists" />
             </condition>
         </sequential>
     </macrodef>
 
     <!-- Do download to the temporal directory 
          and split control flow on the base of resource type -->
-    <target name="-fetch" depends="-download, -fetch-zip, -fetch-jar"/>
+    <target name="-fetch" depends="-download, -fetch-zip, -fetch-jar" />
 
     <!-- Do download external zip and extract it into external.libs.dir -->
-    <target name="-fetch-zip" 
-            if="parameters.external.${lib.name}.is.zip">
+    <target name="-fetch-zip" if="parameters.external.${lib.name}.is.zip">
         <echo>==> Fetch ZIP: ${url.file}</echo>
         <!-- file was downloaded, place it to the destination -->
         <move file="${temp.files.dir}/${url.file}"
               tofile="${external.arch.dir}/${url.file}"
-              failonerror="false"/>
+              failonerror="false" />
         <!-- .. and unzip -->
-        <antcall target="-do-unzip"/>
+        <antcall target="-do-unzip" />
     </target>
 
     <!-- Do unzip the archive on the base of its content -->
-    <target name="-do-unzip" depends="-do-unzip-jar, -do-unzip-dir"/>
+    <target name="-do-unzip" depends="-do-unzip-jar, -do-unzip-dir" />
 
     <!-- Do unzip the specified jar library -->
     <target name="-do-unzip-jar" if="parameters.external.${lib.name}.jar">
-        <unzip src="${external.arch.dir}/${url.file}"
-               dest="${temp.files.dir}">
+        <unzip src="${external.arch.dir}/${url.file}" dest="${temp.files.dir}">
             <patternset>
-                <include name="**/${lib.file}"/>
+                <include name="**/${lib.file}" />
             </patternset>
         </unzip>
         <move todir="${external.libs.dir}" flatten="true">
             <fileset dir="${temp.files.dir}">
-                <include name="**/${lib.file}"/>
+                <include name="**/${lib.file}" />
             </fileset>
         </move>
     </target>
 
     <!-- Do unzip the archive into specified by 'dir' attribute directory -->
     <target name="-do-unzip-dir" if="parameters.external.${lib.name}.dir">
-        <do-unzip-dir libname="${lib.name}"/>
+        <do-unzip-dir libname="${lib.name}" />
     </target>
 
     <macrodef name="do-unzip-dir">
-        <attribute name="libname"/>
+        <attribute name="libname" />
         <sequential>
             <!-- If 'inc' attribute specifying the extract includes was not
                  specified, unzip all -->
-            <property name="parameters.external.@{libname}.inc" value="**/*"/>
+            <property name="parameters.external.@{libname}.inc" value="**/*" />
             <!-- Do all the work in the special directory -->
-            <tempfile 
-                destdir="${temp.files.dir}"
-                property="parameters.external.@{libname}.tempfile"/>
-            <mkdir dir="${parameters.external.@{libname}.tempfile}"/>
+            <tempfile destdir="${temp.files.dir}"
+                      property="parameters.external.@{libname}.tempfile" />
+            <mkdir dir="${parameters.external.@{libname}.tempfile}" />
             <unzip src="${external.arch.dir}/${url.file}"
                    dest="${parameters.external.@{libname}.tempfile}">
-                <patternset includes="${parameters.external.@{libname}.inc}"/>
+                <patternset includes="${parameters.external.@{libname}.inc}" />
             </unzip>
             <!-- If archive's root dir name equals to target dir name
                  (specified by 'dir' attribute) move it to libs dir, 
@@ -276,14 +275,14 @@
                  (under libs dir) -->
             <move todir="${external.libs.dir}/${parameters.external.@{libname}.dir}">
                 <fileset dir="${parameters.external.@{libname}.tempfile}">
-                    <include name="**/*"/>
+                    <include name="**/*" />
                 </fileset>
-                <mapper type="glob" 
+                <mapper type="glob"
                         from="${parameters.external.@{libname}.dir}${file.separator}"
-                        to="*"/>
+                        to="*" />
             </move>
             <delete dir="${parameters.external.@{libname}.tempfile}"
-                    failonerror="false"/>
+                    failonerror="false" />
         </sequential>
     </macrodef>
 
@@ -293,34 +292,33 @@
         <!-- file was downloaded, place it to the destination -->
         <move file="${temp.files.dir}/${url.file}"
               tofile="${external.libs.dir}/${lib.file}"
-              failonerror="false"/>
+              failonerror="false" />
     </target>
-    
-    <target name="-download" unless="parameters.external.${lib.name}.downloaded">
-        <do-download libname="${lib.name}"/>
+
+    <target name="-download"
+            unless="parameters.external.${lib.name}.downloaded">
+        <do-download libname="${lib.name}" />
     </target>
 
     <!-- Downloads external dependency pointed by @{libname}'s URL
          into ${temp.files.dir}/${url.file} and checks its checksum -->
     <macrodef name="do-download">
-        <attribute name="libname"/>
+        <attribute name="libname" />
         <sequential>
             <echo>==> Do Download from ${parameters.external.@{libname}.url}</echo>
-            <get src="${parameters.external.@{libname}.url}" 
-                 dest="${temp.files.dir}/${url.file}" 
-                 usetimestamp="true" 
-                 verbose="true"
-            />
+            <get src="${parameters.external.@{libname}.url}"
+                 dest="${temp.files.dir}/${url.file}"
+                 usetimestamp="true"
+                 verbose="true" />
             <!-- compute the checksum and check the downloaded file -->
-            <checksum
-                file="${temp.files.dir}/${url.file}"
-                property="parameters.external.@{libname}.url.md5"/>
+            <checksum file="${temp.files.dir}/${url.file}"
+                      property="parameters.external.@{libname}.url.md5" />
             <fail>
                 <condition>
-                    <not><equals 
-                        arg1="${parameters.external.@{libname}.url.md5}" 
-                        arg2="${parameters.external.@{libname}.md5}"
-                    /></not>
+                    <not>
+                        <equals arg1="${parameters.external.@{libname}.url.md5}"
+                                arg2="${parameters.external.@{libname}.md5}" />
+                    </not>
                 </condition>
 ...
 File
@@ -337,14 +335,14 @@
 
     <target name="-make-dep-dirs" unless="${depends.jars}.exists">
         <!-- Make the directories to store external dependencies -->
-        <mkdir dir="${external.libs.dir}"/>
-        <mkdir dir="${external.arch.dir}"/>
-        <mkdir dir="${temp.files.dir}"/>
+        <mkdir dir="${external.libs.dir}" />
+        <mkdir dir="${external.arch.dir}" />
+        <mkdir dir="${temp.files.dir}" />
     </target>
 
     <target name="-setup-proxy" if="http.proxyHost">
         <echo>==> Setting Up the proxy: ${http.proxyHost}:${http.proxyPort}</echo>
-        <setproxy proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}"/>
+        <setproxy proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}" />
     </target>
 
 </project>



Mime
View raw message