A patch to reflect URL changes in Harmony that are depended on by MRP. This patch should apply to MRP branch a4170d982dd2319c4fd0a8a3fea1dda408eb71ec Applying this patch will fix build problems but not runtime problems. Still got more work to do.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/build/components/harmony.xml b/build/components/harmony.xml | |
index 7ba9405..2e0ed25 100755 | |
--- a/build/components/harmony.xml | |
+++ b/build/components/harmony.xml | |
@@ -18,6 +18,7 @@ | |
<property name="harmony.version" value="5.0M10"/> | |
<property name="harmony.description" value="Apache Harmony class libraries"/> | |
<property name="harmony.svn.revision" value="782693"/> | |
+ <property name="harmony.base.url" value="http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib"/> | |
<property name="harmony.patchlevel" value="0"/> | |
<property name="harmony.component.dir" location="${components.dir}/harmony"/> | |
<property name="harmony.package.dir" value="${harmony.component.dir}/${harmony.version}p${harmony.patchlevel}"/> | |
@@ -45,7 +46,9 @@ | |
<target name="get-harmony-from-svn" depends="init-harmony-properties,check-svn-present" if="harmony.from-svn"> | |
<exec executable="${svn.exe}"> | |
<arg value="checkout"/> | |
- <arg value="http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk@${harmony.svn.revision}"/> | |
+ <arg value="${harmony.base.url}"/> | |
+ <arg value="-r"/> | |
+ <arg value="${harmony.svn.revision}"/> | |
<arg value="${harmony.dir}"/> | |
</exec> | |
</target> | |
@@ -72,7 +75,7 @@ | |
<!-- *************************************************************************** --> | |
<!-- Patches against SVN head --> | |
- <target name="patch-harmony-cvs" depends="fetch" if="harmony.from-svn"> | |
+ <target name="patch-harmony-svn" depends="fetch" if="harmony.from-svn"> | |
<patch patchfile="${components.patch.dir}/harmony-svn.RVM-358-01.patch" | |
dir="${harmony.dir}" strip="0"/> | |
</target> | |
@@ -87,7 +90,7 @@ | |
<target name="patch-harmony-web" depends="fetch" if="harmony.from-web"> | |
</target> | |
- <target name="patch" depends="patch-harmony-web,patch-harmony-cvs,patch-harmony-local"/> | |
+ <target name="patch" depends="patch-harmony-web,patch-harmony-svn,patch-harmony-local"/> | |
<!-- *************************************************************************** --> | |
<!-- Build Harmony --> | |
diff --git a/build/components/patches/harmony-svn.RVM-358-01.patch b/build/components/patches/harmony-svn.RVM-358-01.patch | |
index ae2fb58..8df3185 100644 | |
--- a/build/components/patches/harmony-svn.RVM-358-01.patch | |
+++ b/build/components/patches/harmony-svn.RVM-358-01.patch | |
@@ -1,9 +1,57 @@ | |
Index: modules/archive/src/main/native/archive/unix/exports.txt | |
=================================================================== | |
---- modules/archive/src/main/native/archive/unix/exports.txt (revision 653525) | |
+--- modules/archive/src/main/native/archive/unix/exports.txt (revision 782693) | |
+++ modules/archive/src/main/native/archive/unix/exports.txt (working copy) | |
@@ -33,3 +33,4 @@ | |
Java_java_util_zip_ZipFile_openZipImpl | |
JNI_OnLoad | |
JNI_OnUnload | |
+zipCachePool_new | |
+Index: modules/jmx/make/depends.properties | |
+=================================================================== | |
+--- modules/jmx/make/depends.properties (revision 782693) | |
++++ modules/jmx/make/depends.properties (working copy) | |
+@@ -1,10 +1,10 @@ | |
+ depends.jars=${depends.dir}/jars | |
+-sf.base=http://internap.dl.sourceforge.net/sourceforge | |
++sf.base=http://sourceforge.net/projects | |
+ | |
+ mx4j.version=3.0.2 | |
+ mx4j.dir=${depends.jars}/mx4j_${mx4j.version} | |
+ mx4j.zip=${mx4j.dir}/mx4j.zip | |
+-mx4j.url=${sf.base}/mx4j/mx4j-${mx4j.version}.zip | |
++mx4j.url=${sf.base}/mx4j/files/MX4J%20Binary/${mx4j.version}/mx4j-${mx4j.version}.zip/download | |
+ mx4j.md5=443bd83ee36414de4b8fc5722b038b02 | |
+ mx4j.jar=${mx4j.dir}/mx4j.jar | |
+ mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar | |
+Index: make/depends.properties | |
+=================================================================== | |
+--- make/depends.properties (revision 782693) | |
++++ make/depends.properties (working copy) | |
+@@ -16,7 +16,7 @@ | |
+ depends.dir=depends | |
+ depends.jars=${depends.dir}/jars | |
+ maven2.base=http://repo1.maven.org/maven2 | |
+-sf.base=http://internap.dl.sourceforge.net/sourceforge | |
++sf.base=http://sourceforge.net/projects | |
+ | |
+ xalan.dir=${depends.jars}/xalan-j_2.7.0 | |
+ xalan.orig.jar=${xalan.dir}/xalan.orig.jar | |
+@@ -26,7 +26,7 @@ | |
+ | |
+ xerces.dir=${depends.jars}/xerces_2.9.1 | |
+ xerces.zip=${xerces.dir}/xerces.zip | |
+-xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.1.zip | |
++xerces.url=http://archive.apache.org/dist/xerces/j/Xerces-J-bin.2.9.1.zip | |
+ xerces.md5=a0e07ede1c3bd5231fe15eae24032b2e | |
+ | |
+ junit.dir=${depends.jars}/junit_4.4 | |
+@@ -92,7 +92,7 @@ | |
+ dejavu-fonts.dir=${depends.dir}/dejavu-fonts | |
+ dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18 | |
+ dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip | |
+-dejavu-fonts.url=${sf.base}/dejavu/dejavu-ttf-2.18-1.zip | |
++dejavu-fonts.url=${sf.base}/dejavu/files/dejavu/2.18/dejavu-ttf-2.18-1.zip/download | |
+ dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e | |
+ | |
+ derby.dir=${depends.jars}/derby-10.3.1.4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment