harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r965757 - in /harmony/enhanced/java/trunk/classlib: ./ depends/manifests/xalan-j_2.7.0/ depends/manifests/xerces_2.10.0/ make/ modules/xml/ modules/xml/depends/ modules/xml/depends/manifests/ modules/xml/depends/manifests/xalan-j_2.7.0/ mod...
Date Tue, 20 Jul 2010 08:40:22 GMT
Author: hindessm
Date: Tue Jul 20 08:40:21 2010
New Revision: 965757

URL: http://svn.apache.org/viewvc?rev=965757&view=rev
Log:
Move xml dependencies to module.

Added:
    harmony/enhanced/java/trunk/classlib/modules/xml/
    harmony/enhanced/java/trunk/classlib/modules/xml/build.xml   (with props)
    harmony/enhanced/java/trunk/classlib/modules/xml/depends/
    harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/
    harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/
      - copied from r964807, harmony/enhanced/java/trunk/classlib/depends/manifests/xalan-j_2.7.0/
    harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.10.0/
      - copied from r964807, harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.10.0/
    harmony/enhanced/java/trunk/classlib/modules/xml/make/
    harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties   (with props)
Removed:
    harmony/enhanced/java/trunk/classlib/depends/manifests/xalan-j_2.7.0/
    harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.10.0/
Modified:
    harmony/enhanced/java/trunk/classlib/build.xml
    harmony/enhanced/java/trunk/classlib/make/depends.xml

Modified: harmony/enhanced/java/trunk/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/build.xml?rev=965757&r1=965756&r2=965757&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/build.xml Tue Jul 20 08:40:21 2010
@@ -201,8 +201,6 @@ module:
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
                 <patternset includes="icu4j_4.2.1/*.jar" />
-                <patternset includes="xalan-j_2.7.0/xalan.jar" />
-                <patternset includes="xerces_2.10.0/*.jar" />
             </fileset>
             <fileset dir="${depends.manifests}"/>
         </copy>

Modified: harmony/enhanced/java/trunk/classlib/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/depends.xml?rev=965757&r1=965756&r2=965757&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/depends.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/depends.xml Tue Jul 20 08:40:21 2010
@@ -34,8 +34,6 @@
             depends="-check,-check-win,-extract" />
 
     <target name="-check">
-        <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="${hamcrest-library.url}" dest="${hamcrest-library.jar}" />
         <check-one-file src="${findbugs.url}" dest="${findbugs.zip}" />
@@ -54,45 +52,14 @@
         <check-one-file src="${msvcp.url}" dest="${msvcp.dll}" />
     </target>
 
-    <target name="-extract"
-         depends="-extract-props,-extract-xerces,-fix-xalan-manifest,-extract-findbugs" />
+    <target name="-extract" depends="-extract-props,-extract-findbugs" />
 
     <target name="-extract-props">
-        <uptodate property="xerces.uptodate"
-                  srcfile="${xerces.zip}"
-                  targetfile="${xerces.dir}/xercesImpl.jar" />
-        <uptodate property="xalan.uptodate"
-                  srcfile="${xalan.orig.jar}"
-                  targetfile="${xalan.jar}" />
         <uptodate property="findbugs.uptodate"
                   srcfile="${findbugs.zip}"
                   targetfile="${findbugs.dir}/uptodate" />
     </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_10_0">
-                <include name="resolver.jar" />
-		<include name="xercesImpl.jar" />
-		<include name="xml-apis.jar" />
-            </fileset>
-        </copy>
-        <delete dir="${xerces.dir}.tmp" />
-	<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="-extract-findbugs" unless="findbugs.uptodate">
         <!-- Note that FindBugs contains a top level dir name -->
         <unzip src="${findbugs.zip}" dest="${findbugs.dir}/.." />
@@ -104,14 +71,6 @@
 
     <target name="-download">
 
-        <mkdir dir="${xalan.dir}" />
-        <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
-                           md5="${xalan.md5}" />
-
-        <mkdir dir="${xerces.dir}" />
-        <download-one-file src="${xerces.url}" dest="${xerces.zip}"
-                           md5="${xerces.md5}" />
-
         <mkdir dir="${junit.dir}" />
         <download-one-file src="${junit.url}" dest="${junit.jar}"
                            md5="${junit.md5}" />

Added: harmony/enhanced/java/trunk/classlib/modules/xml/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/xml/build.xml?rev=965757&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/xml/build.xml (added)
+++ harmony/enhanced/java/trunk/classlib/modules/xml/build.xml Tue Jul 20 08:40:21 2010
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<project name="XML Build" default="build" basedir=".">
+    <description>Build for XML component</description>
+
+    <property name="hy.module" value="xml" />
+    <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
+
+    <target name="build" depends="check-depends"/>
+    <target name="clean" depends="-clean-java" />
+    <target name="check-depends" depends="-check,-extract,-copy-jars" />
+
+    <target name="-extract"
+            depends="-extract-props,-extract-xerces,-fix-xalan-manifest"/>
+
+    <target name="-check">
+        <check-one-file src="${xalan.url}" dest="${xalan.orig.jar}" />
+        <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
+    </target>
+
+    <target name="-extract-props">
+        <uptodate property="xerces.uptodate"
+                  srcfile="${xerces.zip}"
+                  targetfile="${xerces.dir}/xercesImpl.jar" />
+        <uptodate property="xalan.uptodate"
+                  srcfile="${xalan.orig.jar}"
+                  targetfile="${xalan.jar}" />
+    </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_10_0">
+                <include name="resolver.jar" />
+		<include name="xercesImpl.jar" />
+		<include name="xml-apis.jar" />
+            </fileset>
+        </copy>
+        <delete dir="${xerces.dir}.tmp" />
+	<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="fetch-depends">
+
+        <mkdir dir="${xalan.dir}" />
+        <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
+                           md5="${xalan.md5}" />
+
+        <mkdir dir="${xerces.dir}" />
+        <download-one-file src="${xerces.url}" dest="${xerces.zip}"
+                           md5="${xerces.md5}" />
+    </target>
+
+    <target name="-copy-jars" unless="skip.java.build">
+        <copy todir="${hy.jdk}/jre/lib/boot">
+            <fileset dir="${depends.jars}">
+                <patternset includes="${xalan.base}/xalan.jar" />
+                <patternset includes="${xerces.base}/*.jar" />
+            </fileset>
+            <fileset dir="depends/manifests"/>
+        </copy>
+    </target>
+
+    <target name="test" />
+
+    <target name="-clean-java" unless="skip.java.build">
+        <delete dir="${hy.jdk}/jre/lib/boot/${xalan.base}" />
+        <delete dir="${hy.jdk}/jre/lib/boot/${xerces.base}" />
+    </target>
+
+</project>

Propchange: harmony/enhanced/java/trunk/classlib/modules/xml/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties?rev=965757&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties (added)
+++ harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties Tue Jul 20 08:40:21
2010
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+depends.jars=${depends.dir}/jars
+
+xalan.version=2.7.0
+xalan.base=xalan-j_${xalan.version}
+xalan.dir=${depends.jars}/${xalan.base}
+xalan.orig.jar=${xalan.dir}/xalan.orig.jar
+xalan.jar=${xalan.dir}/xalan.jar
+xalan.url=${maven2.base}/xalan/xalan/${xalan.version}/xalan-${xalan.version}.jar
+xalan.md5=a018d032c21a873225e702b36b171a10
+
+xerces.version=2.10.0
+xerces.base=xerces_${xerces.version}
+xerces.dir=${depends.jars}/${xerces.base}
+xerces.zip=${xerces.dir}/xerces.zip
+xerces.url=http://www.apache.org/dist/xerces/j/Xerces-J-bin.${xerces.version}.zip
+xerces.md5=8da14a7b2848eff131b7cc10668887e8

Propchange: harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message