summaryrefslogtreecommitdiff
path: root/rhino
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2009-10-29 18:45:35 +0100
committerHans-Joachim Lankenau <hjs@openoffice.org>2009-10-29 18:45:35 +0100
commit0a7f9346503a557f583bced269655fa1996550af (patch)
tree6f7936d29949934cdefc63dece756547dc020201 /rhino
parent2c4f374fdc256aba8094558e7d55d4585414be88 (diff)
ause109: #i106296# make build.xml aware of TARFILE_LOCATION
Diffstat (limited to 'rhino')
-rwxr-xr-xrhino/makefile.mk3
-rw-r--r--rhino/rhino1_5R5-find_swing.patch22
2 files changed, 24 insertions, 1 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 24517b6dafd7..0809007ea7b4 100755
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -48,7 +48,8 @@ TARFILE_ROOTDIR=rhino1_5R5
ADDITIONAL_FILES= \
toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
-PATCH_FILES=rhino1_5R5.patch
+PATCH_FILES=rhino1_5R5.patch \
+ rhino1_5R5-find_swing.patch
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch
new file mode 100644
index 000000000000..e94974a41574
--- /dev/null
+++ b/rhino/rhino1_5R5-find_swing.patch
@@ -0,0 +1,22 @@
+--- 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,10 @@
+ <os family="unix"/>
+ </and>
+ </condition>
++ <property environment="solenv"/>
++ <condition property="swing_zip" value="${solenv.TARFILE_LOCATION}/swingExSrc.zip" else="../../../../../download/swingExSrc.zip">
++ <isset property="solenv.TARFILE_LOCATION" />
++ </condition>
+ <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
+ <!-- rhino.jar from OpenJDK breaks build -->
+ <path id="nonMacPath">
+@@ -38,7 +42,7 @@
+ <!-- Download source from Sun's site, unzip it, remove
+ the files we don't need, and change the package
+ -->
+- <unzip src="../../../../../download/swingExSrc.zip" dest="${src.debugger}"/>
++ <unzip src="${swing_zip}" dest="${src.debugger}"/>
+ <delete file="${src.debugger}/FileSystemModel2.java" />
+ <delete file="${src.debugger}/MergeSort.java" />
+ <delete file="${src.debugger}/TreeTableExample2.java" />