| build.xml (d14fbfd3) | build.xml (3187fb04) |
|---|---|
| 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 --- 76 unchanged lines hidden (view full) --- 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"/> | 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 --- 76 unchanged lines hidden (view full) --- 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" /> | 93 <contains string="${java.version}" substring="1.8" 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 100 <!-- rhino.jar from OpenJDK breaks build --> 101 <path id="nonMacPath"> --- 213 unchanged lines hidden --- | 94 <contains string="${java.vendor}" substring="Oracle" casesensitive="false" /> 95 </and> 96 </condition> 97 98 <path id="macPath" refID="${mac.java.path}"/> 99 100 <!-- rhino.jar from OpenJDK breaks build --> 101 <path id="nonMacPath"> --- 213 unchanged lines hidden --- |