build.xml (8b0d3335) build.xml (4aab7c0b)
1<!--***********************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 68 unchanged lines hidden (view full) ---

77 </path>
78
79 <condition property="boot_refID" value="macPath" else="nonMacPath">
80 <and>
81 <os family="mac"/>
82 <os family="unix"/>
83 </and>
84 </condition>
1<!--***********************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 68 unchanged lines hidden (view full) ---

77 </path>
78
79 <condition property="boot_refID" value="macPath" else="nonMacPath">
80 <and>
81 <os family="mac"/>
82 <os family="unix"/>
83 </and>
84 </condition>
85 <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
85
86<path id="mac.apple.java.path" location="${java.home}/../Classes/classes.jar"/>
87 <path id="mac.oracle.java.path" location="${java.home}/lib/rt.jar"/>
88
89 <condition property="mac.java.path" value="mac.oracle.java.path" else ="mac.apple.java.path">
90 <and>
91 <os family="mac"/>
92 <os family="unix"/>
93 <contains string="${java.version}" substring="1.7" casesensitive="false" />
94 <contains string="${java.vendor}" substring="Oracle" casesensitive="false" />
95 </and>
96 </condition>
97
98 <path id="macPath" refID="${mac.java.path}"/>
99
86 <!-- rhino.jar from OpenJDK breaks build -->
87 <path id="nonMacPath">
88 <fileset dir="${java.home}/">
89 <include name="jre/lib/*.jar"/>
90 <include name="lib/*.jar"/>
91 <exclude name="jre/lib/rhino.jar"/>
92 <exclude name="lib/rhino.jar"/>
93 </fileset>

--- 207 unchanged lines hidden --- 		100 <!-- rhino.jar from OpenJDK breaks build -->
101 <path id="nonMacPath">
102 <fileset dir="${java.home}/">
103 <include name="jre/lib/*.jar"/>
104 <include name="lib/*.jar"/>
105 <exclude name="jre/lib/rhino.jar"/>
106 <exclude name="lib/rhino.jar"/>
107 </fileset>

--- 207 unchanged lines hidden ---