harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r465227 - /incubator/harmony/enhanced/trunk/build.xml
Date Wed, 18 Oct 2006 12:03:33 GMT
Author: hindessm
Date: Wed Oct 18 05:03:32 2006
New Revision: 465227

URL: http://svn.apache.org/viewvc?view=rev&rev=465227
Log:
Added sha checksum files to meet release requirements.

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?view=diff&rev=465227&r1=465226&r2=465227
==============================================================================
--- incubator/harmony/enhanced/trunk/build.xml (original)
+++ incubator/harmony/enhanced/trunk/build.xml Wed Oct 18 05:03:32 2006
@@ -80,7 +80,8 @@
             </tarfileset>
         </tar>
 
-        <md5sum dir="${target.dir}" file="${deploy.hdk.tar}"/>
+        <chksum dir="${target.dir}" file="${deploy.hdk.tar}" />
+        <chksum dir="${target.dir}" file="${deploy.hdk.tar}" type="sha" />
 
     </target>
 
@@ -101,7 +102,8 @@
             </zipfileset>
         </zip>
 
-        <md5sum dir="${target.dir}" file="${deploy.hdk.zip}" />
+        <chksum dir="${target.dir}" file="${deploy.hdk.zip}" />
+        <chksum dir="${target.dir}" file="${deploy.hdk.zip}" type="sha" />
     </target>
 
     <!-- ================================================================================
-->
@@ -125,7 +127,8 @@
             </tarfileset>
         </tar>
 
-        <md5sum dir="${target.dir}" file="${deploy.jre.tar}" />
+        <chksum dir="${target.dir}" file="${deploy.jre.tar}" />
+        <chksum dir="${target.dir}" file="${deploy.jre.tar}" type="sha" />
 
     </target>
 
@@ -143,7 +146,8 @@
                 <exclude name="bin/eclipse.sh"/>
             </zipfileset>
         </zip>
-        <md5sum dir="${target.dir}" file="${deploy.jre.zip}"/>
+        <chksum dir="${target.dir}" file="${deploy.jre.zip}" />
+        <chksum dir="${target.dir}" file="${deploy.jre.zip}" type="sha" />
     </target>
 
 
@@ -214,42 +218,7 @@
     <target name="build_classlib">
         <ant antfile="working_classlib/build.xml" target="fetch-depends" inheritall="false"
/>
 
-        <!-- for now, build the awt stuff specially -->
-        <antcall target="build_classlib_special_awt_deps"/>
-
-    </target>
-
-    <target name="build_classlib_special_awt_deps" depends="init,
-                                                            build_classlib_special_awt_deps_unix,
-                                                            build_classlib_special_awt_deps_win"
/>
-
-    <target name="build_classlib_special_awt_deps_unix" if="is.unix">
-        <exec executable="sh" dir="working_classlib" >
-            <arg line="depends/libs/build/fetch-awt-depends.sh"/>
-        </exec>
-
-        <ant antfile="working_classlib/build.xml" target="rebuild" inheritAll="false">
-            <property name="with.awt.swing" value="true"/>
-        </ant>
-    </target>
-
-    <target name="build_classlib_special_awt_deps_win" if="is.windows">
-
-	<echo>
-************************************************************************
-NOTE : to build, you need to have the dependencies for Swing/AWT built 
-       and installed in working_classlib.  Please see 
-         working_classlib/depends/libs/build
-       for more information
-*************************************************************************
-        </echo>
-
-        <!-- don't mention the war... -->
-        <ant antfile="working_classlib/build.xml" target="rebuild" inheritAll="false">
-            <property name="with.awt.swing" value="true"/>
-	</ant>
-
-
+        <ant antfile="working_classlib/build.xml" target="rebuild" inheritAll="false"
/>
     </target>
 
     <!-- ================================================================================
-->
@@ -479,14 +448,16 @@
     <!-- ================================================================================
-->
     <!-- produces a nicer looking checksum - taken from classlib/build.xml           
    -->
     <!-- ================================================================================
-->
-    <macrodef name="md5sum">
+    <macrodef name="chksum">
         <attribute name="dir" />
         <attribute name="file" />
         <attribute name="type" default="md5" />
         <sequential>
-            <checksum property="@{file}.@{type}" file="@{dir}/@{file}" />
+            <checksum property="@{file}.@{type}"
+                      file="@{dir}/@{file}"
+                      algorithm="@{type}" />
             <echo file="@{dir}/@{file}.@{type}"
-                  message="${@{file}.@{type}}  @{file}" />
+                  message="${@{file}.@{type}}  @{file}${line.separator}" />
         </sequential>
     </macrodef>
 



Mime
View raw message