svn commit: r662754 - /xmlgraphics/commons/branches/commons-1_3_1/build.xml

[je...@apache.org]

Author: jeremias
Date: Tue Jun  3 04:52:42 2008
New Revision: 662754

URL: http://svn.apache.org/viewvc?rev=662754&view=rev
Log:
Merge changes in 1.3 branch into 1.3.1 branch. Revisions: 633116, 633128.

Modified:
    xmlgraphics/commons/branches/commons-1_3_1/build.xml

Modified: xmlgraphics/commons/branches/commons-1_3_1/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/commons-1_3_1/build.xml?rev=662754&r1=662753&r2=662754&view=diff
==============================================================================
--- xmlgraphics/commons/branches/commons-1_3_1/build.xml (original)
+++ xmlgraphics/commons/branches/commons-1_3_1/build.xml Tue Jun  3 04:52:42 2008
@@ -89,6 +89,7 @@
   <fileset dir="${basedir}" id="dist.bin.lib">
     <patternset id="dist.lib">
       <include name="lib/commons-io*"/>
+      <include name="lib/commons-logging*"/>
       <include name="lib/README*"/>
     </patternset>
   </fileset>
@@ -556,7 +557,8 @@
     <mkdir dir="${dist.bin.result.dir}/build"/>
     <copy todir="${dist.bin.result.dir}/build" file="build/${name}-${version}.jar"/>
 
-    <property name="bin.suffix" value="bin-jdk${java.specification.version}"/>
+    <!--property name="bin.suffix" value="bin-jdk${java.specification.version}"/-->
+    <property name="bin.suffix" value="bin"/>
     <zip zipfile="${name}-${version}-${bin.suffix}.zip" basedir="${dist.bin.dir}" includes="**"/>
     <tar longfile="gnu"
          destfile="${name}-${version}-${bin.suffix}.tar">
@@ -591,7 +593,8 @@
   </target>
 
   <target name="release-dist" depends="dist" description="Generates the distribution package and signs the release">
-    <property name="bin.suffix" value="bin-jdk${java.specification.version}"/>
+    <!--property name="bin.suffix" value="bin-jdk${java.specification.version}"/-->
+    <property name="bin.suffix" value="bin"/>
     <input message="Passphrase for your default private key (attention: passphrase will be echoed in clear text on the display!)" addproperty="pwd"/>
     <antcall target="md5">
       <param name="sign.archive" value="${name}-${version}-src.zip"/>
@@ -624,8 +627,8 @@
   </target>
 
   <target name="md5">
-    <property name="md5.exec" value="md5"/>
-    <property name="md5.options" value="-q"/>
+    <property name="md5.exec" value="md5sum"/>
+    <property name="md5.options" value=""/>
     <exec executable="${md5.exec}" output="${sign.archive}.md5">
       <arg line="${md5.options} ${sign.archive}"/>
     </exec>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org