harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r769746 - in /harmony/enhanced/classlib/trunk/make: build-java.xml depends.properties depends.xml
Date Wed, 29 Apr 2009 11:05:21 GMT
Author: hindessm
Date: Wed Apr 29 11:05:20 2009
New Revision: 769746

URL: http://svn.apache.org/viewvc?rev=769746&view=rev
Log:
Move the editing of the xalan.jar so it happens once per download rather
than every build.  I made a subtle change - removing 'usetimestamp="true"' -
from the <get>.  This was to avoid everyone having to do:
  mv depends/jars/xalan-j_2.7.0/xalan.jar \
     depends/jars/xalan-j_2.7.0/xalan.orig.jar

Not sure why this attribute was on the <get> but it could be put back if
necessary.

Modified:
    harmony/enhanced/classlib/trunk/make/build-java.xml
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml

Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=769746&r1=769745&r2=769746&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Wed Apr 29 11:05:20 2009
@@ -205,7 +205,7 @@
                 <patternset includes="asm-3.1/*.jar" />
                 <patternset includes="icu4j_4.0/*.jar" />
                 <patternset includes="mx4j_3.0.2/*.jar" />
-                <patternset includes="xalan-j_2.7.0/*.jar" />
+                <patternset includes="xalan-j_2.7.0/xalan.jar" />
                 <patternset includes="xerces_2.9.1/*.jar" />
                 <patternset includes="yoko-1.0/yoko-rmi-spec.jar" />
                 <patternset includes="yoko-1.0/yoko-rmi-impl.jar" />
@@ -215,12 +215,6 @@
             <fileset dir="${depends.manifests}"/>
         </copy>
 
-        <unjar src="${hy.jdk}/jre/lib/boot/xalan-j_2.7.0/xalan.jar" dest="${hy.jdk}/jre/lib/boot/xalan-j_2.7.0.tmp"/>
-        <delete file="${hy.jdk}/jre/lib/boot/xalan-j_2.7.0/xalan.jar"/>
-        <replace file="${hy.jdk}/jre/lib/boot/xalan-j_2.7.0.tmp/META-INF/MANIFEST.MF"
token="Class-Path: xercesImpl.jar xml-apis.jar serializer.jar" value="" />
-        <jar destfile="${hy.jdk}/jre/lib/boot/xalan-j_2.7.0/xalan.jar" basedir="${hy.jdk}/jre/lib/boot/xalan-j_2.7.0.tmp"
manifest="${hy.jdk}/jre/lib/boot/xalan-j_2.7.0.tmp/META-INF/MANIFEST.MF"/>
-        <delete dir="${hy.jdk}/jre/lib/boot/xalan-j_2.7.0.tmp" />
-
         <!-- Copy across the extension dependency jars -->
         <copy tofile="${hy.jdk}/jre/lib/ext/bcprov.jar" verbose="true"
               flatten="yes" overwrite="true">

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=769746&r1=769745&r2=769746&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Wed Apr 29 11:05:20 2009
@@ -19,6 +19,7 @@
 sf.base=http://internap.dl.sourceforge.net/sourceforge
 
 xalan.dir=${depends.jars}/xalan-j_2.7.0
+xalan.orig.jar=${xalan.dir}/xalan.orig.jar
 xalan.jar=${xalan.dir}/xalan.jar
 xalan.url=${maven2.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
 xalan.md5=a018d032c21a873225e702b36b171a10

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=769746&r1=769745&r2=769746&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Wed Apr 29 11:05:20 2009
@@ -46,7 +46,7 @@
         <check-one-file src="${yoko-rmi-impl.url}" dest="${yoko-rmi-impl.jar}" />
         <check-one-file src="${yoko-rmi-spec.url}" dest="${yoko-rmi-spec.jar}" />
         <check-one-file src="${bcel.url}" dest="${bcel.jar}" />
-        <check-one-file src="${xalan.url}" dest="${xalan.jar}" />
+        <check-one-file src="${xalan.url}" dest="${xalan.orig.jar}" />
         <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
         <check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
@@ -76,7 +76,7 @@
     </target>
 
     <target name="-extract"
-         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces" />
+         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-fix-xalan-manifest"
/>
 
     <target name="-extract-props">
         <uptodate property="dejavu-fonts.uptodate"
@@ -88,6 +88,9 @@
         <uptodate property="xerces.uptodate"
                   srcfile="${xerces.zip}"
                   targetfile="${xerces.dir}/xercesImpl.jar" />
+        <uptodate property="xalan.uptodate"
+                  srcfile="${xalan.orig.jar}"
+                  targetfile="${xalan.jar}" />
     </target>
 
 
@@ -134,6 +137,17 @@
 	<touch file="${xerces.dir}/xercesImpl.jar" />
     </target>
 
+    <target name="-fix-xalan-manifest" unless="xalan.uptodate">
+        <unjar src="${xalan.orig.jar}" dest="${xalan.dir}.tmp" />
+        <delete file="${xalan.jar}" />
+        <replace file="${xalan.dir}.tmp/META-INF/MANIFEST.MF"
+                 token="Class-Path: xercesImpl.jar xml-apis.jar serializer.jar"
+                 value="" />
+        <jar destfile="${xalan.jar}" basedir="${xalan.dir}.tmp"
+             manifest="${xalan.dir}.tmp/META-INF/MANIFEST.MF" />
+        <delete dir="${xalan.dir}.tmp" />
+    </target>
+
     <target name="-check-unix" if="is.unix">
         
         <property name="lcms.msg"
@@ -186,7 +200,7 @@
                            md5="${bcel.md5}" />
 
     <mkdir dir="${xalan.dir}" />
-    <download-one-file src="${xalan.url}" dest="${xalan.jar}"
+    <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
                            md5="${xalan.md5}" />
 
     <mkdir dir="${xerces.dir}" />
@@ -296,7 +310,7 @@
 
     <target name="-really-download" unless="${dest}.exists">
         <echo>Fetching ${dest}</echo>
-    <get src="${src}" dest="${dest}" usetimestamp="true" verbose="true" />
+        <get src="${src}" dest="${dest}" verbose="true" />
     </target>
 
     <target name="-remove-file-if-bad" unless="${dest}.md5.verified">



Mime
View raw message