tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r893498 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml extras.xml webapps/docs/changelog.xml
Date Wed, 23 Dec 2009 12:44:38 GMT
Author: markt
Date: Wed Dec 23 12:44:37 2009
New Revision: 893498

URL: http://svn.apache.org/viewvc?rev=893498&view=rev
Log:
Fixes for MD5 files generation.
This is the jfclere/kkolinko patch

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/dist.xml
    tomcat/tc6.0.x/trunk/extras.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=893498&r1=893497&r2=893498&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 12:44:37 2009
@@ -276,14 +276,3 @@
   http://svn.apache.org/viewvc?rev=893001&view=rev
   +1: kkolinko
   -1:
-
-* Fixes for MD5 files generation
-  http://svn.apache.org/viewvc?rev=893375&view=rev
-  http://svn.apache.org/viewvc?rev=893378&view=rev
-  +1: kkolinko
-  -1: jfclere
-  Below my proposal:
-* Fixes for MD5 files generation
-  http://people.apache.org/~jfclere/patches/patch.20091223
-  +1: jfclere, kkolinko, markt, rjung
-  -1:

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=893498&r1=893497&r2=893498&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Dec 23 12:44:37 2009
@@ -302,10 +302,9 @@
 
     <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe"
/>
 
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}.exe"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" 
-                      message="${md5sum.binary-prefix}${final.name}.exe${line.separator}"
append="true" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}.exe" />
+    </antcall>
   </target>
 
 
@@ -363,10 +362,9 @@
       </zipfileset>
     </zip>
 
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}.zip"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
-                      message="${md5sum.binary-prefix}${final.name}.zip${line.separator}"
append="true" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}.zip" />
+    </antcall>
   </target>
 
   <!-- Packages the core windows zip distros -->
@@ -392,10 +390,10 @@
       </zipfileset>
       
     </zip>
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
-                      message="${md5sum.binary-prefix}${final.name}.-windows-x86.zip${line.separator}"
append="true" />
+
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip"
/>
+    </antcall>
 
     <!-- Windows x64 package -->
     <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip">
@@ -423,10 +421,10 @@
         <include name="*.exe"/>
       </zipfileset>
     </zip>
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
-                      message="${md5sum.binary-prefix}${final.name}.-windows-x64.zip${line.separator}"
append="true" />
+
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip"
/>
+    </antcall>
 
     <!-- Windows i64 package -->
     <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip">
@@ -455,10 +453,9 @@
       </zipfileset>
     </zip>
 
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
-                      message="${md5sum.binary-prefix}${final.name}.-windows-i64.zip${line.separator}"
append="true" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip"
/>
+    </antcall>
 
   </target>
 
@@ -472,10 +469,9 @@
       <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="RELEASE-NOTES"
/>
     </zip>
 
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip.md5"
-                      message="${md5sum.binary-prefix}${final.name}-deployer.zip${line.separator}"
append="true" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip"
/>
+    </antcall>
   </target>
 
   <!-- Packages the core tar.gz distro -->
@@ -536,10 +532,9 @@
       </tarfileset>
     </tar>
 
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz.md5"
-                      message="${md5sum.binary-prefix}${final.name}.tar.gz${line.separator}"
append="true" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}.tar.gz"
/>
+    </antcall>
   </target>
 
   <!-- Packages the deployer Tomcat distro in tar.gz format -->
@@ -561,10 +556,9 @@
       </tarfileset>
     </tar>
 
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz.md5"
-                      message="${md5sum.binary-prefix}${final.name}-deployer.tar.gz${line.separator}"
append="true" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz"
/>
+    </antcall>
   </target>
 
   <!-- Packages the documentation distro in tar.gz format -->
@@ -586,10 +580,9 @@
       </tarfileset>
     </tar>
 
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz.md5"
-                      message="${md5sum.binary-prefix}${final.name}-fulldocs.tar.gz${line.separator}"
append="true" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz"
/>
+    </antcall>
   </target>
 
   <!-- Packages the source code distribution in zip format -->
@@ -598,10 +591,9 @@
       <zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
     </zip>
 
-    <checksum file="${tomcat.release}/v${version}/src/${final-src.name}.zip"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/src/${final-src.name}.zip.md5"
-                      message="${md5sum.binary-prefix}${final-src.name}.zip${line.separator}"
append="true" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/src/${final-src.name}.zip"
/>
+    </antcall>
   </target>
 
   <!-- Packages the source code distribution in tar.gz format -->
@@ -613,10 +605,19 @@
          tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
       <tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
     </tar>
-    <checksum file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz.md5"
-                      message="${md5sum.binary-prefix}${final-src.name}.tar.gz${line.separator}"
append="true" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz"
/>
+    </antcall>
   </target>
 
+  <!-- Helper target, used to create a md5 checksum file  -->
+  <!-- Requires 'file' as a parameter. -->
+  <target name="md5sum">
+    <fail unless="file" />
+    <fail if="filename" />
+    <fail if="value" />
+    <basename file="${file}" property="filename" />
+    <checksum file="${file}" property="value" />
+    <echo file="${file}.md5" message="${value}${md5sum.binary-prefix}${filename}" />
+  </target>
 </project>

Modified: tomcat/tc6.0.x/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=893498&r1=893497&r2=893498&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Dec 23 12:44:37 2009
@@ -61,6 +61,9 @@
   <property name="test.failonerror"  value="true"/>
   <property name="test.runner"       value="junit.textui.TestRunner"/>
 
+  <!-- constant to declare a file binary for md5sum -->
+  <property name="md5sum.binary-prefix" value=" *" />
+
   <!-- Can't be lower - jsp uses templates -->
   <property name="compile.source" value="1.5"/>
 
@@ -168,8 +171,9 @@
       <zipfileset file="res/META-INF/default.license"
         fullpath="META-INF/LICENSE" />
     </jar>
-    <checksum file="${tomcat-juli.jar}"
-              forceOverwrite="yes" fileext=".md5" />
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat-juli.jar}" />
+    </antcall>
 
     <jar jarfile="${tomcat-juli-adapters.jar}"
         manifest="${tomcat.tmp}/default.manifest" >
@@ -186,9 +190,9 @@
       <zipfileset file="res/META-INF/default.license"
         fullpath="META-INF/LICENSE" />
     </jar>
-    <checksum file="${tomcat-juli-adapters.jar}"
-              forceOverwrite="yes" fileext=".md5" />
-
+    <antcall target="md5sum">
+      <param name="file" value="${tomcat-juli-adapters.jar}" />
+    </antcall>
   </target>
 
   <target name="webservices">
@@ -241,9 +245,9 @@
           <zipfileset file="res/META-INF/default.license"
             fullpath="META-INF/LICENSE" />
 	    </jar>
-        <checksum file="${catalina-ws.jar}"
-              forceOverwrite="yes" fileext=".md5" />
-	
+    <antcall target="md5sum">
+      <param name="file" value="${catalina-ws.jar}" />
+    </antcall>
   </target>
 
   <target name="jmx-remote" >
@@ -258,9 +262,10 @@
       <zipfileset file="res/META-INF/default.license"
         fullpath="META-INF/LICENSE" />
     </jar>
-    <checksum file="${catalina-jmx-remote.jar}"
-        forceOverwrite="yes"
-        fileext=".md5" />
+
+    <antcall target="md5sum">
+      <param name="file" value="${catalina-jmx-remote.jar}" />
+    </antcall>
   </target>
 
   <target name="extras"
@@ -294,4 +299,14 @@
     <get src="${sourcefile}" dest="${destfile}" />
   </target>
 
+  <!-- Helper target, used to create a md5 checksum file  -->
+  <!-- Requires 'file' as a parameter. -->
+  <target name="md5sum">
+    <fail unless="file" />
+    <fail if="filename" />
+    <fail if="value" />
+    <basename file="${file}" property="filename" />
+    <checksum file="${file}" property="value" />
+    <echo file="${file}.md5" message="${value}${md5sum.binary-prefix}${filename}" />
+  </target>
 </project>

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=893498&r1=893497&r2=893498&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 23 12:44:37 2009
@@ -726,6 +726,9 @@
         Further improvements to the administrative user name and password
         handling in the Windows installer. (kkolinko)
       </update>
+      <fix>
+        Correct MD5 generation in the build process. (jfclere/kkolinko)
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message