diff options
| author | Sven Gothel <[email protected]> | 2013-06-13 20:34:50 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-06-13 20:34:50 +0200 |
| commit | eabc810f2ed3b1680ac101e828348d49ee939e1d (patch) | |
| tree | 420a58118a6ef1d81ca8a2216ac9d9752733eaa2 /make/jogamp-env.xml | |
| parent | 1a01dce6c42b398cdd68d405828774a3ab366456 (diff) | |
Fix Bug 751 OSX Java-6: Derive host/target-rt jar file from 'java.home'.
Diffstat (limited to 'make/jogamp-env.xml')
| -rwxr-xr-x | make/jogamp-env.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index 542d288..b7fcd21 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -163,17 +163,17 @@ <property name="target.sourcelevel" value="${ant.java.version}" /> <!-- default fallback values --> <property name="target.targetlevel" value="${ant.java.version}" /> <!-- default fallback values --> - <!-- default value for std Java --> + <!-- Default value for std Java (incl. Java7 on OS X) --> <condition property="target.rt.jar" value="${java.home}/lib/rt.jar"> <available file="${java.home}/lib/rt.jar"/> </condition> - <!-- default fallback value on OS X --> + <!-- Default fallback value for Java6 OS X --> <condition property="target.rt.jar" - value="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar"> - <available file="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar"/> + value="${java.home}/../Classes/classes.jar"> + <available file="${java.home}/../Classes/classes.jar"/> </condition> - <!-- default fallback value on std Java --> + <!-- Default fallback value on std Java --> <echo message="target.user.set ${target.user.set}"/> <echo message="target.sourcelevel ${target.sourcelevel}"/> <echo message="target.targetlevel ${target.targetlevel}"/> @@ -188,15 +188,15 @@ <property name="host.sourcelevel" value="${ant.java.version}" /> <!-- default values for compile time components --> <property name="host.targetlevel" value="${ant.java.version}" /> <!-- default values for compile time components --> - <!-- default value for std Java --> + <!-- Default value for std Java (incl. Java7 on OS X) --> <condition property="host.rt.jar" value="${java.home}/lib/rt.jar"> <available file="${java.home}/lib/rt.jar"/> </condition> - <!-- default fallback value on OS X --> + <!-- Default fallback value for Java6 OS X --> <condition property="host.rt.jar" - value="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar"> - <available file="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar"/> + value="${java.home}/../Classes/classes.jar"> + <available file="${java.home}/../Classes/classes.jar"/> </condition> <echo message="host.sourcelevel ${host.sourcelevel}"/> <echo message="host.targetlevel ${host.targetlevel}"/> |