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/scripts | |
| parent | 1a01dce6c42b398cdd68d405828774a3ab366456 (diff) | |
Fix Bug 751 OSX Java-6: Derive host/target-rt jar file from 'java.home'.
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/make.gluegen.all.macosx-java7.sh | 3 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.macosx-java7_target16.sh | 22 |
2 files changed, 22 insertions, 3 deletions
diff --git a/make/scripts/make.gluegen.all.macosx-java7.sh b/make/scripts/make.gluegen.all.macosx-java7.sh index 1a69f9e..f88341b 100755 --- a/make/scripts/make.gluegen.all.macosx-java7.sh +++ b/make/scripts/make.gluegen.all.macosx-java7.sh @@ -15,8 +15,5 @@ PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-macosx-java7 \ $* 2>&1 | tee make.gluegen.all.macosx-java7.log diff --git a/make/scripts/make.gluegen.all.macosx-java7_target16.sh b/make/scripts/make.gluegen.all.macosx-java7_target16.sh new file mode 100755 index 0000000..4e9e04a --- /dev/null +++ b/make/scripts/make.gluegen.all.macosx-java7_target16.sh @@ -0,0 +1,22 @@ +#! /bin/sh + +if [ -e /opt-share/etc/profile.ant ] ; then + . /opt-share/etc/profile.ant +fi + +# -Dc.compiler.debug=true +# +# -Dtarget.sourcelevel=1.6 \ +# -Dtarget.targetlevel=1.6 \ +# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ + +JAVA_HOME=`/usr/libexec/java_home -version 1.7` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH + +ant \ + -Dtarget.sourcelevel=1.6 \ + -Dtarget.targetlevel=1.6 \ + -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ + -Drootrel.build=build-macosx-java7_target16 \ + $* 2>&1 | tee make.gluegen.all.macosx-java7_target16.log |