ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r773603 - in /ant/antlibs/common/trunk: build.xml common-tasks.xml ivy.xml m2.xml
Date Mon, 11 May 2009 15:29:50 GMT
Author: bodewig
Date: Mon May 11 15:29:48 2009
New Revision: 773603

URL: http://svn.apache.org/viewvc?rev=773603&view=rev
Log:
generate SHA-512 checksums as well

Modified:
    ant/antlibs/common/trunk/build.xml
    ant/antlibs/common/trunk/common-tasks.xml
    ant/antlibs/common/trunk/ivy.xml
    ant/antlibs/common/trunk/m2.xml

Modified: ant/antlibs/common/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/build.xml?rev=773603&r1=773602&r2=773603&view=diff
==============================================================================
--- ant/antlibs/common/trunk/build.xml (original)
+++ ant/antlibs/common/trunk/build.xml Mon May 11 15:29:48 2009
@@ -17,6 +17,9 @@
 -->
 <project name="common">
 
+  <dirname property="common.basedir" file="${ant.file.common}"/>
+  <import file="${common.basedir}/common-tasks.xml"/>
+
   <target name="setup-properties">
     <property file="build.properties"/>
     <!--load in an optional file containing versions of things-->
@@ -109,8 +112,9 @@
 
   <target name="checksum-target-jar"
           description="checksum our jar" depends="antlib">
-    <checksum file="${target.jar}" algorithm="md5"/>
-    <checksum file="${target.jar}" algorithm="sha1"/>
+    <checksums>
+      <file file="${target.jar}"/>
+    </checksums>
   </target>
   
   <target name="determine-test-types">
@@ -232,7 +236,6 @@
     <copy file="${jarname}" todir="${ant.home}/lib"/>
   </target>  
 
-  <dirname property="common.basedir" file="${ant.file.common}"/>
   <import file="${common.basedir}/m2.xml"/>
   <import file="${common.basedir}/ivy.xml"/>
 
@@ -353,27 +356,19 @@
       </fileset>
       <mapper type="glob" from="*.jar" to="*-${version}.jar"/>
     </copy>
-    <checksum fileext=".md5">
-      <fileset dir="${java-repository.dir}" includes="*${version}.jar"/>
-    </checksum>
-    <checksum fileext=".sha1" algorithm="SHA">
+    <checksums>
       <fileset dir="${java-repository.dir}" includes="*${version}.jar"/>
-    </checksum-->
+    </checksums-->
 
-    <checksum fileext=".md5">
-      <fileset dir="${dist.base.binaries}/">
-        <include name="**/*"/>
-        <exclude name="**/*.asc"/>
-        <exclude name="**/*.md5"/>
-      </fileset>
-    </checksum>
-    <checksum fileext=".sha1" algorithm="SHA">
+    <checksums>
       <fileset dir="${dist.base.binaries}/">
         <include name="**/*"/>
         <exclude name="**/*.asc"/>
         <exclude name="**/*.md5"/>
+        <exclude name="**/*.sha1"/>
+        <exclude name="**/*.sha512"/>
       </fileset>
-    </checksum>
+    </checksums>
 
     <delete dir="${dist.name}"/>
     <antcall target="src-dist" inheritall="false">
@@ -397,20 +392,15 @@
       src="${dist.base.source}/${dist.name}-src.tar"/>
     <delete file="${dist.base.source}/${dist.name}-src.tar"/>
     <delete dir="${dist.name}"/>
-    <checksum fileext=".md5">
-      <fileset dir="${dist.base.source}/">
-        <include name="**/*"/>
-        <exclude name="**/*.asc"/>
-        <exclude name="**/*.md5"/>
-      </fileset>
-    </checksum>
-    <checksum fileext=".sha1" algorithm="SHA">
+    <checksums>
       <fileset dir="${dist.base.source}/">
         <include name="**/*"/>
         <exclude name="**/*.asc"/>
         <exclude name="**/*.md5"/>
+        <exclude name="**/*.sha1"/>
+        <exclude name="**/*.sha512"/>
       </fileset>
-    </checksum>
+    </checksums>
   </target>
 
   <target name="check-contributors">

Modified: ant/antlibs/common/trunk/common-tasks.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/common-tasks.xml?rev=773603&r1=773602&r2=773603&view=diff
==============================================================================
--- ant/antlibs/common/trunk/common-tasks.xml (original)
+++ ant/antlibs/common/trunk/common-tasks.xml Mon May 11 15:29:48 2009
@@ -26,4 +26,20 @@
       </filterchain>
     </copy>
   </presetdef>
+
+  <!-- create checksums -->
+  <macrodef name="checksums">
+    <element name="resources" implicit="true"/>
+    <sequential>
+      <checksum algorithm="md5">
+        <resources/>
+      </checksum>
+      <checksum algorithm="sha1">
+        <resources/>
+      </checksum>
+      <checksum fileext=".sha512" algorithm="sha-512">
+        <resources/>
+      </checksum>
+    </sequential>
+  </macrodef>
 </project>

Modified: ant/antlibs/common/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/ivy.xml?rev=773603&r1=773602&r2=773603&view=diff
==============================================================================
--- ant/antlibs/common/trunk/ivy.xml (original)
+++ ant/antlibs/common/trunk/ivy.xml Mon May 11 15:29:48 2009
@@ -72,8 +72,9 @@
   </target>
 
   <target name="ivy.xml" depends="copy-ivy.xml,make-ivy.xml">
-    <checksum file="${target.ivy.xml}" algorithm="md5"/>
-    <checksum file="${target.ivy.xml}" algorithm="sha1"/>
+    <checksums>
+      <file file="${target.ivy.xml}"/>
+    </checksums>
   </target>
 
-</project>
\ No newline at end of file
+</project>

Modified: ant/antlibs/common/trunk/m2.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/m2.xml?rev=773603&r1=773602&r2=773603&view=diff
==============================================================================
--- ant/antlibs/common/trunk/m2.xml (original)
+++ ant/antlibs/common/trunk/m2.xml Mon May 11 15:29:48 2009
@@ -66,8 +66,9 @@
   </target>
 
   <target name="m2-pom" depends="m2-copy-pom,m2-make-pom">
-    <checksum file="${target.pom}" algorithm="md5"/>
-    <checksum file="${target.pom}" algorithm="sha1"/>
+    <checksums>
+      <file file="${target.pom}"/>
+    </checksums>
   </target>
 
-</project>
\ No newline at end of file
+</project>



Mime
View raw message