Author: jsc
Date: Thu Mar 20 09:18:10 2014
New Revision: 1579572
URL: http://svn.apache.org/r1579572
Log:
allow build with Oracle Java 7 on macos
Modified:
openoffice/trunk/main/scripting/java/build.xml
Modified: openoffice/trunk/main/scripting/java/build.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/java/build.xml?rev=1579572&r1=1579571&r2=1579572&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/java/build.xml (original)
+++ openoffice/trunk/main/scripting/java/build.xml Thu Mar 20 09:18:10 2014
@@ -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}/">
