harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r552639 - in /harmony/enhanced: classlib/trunk/make/depends.properties common_resources/build/depends.properties common_resources/build/depends.xml jdktools/trunk/make/depends.properties
Date Tue, 03 Jul 2007 01:39:55 GMT
Author: ndbeyer
Date: Mon Jul  2 18:39:54 2007
New Revision: 552639

URL: http://svn.apache.org/viewvc?view=rev&rev=552639
Log:
Update Eclipse dependencies to v3.3 (final)
Synchronize common_resources depends.properties and depends.xml with classlib's version

Modified:
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/common_resources/build/depends.properties
    harmony/enhanced/common_resources/build/depends.xml
    harmony/enhanced/jdktools/trunk/make/depends.properties

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?view=diff&rev=552639&r1=552638&r2=552639
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Mon Jul  2 18:39:54 2007
@@ -15,12 +15,12 @@
 
 depends.dir=depends
 depends.jars=${depends.dir}/jars
-mirror.base=http://mirrors.ibiblio.org/pub/mirrors/maven2
+maven2.base=http://repo1.maven.org/maven2
 sf.base=http://internap.dl.sourceforge.net/sourceforge
 
 xalan.dir=${depends.jars}/xalan-j_2.7.0
 xalan.jar=${xalan.dir}/xalan.jar
-xalan.url=${mirror.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
+xalan.url=${maven2.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
 xalan.md5=a018d032c21a873225e702b36b171a10
 
 xerces.dir=${depends.jars}/xerces_2.9.0
@@ -30,7 +30,7 @@
 
 junit.dir=${depends.jars}/junit_3.8.2
 junit.jar=${junit.dir}/junit.jar
-junit.url=${mirror.base}/junit/junit/3.8.2/junit-3.8.2.jar
+junit.url=${maven2.base}/junit/junit/3.8.2/junit-3.8.2.jar
 junit.md5=28e7eb9eeefe31a657c68755bfccc541
 
 bcprov.dir=${depends.jars}/bcprov-jdk15-136
@@ -51,12 +51,11 @@
 msvcr.dll.x86_64=${msvcr.dir.x86_64}/msvcr80.dll
 msvcr.dll.file.x86_64=msvcr80.dll
 msvcr.url.x86_64=file:///${hyenv.SystemRoot}/system32/msvcr80.dll
-#msvcr.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll
 msvcr.md5.x86_64=465cebd7da2ceaba5e552fc9118a1415
 
 icu4j.dir=${depends.jars}/icu4j_3.4.4
 icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
-icu4j.url=${mirror.base}/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
+icu4j.url=${maven2.base}/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
 icu4j.md5=92422a9465ccc608bc7a8ae9cf594509
 
 mx4j.dir=${depends.jars}/mx4j_3.0.2
@@ -86,25 +85,24 @@
 yoko-rmi-spec.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi-spec/1.0-incubating-M2-SNAPSHOT/yoko-rmi-spec-1.0-incubating-M2-20070130.104323-6.jar
 yoko-rmi-spec.md5=532438a96cbb6948c37f0f7650aa1d5e
 
-
 # bcel is needed by yoko-rmi
 bcel.dir=${depends.jars}/bcel-5.2
 bcel.jar=${bcel.dir}/bcel-5.2.jar
-bcel.url=${mirror.base}/org/apache/bcel/bcel/5.2/bcel-5.2.jar
+bcel.url=${maven2.base}/org/apache/bcel/bcel/5.2/bcel-5.2.jar
 bcel.md5=43d54687362fc2991d61201c453a8286
 
 jetty.dir=${depends.jars}/jetty
 jetty.jar=${jetty.dir}/jetty-6.0.0.jar
 jetty.md5=930507973c9ad19a874af06f10be7223
-jetty.url=${mirror.base}/jetty/jetty/6.0.0/jetty-6.0.0.jar
+jetty.url=${maven2.base}/jetty/jetty/6.0.0/jetty-6.0.0.jar
 
 jetty-util.jar=${jetty.dir}/jetty-util-6.0.0.jar
 jetty-util.md5=7cf65d83814718afdd1d3bd74f8799fc
-jetty-util.url=${mirror.base}/jetty/jetty-util/6.0.0/jetty-util-6.0.0.jar
+jetty-util.url=${maven2.base}/jetty/jetty-util/6.0.0/jetty-util-6.0.0.jar
 
 servlet-api.jar=${jetty.dir}/servlet-api-2.5-6.0.0.jar
 servlet-api.md5=c27c02fb0a00cc3a7d05ea993a9bf56e
-servlet-api.url=${mirror.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
+servlet-api.url=${maven2.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
 
 awtdeps.base.x86=http://people.apache.org/~geirm/harmony/
 awtdeps.dir.x86=${depends.dir}/libs/windows.x86
@@ -121,5 +119,4 @@
 awtdeps.md5.x86_64=f2bbb1f4f23100393783fd02a77fcc68
 awtdeps.extract.dir.x86_64=${depends.dir}/libs/build
 awtdeps.testfile.x86_64=${awtdeps.extract.dir.x86_64}/win64_2007-02-08.txt
-
 

Modified: harmony/enhanced/common_resources/build/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/build/depends.properties?view=diff&rev=552639&r1=552638&r2=552639
==============================================================================
--- harmony/enhanced/common_resources/build/depends.properties (original)
+++ harmony/enhanced/common_resources/build/depends.properties Mon Jul  2 18:39:54 2007
@@ -15,43 +15,38 @@
 
 depends.dir=depends
 depends.jars=${depends.dir}/jars
-ibiblio.base=http://www.ibiblio.org
+maven2.base=http://repo1.maven.org/maven2
+eclipse.base=http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500
+sf.base=http://internap.dl.sourceforge.net/sourceforge
 
 xalan.dir=${depends.jars}/xalan-j_2.7.0
 xalan.jar=${xalan.dir}/xalan.jar
-xalan.url=${ibiblio.base}/maven/xalan/jars/xalan-2.7.0.jar
+xalan.url=${maven2.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
 xalan.md5=a018d032c21a873225e702b36b171a10
 
-xerces.dir=${depends.jars}/xerces_2.8.0
-resolver.jar=${xerces.dir}/resolver.jar
-resolver.url=${ibiblio.base}/maven/xml-resolver/jars/xml-resolver-1.1.jar
-resolver.md5=39546d6a7f9cf0fd971874d43214dbe4
-
-xerces.impl.jar=${xerces.dir}/xercesImpl.jar
-xerces.impl.url=${ibiblio.base}/maven/xerces/jars/xercesImpl-2.8.0.jar
-xerces.impl.md5=7eb2db331a62e74744ab79aab5b454bd
-
-xml.apis.jar=${xerces.dir}/xml-apis.jar
-xml.apis.url=${ibiblio.base}/maven/xml-apis/jars/xml-apis-1.3.03.jar
-xml.apis.md5=6dee9238dd2900171197104951940778
+xerces.dir=${depends.jars}/xerces_2.9.0
+xerces.zip=${xerces.dir}/xerces.zip
+xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.0.zip
+xerces.md5=a3aece3feb68be6d319072b85ad06023
 
 junit.dir=${depends.jars}/junit_3.8.2
 junit.jar=${junit.dir}/junit.jar
-junit.url=${ibiblio.base}/maven2/junit/junit/3.8.2/junit-3.8.2.jar
+junit.url=${maven2.base}/junit/junit/3.8.2/junit-3.8.2.jar
 junit.md5=28e7eb9eeefe31a657c68755bfccc541
 
-# will the next person to update bcprov.jar please remove the "signed."
-# prefix from the bcprov.jar property
-bcprov.dir=${depends.jars}/bcprov-jdk14-134
-bcprov.jar=${bcprov.dir}/signed.bcprov.jar
-bcprov.md5=dac389845d499bfa901f30bbe63250d1
-bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk14-134.jar
+bcprov.dir=${depends.jars}/bcprov-jdk15-136
+bcprov.jar=${bcprov.dir}/bcprov.jar
+bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk15-136.jar
+bcprov.md5=30c42e406de583a09cbf7124f7dae5ed
 
 msvcr.dir.x86=${depends.dir}/libs/windows.x86
 msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
 msvcr.dll.file.x86=msvcr71.dll
 msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
-msvcr.md5.x86=86f1895ae8c5e8b17d99ece768a70732
+# This is the md5 hash for the VS2003 version, 7.10.3052.4
+msvcr_VS2003.md5.x86=86f1895ae8c5e8b17d99ece768a70732
+# This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
+msvcr_VS2003SP1.md5.x86=ca2f560921b7b8be1cf555a5a18d54c3
 
 msvcr.dir.x86_64=${depends.dir}/libs/windows.x86_64
 msvcr.dll.x86_64=${msvcr.dir.x86_64}/msvcr80.dll
@@ -61,51 +56,75 @@
 
 icu4j.dir=${depends.jars}/icu4j_3.4.4
 icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
-icu4j.url=${ibiblio.base}/maven2/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
+icu4j.url=${maven2.base}/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
 icu4j.md5=92422a9465ccc608bc7a8ae9cf594509
 
-ecj.dir=${depends.jars}/ecj_3.2
-ecj.jar=${ecj.dir}/ecj_3.2.jar
-ecj.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/ecj.jar
-ecj.md5=633e14a4dc14ca578b5548c3c088172f
-
-mx4j.dir=${depends.jars}/mx4j_3.0.1
+ecj.dir=${depends.jars}/ecj_3.3
+ecj.jar=${ecj.dir}/ecj_3.3.jar
+ecj.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/ecj.jar
+ecj.md5=412d8badd227807ef2f52608435240fb
+
+icu.dir=${depends.jars}/com.ibm.icu.base-3.3
+icu.zip=${icu.dir}/com.ibm.icu.base-3.3.zip
+icu.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/com.ibm.icu.base-3.3.zip
+icu.md5=5b8a0fc0e48431d376c7efd7be8c0f7b
+icu.jar.name=com.ibm.icu.base_3.6.1.v20070417.jar
+icu.jar=${icu.dir}/${icu.jar.name}
+
+jdt.dir=${depends.jars}/eclipse-JDT-3.3
+jdt.zip=${jdt.dir}/eclipse-JDT-3.3.zip
+jdt.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-JDT-3.3.zip
+jdt.md5=7a82530972e2943a2f20cb6d3bffe0d6
+jdt.jdi.jar.name=jdi.jar
+jdt.jdi.jar=${jdt.dir}/${jdt.jdi.jar.name}
+jdt.jdimodel.jar.name=jdimodel.jar
+jdt.jdimodel.jar=${jdt.dir}/${jdt.jdimodel.jar.name}
+
+mx4j.dir=${depends.jars}/mx4j_3.0.2
+mx4j.zip=${mx4j.dir}/mx4j.zip
+mx4j.url=${sf.base}/mx4j/mx4j-3.0.2.zip
+mx4j.md5=443bd83ee36414de4b8fc5722b038b02
 mx4j.jar=${mx4j.dir}/mx4j.jar
-mx4j.url=${ibiblio.base}/maven/mx4j/jars/mx4j-3.0.1.jar
-mx4j.md5=7a8675e26ee20f997ad4f54091e9b7a5
-
 mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
-mx4j.remote.url=${ibiblio.base}/maven/mx4j/jars/mx4j-remote-3.0.1.jar
-mx4j.remote.md5=bacb72e0fcad4259825c7cac1a0efe43
 
-yoko.dir=${depends.jars}/yoko_M1-20061027
+yoko.dir=${depends.jars}/yoko_M2-20070130
 yoko.jar=${yoko.dir}/yoko.jar
-yoko.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-spec-corba/1.0-incubating-M1-SNAPSHOT/yoko-spec-corba-1.0-incubating-M1-20061027.123852-2.jar
-yoko.md5=4725194d89a8451ab27a92545983789d
+yoko.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-spec-corba/1.0-incubating-M2-SNAPSHOT/yoko-spec-corba-1.0-incubating-M2-20070130.104323-7.jar
+yoko.md5=d59e36ee960a53f4f75e14db3dc483ca
 
-yoko-rmi.dir=${depends.jars}/yoko_M1-20061027
-yoko-rmi.jar=${yoko-rmi.dir}/yoko-rmi.jar
-yoko-rmi.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi/1.0-incubating-M1-SNAPSHOT/yoko-rmi-1.0-incubating-M1-20061027.123852-2.jar
-yoko-rmi.md5=399402d33a0efed38539100727db2779
+yoko-core.dir=${depends.jars}/yoko_M2-20070130
+yoko-core.jar=${yoko.dir}/yoko-core.jar
+yoko-core.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-core/1.0-incubating-M2-SNAPSHOT/yoko-core-1.0-incubating-M2-20070130.104323-5.jar
+yoko-core.md5=f68c368999daab6857900a74d8a1ac04
+
+yoko-rmi-impl.dir=${depends.jars}/yoko_M2-20070130
+yoko-rmi-impl.jar=${yoko-rmi-impl.dir}/yoko-rmi-impl.jar
+yoko-rmi-impl.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi-impl/1.0-incubating-M2-SNAPSHOT/yoko-rmi-impl-1.0-incubating-M2-20070130.104323-5.jar
+yoko-rmi-impl.md5=2a0cecb7d2b0567ad1758e43df67efce
+
+yoko-rmi-spec.dir=${depends.jars}/yoko_M2-20070130
+yoko-rmi-spec.jar=${yoko-rmi-spec.dir}/yoko-rmi-spec.jar
+yoko-rmi-spec.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi-spec/1.0-incubating-M2-SNAPSHOT/yoko-rmi-spec-1.0-incubating-M2-20070130.104323-6.jar
+yoko-rmi-spec.md5=532438a96cbb6948c37f0f7650aa1d5e
 
 # bcel is needed by yoko-rmi
 bcel.dir=${depends.jars}/bcel-5.2
 bcel.jar=${bcel.dir}/bcel-5.2.jar
-bcel.url=${ibiblio.base}/maven2/org/apache/bcel/bcel/5.2/bcel-5.2.jar
+bcel.url=${maven2.base}/org/apache/bcel/bcel/5.2/bcel-5.2.jar
 bcel.md5=43d54687362fc2991d61201c453a8286
 
 jetty.dir=${depends.jars}/jetty
 jetty.jar=${jetty.dir}/jetty-6.0.0.jar
 jetty.md5=930507973c9ad19a874af06f10be7223
-jetty.url=${ibiblio.base}/maven2/jetty/jetty/6.0.0/jetty-6.0.0.jar
+jetty.url=${maven2.base}/jetty/jetty/6.0.0/jetty-6.0.0.jar
 
 jetty-util.jar=${jetty.dir}/jetty-util-6.0.0.jar
 jetty-util.md5=7cf65d83814718afdd1d3bd74f8799fc
-jetty-util.url=${ibiblio.base}/maven2/jetty/jetty-util/6.0.0/jetty-util-6.0.0.jar
+jetty-util.url=${maven2.base}/jetty/jetty-util/6.0.0/jetty-util-6.0.0.jar
 
 servlet-api.jar=${jetty.dir}/servlet-api-2.5-6.0.0.jar
 servlet-api.md5=c27c02fb0a00cc3a7d05ea993a9bf56e
-servlet-api.url=${ibiblio.base}/maven2/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
+servlet-api.url=${maven2.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
 
 awtdeps.base.x86=http://people.apache.org/~geirm/harmony/
 awtdeps.dir.x86=${depends.dir}/libs/windows.x86

Modified: harmony/enhanced/common_resources/build/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/build/depends.xml?view=diff&rev=552639&r1=552638&r2=552639
==============================================================================
--- harmony/enhanced/common_resources/build/depends.xml (original)
+++ harmony/enhanced/common_resources/build/depends.xml Mon Jul  2 18:39:54 2007
@@ -29,21 +29,20 @@
     <import file="${basedir}/build/properties.xml" />
 
     <target name="check" description="Check whether dependencies are available"
-            depends="-check,-check-win,-check-unix" />
+            depends="-check,-check-win,-check-unix,-extract" />
 
     <target name="-check">
         <check-one-file src="${yoko.url}" dest="${yoko.jar}" />
-        <check-one-file src="${yoko-rmi.url}" dest="${yoko-rmi.jar}" />
+        <check-one-file src="${yoko-core.url}" dest="${yoko-core.jar}" />
+        <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="${resolver.url}" dest="${resolver.jar}" />
-        <check-one-file src="${xerces.impl.url}" dest="${xerces.impl.jar}" />
-        <check-one-file src="${xml.apis.url}" dest="${xml.apis.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}" />
         <check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
-        <check-one-file src="${mx4j.url}" dest="${mx4j.jar}" />
-        <check-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}" />
+        <check-one-file src="${mx4j.url}" dest="${mx4j.zip}" />
         <check-one-file src="${ecj.url}" dest="${ecj.jar}" />
         <check-one-file src="${jetty.url}" dest="${jetty.jar}" />
         <check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
@@ -51,6 +50,8 @@
         <check-one-file src="${cpptasks.url}" dest="${cpptasks.jar}" />
     </target>
 
+    <target name="-check-win" if="is.windows" depends="-really-check-win" />
+
     <target name="-select-win-deps-x86" if="is.x86">
         <property name="people.apache.base" value="${people.apache.base.x86}"/>
         <property name="awtdeps.dir" value="${awtdeps.dir.x86}"/>
@@ -64,7 +65,8 @@
         <property name="msvcr.dll" value="${msvcr.dll.x86}"/>
         <property name="msvcr.url" value="${msvcr.url.x86}"/>
         <property name="msvcr.dll.file" value="${msvcr.dll.file.x86}"/>
-        <property name="msvcr.md5" value="${msvcr.md5.x86}"/>
+        <property name="msvcr.md5" value="${msvcr_VS2003SP1.md5.x86}"/>
+        <property name="msvcr.md5.deprecated" value="${msvcr_VS2003.md5.x86}"/>
     </target>
 
     <target name="-select-win-deps-x86_64" if="is.x86_64">
@@ -83,10 +85,9 @@
         <property name="msvcr.md5" value="${msvcr.md5.x86_64}"/>
     </target>
 
-    <target name="-check-win" if="is.windows" depends="-really-check-win" />
-
-    <target name="-really-check-win" if="is.windows">
+    <target name="-really-check-win" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">
         <property environment="hyenv" />
+
         <check-one-file src="${msvcr.url}" dest="${msvcr.dll}" />
         <check-one-file src="${awtdeps.url}" dest="${awtdeps.tar}" />
         <uptodate property="awtdeps.uptodate"
@@ -95,6 +96,35 @@
         <antcall target="-awt-tar-extract" />
     </target>
 
+    <target name="-extract" depends="-extract-props,-really-extract-mx4j" />
+    <target name="-extract-props">
+        <uptodate property="mx4j.uptodate"
+                  srcfile="${mx4j.zip}"
+                  targetfile="${mx4j.jar}" />
+    </target>
+    <target name="-really-extract-mx4j" unless="mx4j.uptodate">
+        <!-- This doesn't work for me since my ant doesn't support
+             mapper in unzip.
+
+        <unzip src="${mx4j.zip}" dest="${mx4j.dir}">
+            <patternset>
+                <include name="**/mx4j.jar"/>
+                <include name="**/mx4j-remote.jar"/>
+            </patternset>
+            <mapper type="flatten" />
+        </unzip>
+          -->
+
+        <unzip src="${mx4j.zip}" dest="${mx4j.dir}.tmp" />
+        <copy todir="${mx4j.dir}" flatten="yes">
+            <fileset dir="${mx4j.dir}.tmp/mx4j-3.0.2/lib">
+                <include name="mx4j.jar"/>
+                <include name="mx4j-remote.jar"/>
+            </fileset>
+        </copy>
+        <delete dir="${mx4j.dir}.tmp" />
+    </target>
+
     <!-- 
        *  FIXME : the following awful little hack is because we noticed that for whatever
        *  reason, we can't link with libjpg.a et al on at least to kinds of 64-bit linux
@@ -176,8 +206,22 @@
                         message="${jpeg.msg}" />
     </target>
 
-    <target name="-check-unix" if="is.unix" depends="-check-unix-x86, -check-unix-x86_64">
-        
+    <target name="-check-unix-ia64" if="is.ia64" unless="is.windows" depends="-check-unix-common">
+        <check-one-link src="${lcms.home}/lib/liblcms.a"
+                        dest="depends/libs/build/lcms/liblcms.${hy.platform}"
+                        message="${lcms.msg}" />
+
+        <check-one-link src="${png.home}/lib/libpng.a"
+                        dest="depends/libs/build/png/libpng.${hy.platform}"
+                        message="${png.msg}" />
+
+        <check-one-link src="${jpeg.home}/lib/libjpeg.a"
+                        dest="depends/libs/build/jpeg/libjpeg.${hy.platform}"
+                        message="${jpeg.msg}" />
+    </target>
+
+    <target name="-check-unix" if="is.unix" depends="-check-unix-x86, -check-unix-x86_64,
-check-unix-ia64">
+ 
 <!--        <property name="lcms.msg"
                   value="liblcms development package not installed
 ${line.separator}See depends/libs/build/README.txt for further details.
@@ -246,9 +290,17 @@
     <download-one-file src="${yoko.url}" dest="${yoko.jar}"
                            md5="${yoko.md5}" />
 
-    <mkdir dir="${yoko-rmi.dir}" />
-    <download-one-file src="${yoko-rmi.url}" dest="${yoko-rmi.jar}"
-                           md5="${yoko-rmi.md5}" />
+    <mkdir dir="${yoko-core.dir}" />
+    <download-one-file src="${yoko-core.url}" dest="${yoko-core.jar}"
+                           md5="${yoko-core.md5}" />
+
+    <mkdir dir="${yoko-rmi-impl.dir}" />
+    <download-one-file src="${yoko-rmi-impl.url}" dest="${yoko-rmi-impl.jar}"
+                           md5="${yoko-rmi-impl.md5}" />
+
+    <mkdir dir="${yoko-rmi-spec.dir}" />
+    <download-one-file src="${yoko-rmi-spec.url}" dest="${yoko-rmi-spec.jar}"
+                           md5="${yoko-rmi-spec.md5}" />
 
     <mkdir dir="${bcel.dir}" />
     <download-one-file src="${bcel.url}" dest="${bcel.jar}"
@@ -259,14 +311,8 @@
                            md5="${xalan.md5}" />
 
     <mkdir dir="${xerces.dir}" />
-    <download-one-file src="${resolver.url}" dest="${resolver.jar}"
-                           md5="${resolver.md5}" />
-
-    <download-one-file src="${xerces.impl.url}" dest="${xerces.impl.jar}"
-                           md5="${xerces.impl.md5}" />
-
-    <download-one-file src="${xml.apis.url}" dest="${xml.apis.jar}"
-                           md5="${xml.apis.md5}" />
+    <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}"
@@ -281,17 +327,14 @@
                            md5="${icu4j.md5}" />
 
     <mkdir dir="${mx4j.dir}" />
-    <download-one-file src="${mx4j.url}" dest="${mx4j.jar}"
+    <download-one-file src="${mx4j.url}" dest="${mx4j.zip}"
                            md5="${mx4j.md5}" />
 
-    <download-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}"
-                           md5="${mx4j.remote.md5}" />
-
     <mkdir dir="${ecj.dir}" />
     <download-one-file src="${ecj.url}" dest="${ecj.jar}"
                            md5="${ecj.md5}" />
-        
-        <mkdir dir="${jetty.dir}" />
+
+    <mkdir dir="${jetty.dir}" />
     <download-one-file src="${jetty.url}" dest="${jetty.jar}"
                            md5="${jetty.md5}" />
  
@@ -313,27 +356,31 @@
 
     </target>
 
-    <target name="-download-win" if="is.windows" depends="-select-win-deps-x86,-select-win-deps-x86_64">
-    
-    <property environment="hyenv" />        
-    
+    <target name="-download-win" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">
+
+    <property environment="hyenv" />
+
     <mkdir dir="${msvcr.dir}" />
-    <download-one-file src="${msvcr.url}" dest="${msvcr.dll}"
-                           md5="${msvcr.md5}" />
+    <download-one-file src="${msvcr.url}"
+                       dest="${msvcr.dll}"
+                       md5="${msvcr.md5}"
+                       md5-deprecated="${msvcr.md5.deprecated}" />
 
     <mkdir dir="${awtdeps.dir}" />
-    <download-one-file src="${awtdeps.url}" dest="${awtdeps.tar}"
-                           md5="${awtdeps.md5}" />
-            
+    <download-one-file src="${awtdeps.url}"
+                       dest="${awtdeps.tar}"
+                       md5="${awtdeps.md5}" />
+
     </target>
 
     <macrodef name="download-one-file">
         <attribute name="src" />
         <attribute name="dest" />
         <attribute name="md5" />
+        <attribute name="md5-deprecated" default="" />
         <sequential>
             <echo>Checking @{dest}</echo>
-        <available file="@{dest}" type="file"
+            <available file="@{dest}" type="file"
                        property="@{dest}.exists" />
             <antcall target="-really-download">
                 <param name="src" value="@{src}" />
@@ -341,7 +388,10 @@
             </antcall>
             <checksum file="@{dest}" property="@{dest}.md5" />
             <condition property="@{dest}.md5.verified" value="true">
-                <equals arg1="${@{dest}.md5}" arg2="@{md5}" />
+                <or>
+                    <equals arg1="${@{dest}.md5}" arg2="@{md5}" />
+                    <equals arg1="${@{dest}.md5}" arg2="@{md5-deprecated}" />
+                </or>
             </condition>
             <antcall target="-remove-file-if-bad">
                 <param name="jar" value="@{dest}" />
@@ -349,10 +399,9 @@
         <fail unless="@{dest}.md5.verified">
 ...
 
-File @{dest} has incorrect md5 checksum.  Expected:
-  @{md5}
-found:
-  ${@{dest}.md5}
+File @{dest} has incorrect md5 checksum.
+    Expected: @{md5} (or @{md5-deprecated})
+    Found:    ${@{dest}.md5}
 
             </fail>
             <echo>Checksum verified (${@{dest}.md5.verified})</echo>
@@ -400,7 +449,7 @@
 
     <target name="-awt-tar-extract" unless="awtdeps.uptodate">
         <echo>Extracting awt dependencies</echo>
-    <untar src="${awtdeps.tar}" dest="${awtdeps.extract.dir}"
+        <untar src="${awtdeps.tar}" dest="${awtdeps.extract.dir}"
                compression="gzip" />
         <echo file="${awtdeps.testfile}"
               message="${awtdeps.tar} extracted${line.separator}" />

Modified: harmony/enhanced/jdktools/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/depends.properties?view=diff&rev=552639&r1=552638&r2=552639
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/depends.properties (original)
+++ harmony/enhanced/jdktools/trunk/make/depends.properties Mon Jul  2 18:39:54 2007
@@ -15,24 +15,25 @@
 
 depends.dir=${external.resources}/depends
 depends.jars=${depends.dir}/jars
-mirror.base=http://mirrors.ibiblio.org/pub/mirrors/maven2
+maven2.base=http://repo1.maven.org/maven2
+eclipse.base=http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500
 
-ecj.dir=${depends.jars}/ecj_3.3M7
-ecj.jar=${ecj.dir}/ecj_3.3M7.jar
-ecj.url=http://download.eclipse.org/eclipse/downloads/drops/S-3.3M7-200705031400/ecj.jar
-ecj.md5=23d38c997a6a0d47586965f7505bed67
+ecj.dir=${depends.jars}/ecj_3.3
+ecj.jar=${ecj.dir}/ecj_3.3.jar
+ecj.url=${eclipse.base}/ecj.jar
+ecj.md5=412d8badd227807ef2f52608435240fb
 
-icu.dir=${depends.jars}/com.ibm.icu.base-3.3M7
-icu.zip=${icu.dir}/com.ibm.icu.base-3.3M7.zip
-icu.url=http://download.eclipse.org/eclipse/downloads/drops/S-3.3M7-200705031400/com.ibm.icu.base-3.3M7.zip
-icu.md5=e1c39bbc93ed2f4b03fddb3c5418f4ee
+icu.dir=${depends.jars}/com.ibm.icu.base-3.3
+icu.zip=${icu.dir}/com.ibm.icu.base-3.3.zip
+icu.url=${eclipse.base}/com.ibm.icu.base-3.3.zip
+icu.md5=5b8a0fc0e48431d376c7efd7be8c0f7b
 icu.jar.name=com.ibm.icu.base_3.6.1.v20070417.jar
 icu.jar=${icu.dir}/${icu.jar.name}
 
-jdt.dir=${depends.jars}/eclipse-JDT-3.3M7
-jdt.zip=${jdt.dir}/eclipse-JDT-3.3M7.zip
-jdt.url=http://download.eclipse.org/eclipse/downloads/drops/S-3.3M7-200705031400/eclipse-JDT-3.3M7.zip
-jdt.md5=d26e1a0097ba81059df720ffd613dbb8
+jdt.dir=${depends.jars}/eclipse-JDT-3.3
+jdt.zip=${jdt.dir}/eclipse-JDT-3.3.zip
+jdt.url=${eclipse.base}/eclipse-JDT-3.3.zip
+jdt.md5=7a82530972e2943a2f20cb6d3bffe0d6
 jdt.jdi.jar.name=jdi.jar
 jdt.jdi.jar=${jdt.dir}/${jdt.jdi.jar.name}
 jdt.jdimodel.jar.name=jdimodel.jar
@@ -40,6 +41,6 @@
 
 junit.dir=${depends.jars}/junit_3.8.2
 junit.jar=${junit.dir}/junit.jar
-junit.url=${mirror.base}/junit/junit/3.8.2/junit-3.8.2.jar
+junit.url=${maven2.base}/junit/junit/3.8.2/junit-3.8.2.jar
 junit.md5=28e7eb9eeefe31a657c68755bfccc541
 



Mime
View raw message