diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-01-15 14:55:12 +0100 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-01-15 14:55:12 +0100 |
commit | b29bb2dbee8137ef5ff240588cf2269edc9428fd (patch) | |
tree | 3aaa726f6611e592ea05082f67898fbde91ccaad /rhino | |
parent | da42440ee30c2a15803fe159855f64dec97ad45a (diff) |
ause110: #i106731# remove tarballs from scm and find them in download cache dir
Diffstat (limited to 'rhino')
-rwxr-xr-x | rhino/makefile.mk | 1 | ||||
-rw-r--r-- | rhino/rhino1_5R5-find_swing.patch | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 0809007ea7b4..5244af24f5d7 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -43,6 +43,7 @@ TARGET=ooo_rhino # --- Files -------------------------------------------------------- TARFILE_NAME=rhino1_5R5 +TARFILE_MD5=798b2ffdc8bcfe7bca2cf92b62caf685 TARFILE_ROOTDIR=rhino1_5R5 ADDITIONAL_FILES= \ diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch index e94974a41574..220c4f4e668a 100644 --- a/rhino/rhino1_5R5-find_swing.patch +++ b/rhino/rhino1_5R5-find_swing.patch @@ -1,13 +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 -@@ -12,6 +12,10 @@ +@@ -12,6 +12,8 @@ <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> ++ <property name="swing_zip" value="${solenv.TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/> <path id="macPath" location="${java.home}/../Classes/classes.jar"/> <!-- rhino.jar from OpenJDK breaks build --> <path id="nonMacPath"> |