[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scripting/java

[Jürgen Schmidt]

 scripting/java/build.xml |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 695957e715c17b54ffcf2a9ea6d93d0d6b458f6d
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Thu Mar 20 09:18:10 2014 +0000

    allow build with Oracle Java 7 on macos

diff --git a/scripting/java/build.xml b/scripting/java/build.xml
index 161cef8..d9b1463 100644
--- a/scripting/java/build.xml
+++ b/scripting/java/build.xml
@@ -82,7 +82,21 @@
       <os family="unix"/>
     </and>
   </condition>
-  <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
+
+  <path id="mac.apple.java.path" location="${java.home}/../Classes/classes.jar"/>
+  <path id="mac.oracle.java.path" location="${java.home}/lib/rt.jar"/>
+
+  <condition property="mac.java.path" value="mac.oracle.java.path" else ="mac.apple.java.path">
+    <and>
+      <os family="mac"/>
+      <os family="unix"/>
+      <contains string="${java.version}" substring="1.7" casesensitive="false" />
+      <contains string="${java.vendor}" substring="Oracle" casesensitive="false" />
+    </and>
+  </condition>
+
+  <path id="macPath" refID="${mac.java.path}"/>
+
   <!-- rhino.jar from OpenJDK breaks build -->
   <path id="nonMacPath">
     <fileset dir="${java.home}/">