diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-08-30 17:43:03 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-08-30 17:43:03 +0200 |
commit | d5189db4df292501cf18ad84e406d6401d14a5ce (patch) | |
tree | d2765d2ced769dc60b949dec79a2ed11f0015cf7 /external | |
parent | Pass "verbose" flag into ant (diff) | |
download | core-d5189db4df292501cf18ad84e406d6401d14a5ce.tar.gz core-d5189db4df292501cf18ad84e406d6401d14a5ce.zip |
Compact content of external/rhino/rhino1_5R5-find_swing.patch to single place
...instead of adding something into the middle of the previous
external/rhino/rhino1_5R5.patch
Change-Id: I94a0e022776db67f50e785c45b0982977eec17f1
Diffstat (limited to 'external')
-rw-r--r-- | external/rhino/rhino1_5R5-find_swing.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/external/rhino/rhino1_5R5-find_swing.patch b/external/rhino/rhino1_5R5-find_swing.patch index 38ff78e4ec58..905336eb1b0d 100644 --- a/external/rhino/rhino1_5R5-find_swing.patch +++ b/external/rhino/rhino1_5R5-find_swing.patch @@ -1,14 +1,11 @@ --- 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 -@@ -16,6 +16,7 @@ - </or> - </and> - </condition> +@@ -38,11 +38,12 @@ + property="swing-ex-available"/> + </target> + + <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"> -@@ -42,7 +43,7 @@ + <target name="get-swing-ex" unless="swing-ex-available"> <!-- Download source from Sun's site, unzip it, remove the files we don't need, and change the package --> |