You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/08/30 11:05:02 UTC
svn commit: r571079 - in /harmony/enhanced/classlib/trunk/make:
build-java.xml depends.xml
Author: hindessm
Date: Thu Aug 30 02:05:01 2007
New Revision: 571079
URL: http://svn.apache.org/viewvc?rev=571079&view=rev
Log:
Move unzipping of xerces.zip "back" to the check-depends phase and
only do it once.
Modified:
harmony/enhanced/classlib/trunk/make/build-java.xml
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=571079&r1=571078&r2=571079&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Thu Aug 30 02:05:01 2007
@@ -217,6 +217,7 @@
<patternset includes="icu4jni_3.4/*.jar" />
<patternset includes="mx4j_3.0.2/*.jar" />
<patternset includes="xalan-j_2.7.0/*.jar" />
+ <patternset includes="xerces_2.9.0/*.jar" />
<patternset includes="yoko_M2-20070130/yoko-rmi-spec.jar" />
<patternset includes="yoko_M2-20070130/yoko-rmi-impl.jar" />
<patternset includes="yoko_M2-20070130/yoko.jar" />
@@ -224,20 +225,6 @@
</fileset>
<fileset dir="${depends.manifests}"/>
</copy>
-
- <!-- Unzip xerces jars -->
- <mkdir dir="${hy.jdk}/jre/lib/boot/xerces-2_9_0" />
- <unzip src="${depends.jars}/xerces_2.9.0/xerces.zip"
- dest="${hy.jdk}/jre/lib/boot" >
- <patternset>
- <include name="xerces-2_9_0/resolver.jar" />
- <include name="xerces-2_9_0/xercesImpl.jar" />
- <include name="xerces-2_9_0/xml-apis.jar" />
- </patternset>
- </unzip>
- <move todir="${hy.jdk}/jre/lib/boot/xerces_2.9.0">
- <fileset dir="${hy.jdk}/jre/lib/boot/xerces-2_9_0"/>
- </move>
<!-- Copy across the extension dependency jars -->
<copy todir="${hy.jdk}/jre/lib/ext" flatten="yes" overwrite="true">
Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=571079&r1=571078&r2=571079&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Thu Aug 30 02:05:01 2007
@@ -97,7 +97,7 @@
</target>
<target name="-extract"
- depends="-extract-props,-really-extract-mx4j,-really-extract-dejavu-fonts" />
+ depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces" />
<target name="-extract-props">
<uptodate property="dejavu-fonts.uptodate"
@@ -106,13 +106,16 @@
<uptodate property="mx4j.uptodate"
srcfile="${mx4j.zip}"
targetfile="${mx4j.jar}" />
+ <uptodate property="xerces.uptodate"
+ srcfile="${xerces.zip}"
+ targetfile="${xerces.dir}/xercesImpl.jar" />
</target>
- <target name="-really-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
+ <target name="-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
<unzip src="${dejavu-fonts.zip}" dest="${dejavu-fonts.dir}" />
</target>
- <target name="-really-extract-mx4j" unless="mx4j.uptodate">
+ <target name="-extract-mx4j" unless="mx4j.uptodate">
<!-- This doesn't work for me since my ant doesn't support
mapper in unzip.
@@ -134,6 +137,18 @@
</fileset>
</copy>
<delete dir="${mx4j.dir}.tmp" />
+ </target>
+
+ <target name="-extract-xerces" unless="xerces.uptodate">
+ <unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
+ <copy todir="${xerces.dir}" flatten="yes">
+ <fileset dir="${xerces.dir}.tmp/xerces-2_9_0">
+ <include name="resolver.jar" />
+ <include name="xercesImpl.jar" />
+ <include name="xml-apis.jar" />
+ </fileset>
+ </copy>
+ <delete dir="${xerces.dir}.tmp" />
</target>
<!--