Return-Path: 
 <commits-return-46363-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 98101 invoked from network); 7 Nov 2007 06:52:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Nov 2007 06:52:53 -0000
Received: (qmail 23445 invoked by uid 500); 7 Nov 2007 06:52:41 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 23428 invoked by uid 500); 7 Nov 2007 06:52:41 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 23417 invoked by uid 99); 7 Nov 2007 06:52:41 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Nov 2007 22:52:41 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Nov 2007 06:52:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9B3D71A9832; Tue,  6 Nov 2007 22:52:32 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r592635 -
 /harmony/enhanced/buildtest/branches/2.0/scripts/download.xml
Date: Wed, 07 Nov 2007 06:52:32 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071107065232.9B3D71A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: smishura
Date: Tue Nov  6 22:52:31 2007
New Revision: 592635

URL: http://svn.apache.org/viewvc?rev=592635&view=rev
Log:
Now fruits of properties names unification - no need in 'macrodef' wrapped by 'target':
"determine-resource-type", "do-unzip-dir", "do-download" elements were move to targets

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?rev=592635&r1=592634&r2=592635&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/download.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/download.xml Tue Nov  6 22:52:31 2007
@@ -196,32 +196,25 @@
          corresponding properties. The further control flow depends on 
          this target. -->
     <target name="-fetch-if-necessary" if="need.to.download">
-        <determine-resource-type libname="${libname}" />
+        <!-- determine if it is an archive -->
+        <condition property="lib.is.zip">
+            <contains string="${lib.url.basename}?" substring=".zip?" />
+        </condition>
+        <!-- check availability of the archive -->
+        <condition property="lib.downloaded">
+            <and>
+                <isset property="lib.is.zip" />
+                <available file="${external.arch.dir}/${lib.url.basename}" />
+            </and>
+        </condition>
+        <!-- determine if it is a jar library -->
+        <condition property="lib.is.jar">
+            <contains string="${lib.url.basename}?" substring=".jar?" />
+        </condition>
+
         <antcall target="-fetch" />
     </target>
 
-    <!-- Does determination of resource type -->
-    <macrodef name="determine-resource-type">
-        <attribute name="libname" />
-        <sequential>
-            <!-- determine if it is an archive -->
-            <condition property="lib.is.zip">
-                <contains string="${lib.url.basename}?" substring=".zip?" />
-            </condition>
-            <!-- check availability of the archive -->
-            <condition property="lib.downloaded">
-                <and>
-                    <isset property="lib.is.zip" />
-                    <available file="${external.arch.dir}/${lib.url.basename}" />
-                </and>
-            </condition>
-            <!-- determine if it is a jar library -->
-            <condition property="lib.is.jar">
-                <contains string="${lib.url.basename}?" substring=".jar?" />
-            </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" />
@@ -257,36 +250,29 @@
 
     <!-- Do unzip the archive into specified by 'dir' attribute directory -->
     <target name="-do-unzip-dir" if="lib.dir">
-        <do-unzip-dir libname="${libname}" />
+        <!-- If 'inc' attribute specifying the extract includes was not
+             specified, unzip all -->
+        <property name="lib.inc" value="**/*" />
+        <!-- Do all the work in the special directory -->
+        <tempfile destdir="${temp.files.dir}" property="lib.tempfile" />
+        <mkdir dir="${lib.tempfile}" />
+        <unzip src="${external.arch.dir}/${lib.url.basename}"
+               dest="${lib.tempfile}">
+            <patternset includes="${lib.inc}" />
+        </unzip>
+        <!-- If archive's root dir name equals to target dir name
+             (specified by 'dir' attribute) move it to libs dir, 
+             otherwise - move all extracted files to target dir 
+             (under libs dir) -->
+        <move todir="${external.libs.dir}/${lib.dir}">
+            <fileset dir="${lib.tempfile}">
+                <include name="**/*" />
+            </fileset>
+            <mapper type="glob" from="${lib.dir}${file.separator}" to="*" />
+        </move>
+        <delete dir="${lib.tempfile}" failonerror="false" />
     </target>
 
-    <macrodef name="do-unzip-dir">
-        <attribute name="libname" />
-        <sequential>
-            <!-- If 'inc' attribute specifying the extract includes was not
-                 specified, unzip all -->
-            <property name="lib.inc" value="**/*" />
-            <!-- Do all the work in the special directory -->
-            <tempfile destdir="${temp.files.dir}" property="lib.tempfile" />
-            <mkdir dir="${lib.tempfile}" />
-            <unzip src="${external.arch.dir}/${lib.url.basename}"
-                   dest="${lib.tempfile}">
-                <patternset includes="${lib.inc}" />
-            </unzip>
-            <!-- If archive's root dir name equals to target dir name
-                 (specified by 'dir' attribute) move it to libs dir, 
-                 otherwise - move all extracted files to target dir 
-                 (under libs dir) -->
-            <move todir="${external.libs.dir}/${lib.dir}">
-                <fileset dir="${lib.tempfile}">
-                    <include name="**/*" />
-                </fileset>
-                <mapper type="glob" from="${lib.dir}${file.separator}" to="*" />
-            </move>
-            <delete dir="${lib.tempfile}" failonerror="false" />
-        </sequential>
-    </macrodef>
-
     <!-- Do download external jar into external.libs.dir -->
     <target name="-fetch-jar" if="lib.is.jar">
         <echo>==> Fetch JAR: ${lib.url.basename}</echo>
@@ -296,29 +282,23 @@
               failonerror="false" />
     </target>
 
-    <target name="-download" unless="lib.downloaded">
-        <do-download libname="${libname}" />
-    </target>
-
-    <!-- Downloads external dependency pointed by @{libname}'s URL
+    <!-- Downloads external dependency pointed by ${libname}'s URL
          into ${temp.files.dir}/${lib.url.basename} and checks its checksum -->
-    <macrodef name="do-download">
-        <attribute name="libname" />
-        <sequential>
-            <echo>==> Do Download from ${lib.url} </echo>
-            <get src="${lib.url}"
-                 dest="${temp.files.dir}/${lib.url.basename}"
-                 usetimestamp="true"
-                 verbose="true" />
-            <!-- compute the checksum and check the downloaded file -->
-            <checksum file="${temp.files.dir}/${lib.url.basename}"
-                      property="lib.url.md5" />
-            <fail>
-                <condition>
-                    <not>
-                        <equals arg1="${lib.url.md5}" arg2="${lib.md5}" />
-                    </not>
-                </condition>
+    <target name="-download" unless="lib.downloaded">
+        <echo>==> Do Download from ${lib.url} </echo>
+        <get src="${lib.url}"
+             dest="${temp.files.dir}/${lib.url.basename}"
+             usetimestamp="true"
+             verbose="true" />
+        <!-- compute the checksum and check the downloaded file -->
+        <checksum file="${temp.files.dir}/${lib.url.basename}"
+                  property="lib.url.md5" />
+        <fail>
+            <condition>
+                <not>
+                    <equals arg1="${lib.url.md5}" arg2="${lib.md5}" />
+                </not>
+            </condition>
 ...
 File
     ${lib.basename} 
@@ -329,8 +309,7 @@
 while expected is:
     '${lib.md5}'
             </fail>
-        </sequential>
-    </macrodef>
+    </target>
 
     <target name="-make-dep-dirs">
         <!-- Make the directories to store external dependencies -->