diff options
| author | rbuj <robert.buj@gmail.com> | 2014-06-17 11:37:02 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-18 09:46:29 +0000 |
| commit | 0bf363bb6aed583ea228cec88598144b2cbe0d73 (patch) | |
| tree | 82c696449a153c48f6889b73fa5752c6d22e6a4e /external/rhino | |
| parent | b4e20eed2c9bfc032446a43f08e387a3e613d6b8 (diff) | |
OS X: modify rhino1_5R5 patch for JDKs >= 1.5
Change-Id: Ie07d71055d2776c0701a23db05a0cb91b8d5cb5b
Reviewed-on: https://gerrit.libreoffice.org/9809
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/rhino')
| -rw-r--r-- | external/rhino/rhino1_5R5-find_swing.patch | 6 | ||||
| -rw-r--r-- | external/rhino/rhino1_5R5.patch | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/external/rhino/rhino1_5R5-find_swing.patch b/external/rhino/rhino1_5R5-find_swing.patch index f074fa845490..38ff78e4ec58 100644 --- a/external/rhino/rhino1_5R5-find_swing.patch +++ b/external/rhino/rhino1_5R5-find_swing.patch @@ -1,14 +1,14 @@ --- misc/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:46.605524507 +0100 +++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:26.536908810 +0100 -@@ -12,6 +12,7 @@ - <os family="unix"/> +@@ -16,6 +16,7 @@ + </or> </and> </condition> + <property name="swing_zip" value="${TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/> <path id="macPath" location="${java.home}/../Classes/classes.jar"/> <!-- rhino.jar from OpenJDK breaks build --> <path id="nonMacPath"> -@@ -38,7 +42,7 @@ +@@ -42,7 +43,7 @@ <!-- Download source from Sun's site, unzip it, remove the files we don't need, and change the package --> diff --git a/external/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch index 5b10c320d015..e44872e3df8f 100644 --- a/external/rhino/rhino1_5R5.patch +++ b/external/rhino/rhino1_5R5.patch @@ -108,7 +108,7 @@ } --- misc/rhino1_5R5/toolsrc/build.xml 2004-03-25 21:54:34.000000000 +0100 +++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-01-17 20:46:44.000000000 +0100 -@@ -6,6 +6,24 @@ +@@ -6,6 +6,28 @@ --> <project name="toolsrc" default="compile" basedir="."> @@ -116,6 +116,10 @@ + <and> + <os family="mac"/> + <os family="unix"/> ++ <or> ++ <equals arg1="${ant.java.version}" arg2="1.5"/> ++ <equals arg1="${ant.java.version}" arg2="1.6"/> ++ </or> + </and> + </condition> + <path id="macPath" location="${java.home}/../Classes/classes.jar"/> @@ -133,7 +137,7 @@ <target name="properties"> <property name="nest" value=".."/> <property name="build.dir" value="./build"/> -@@ -20,46 +38,10 @@ +@@ -20,46 +42,10 @@ <!-- Download source from Sun's site, unzip it, remove the files we don't need, and change the package --> @@ -181,7 +185,7 @@ </target> <target name="compile" depends="properties,get-swing-ex"> -@@ -68,6 +50,7 @@ +@@ -68,6 +54,7 @@ includes="org/**/*.java" deprecation="on" debug="${debug}"> |