svn commit: r424571 - /incubator/harmony/enhanced/trunk/build.xml

[ge...@apache.org]

Author: geirm
Date: Sat Jul 22 05:59:41 2006
New Revision: 424571

URL: http://svn.apache.org/viewvc?rev=424571&view=rev
Log:
it's hard to imagine that people let me commit
things...

fix of the filenames, and tweak to get the md5
right (remove the dir in the md5 file)


Modified:
    incubator/harmony/enhanced/trunk/build.xml

Modified: incubator/harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/trunk/build.xml?rev=424571&r1=424570&r2=424571&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/build.xml (original)
+++ incubator/harmony/enhanced/trunk/build.xml Sat Jul 22 05:59:41 2006
@@ -69,7 +69,7 @@
             </tarfileset>
         </tar>
 
-        <md5sum file="${target.dir}/${deploy.hdk.tar}"/>
+        <md5sum dir="${target.dir}" file="${deploy.hdk.tar}"/>
 
     </target>
 
@@ -90,7 +90,7 @@
             </zipfileset>
         </zip>
 
-        <md5sum file="${target.dir}/${deploy.hdk.zip}" />
+        <md5sum dir="${target.dir}" file="${deploy.hdk.zip}" />
     </target>
 
     <!-- ================================================================================ -->
@@ -114,7 +114,7 @@
             </tarfileset>
         </tar>
 
-        <md5sum file="${target.dir}/${deploy.jre.tar}" />
+        <md5sum dir="${target.dir}" file="${deploy.jre.tar}" />
 
     </target>
 
@@ -132,7 +132,7 @@
                 <exclude name="bin/eclipse.sh"/>
             </zipfileset>
         </zip>
-        <md5sum file="${target.dir}/${deploy.jre.zip}"/>
+        <md5sum dir="${target.dir}" file="${deploy.jre.zip}"/>
     </target>
 
 
@@ -377,7 +377,7 @@
         <property name="deploy.hdk.file.prefix"
                  value="incubator-harmony-hdk-r${svn.revision}" />
         <property name="deploy.hdk.tar"
-                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}-{$harmony.bits}-snapshot.tar.gz" />
+                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}-snapshot.tar.gz" />
         <property name="deploy.hdk.zip"
                  value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}-snapshot.zip" />
 
@@ -386,7 +386,7 @@
         <property name="deploy.jre.tar"
                  value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}-snapshot.tar.gz" />
         <property name="deploy.jre.zip"
-                 value="${deploy.jre.file.prefix}-${harmonyy.os}-${harmonyy.arch}-${harmony.bits}-snapshot.zip" />
+                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}-snapshot.zip" />
 
         <echo>
                    Apache Harmony Federated Build
@@ -429,11 +429,12 @@
     <!-- produces a nicer looking checksum - taken from classlib/build.xml                -->
     <!-- ================================================================================ -->
     <macrodef name="md5sum">
+        <attribute name="dir" />
         <attribute name="file" />
         <attribute name="type" default="md5" />
         <sequential>
-            <checksum property="@{file}.@{type}" file="@{file}" />
-            <echo file="@{file}.@{type}"
+            <checksum property="@{file}.@{type}" file="@{dir}/@{file}" />
+            <echo file="@{dir}/@{file}.@{type}"
                   message="${@{file}.@{type}}  @{file}" />
         </sequential>
     </macrodef>