diff options
| author | Sven Gothel <[email protected]> | 2012-01-23 16:45:00 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-01-23 16:45:00 +0100 |
| commit | 67854df4b16ce92d0e792f3c693ced0a6470f6cc (patch) | |
| tree | 3c8ef477f3ad6c5f2f0c3bb4fc5f3e0967b1667f | |
| parent | 268692a798005992b091863fa5bd788fb105221a (diff) | |
Fix setting default bootclasspath (target.rt.jar and host.rt.jar) for OS X
| -rwxr-xr-x | make/jogamp-env.xml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index 9ded98d..d6143f8 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -114,9 +114,15 @@ </and> </condition> - <property name="target.sourcelevel" value="${ant.java.version}" /> <!-- default fallback values --> - <property name="target.targetlevel" value="${ant.java.version}" /> <!-- default fallback values --> - <property name="target.rt.jar" value="${java.home}/lib/rt.jar" /> <!-- default fallback values --> + <property name="target.sourcelevel" value="${ant.java.version}" /> <!-- default fallback values --> + <property name="target.targetlevel" value="${ant.java.version}" /> <!-- default fallback values --> + <!-- default fallback value on OS X --> + <available property="target.rt.jar" + type="file" + file="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar" + value="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar"/> + <!-- default fallback value on std Java --> + <property name="target.rt.jar" value="${java.home}/lib/rt.jar" /> <echo message="target.user.set ${target.user.set}"/> <echo message="target.sourcelevel ${target.sourcelevel}"/> <echo message="target.targetlevel ${target.targetlevel}"/> @@ -124,7 +130,13 @@ <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 --> - <property name="host.rt.jar" value="${java.home}/lib/rt.jar" /> <!-- default values for compile time components --> + <!-- default fallback value for compile time components on OS X --> + <available property="host.rt.jar" + type="file" + file="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar" + value="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar"/> + <!-- default fallback value for compile time components on std Java --> + <property name="host.rt.jar" value="${java.home}/lib/rt.jar" /> <echo message="host.sourcelevel ${host.sourcelevel}"/> <echo message="host.targetlevel ${host.targetlevel}"/> <echo message="host.rt.jar ${host.rt.jar}"/> |