OSX/Java7 Cleanup: Remove JavaNativeFoundation dependency; NativeWindow-JAWT: Remove c.fixup.jawt.version.macosx (redundant, libjawt.dylib is rpath'ed always)

7 files changed, 63 insertions, 21 deletions

diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 3c97d9d9b..a8408eaa7 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -361,7 +361,6 @@
       </compiler>
 
       <compiler id="compiler.cfg.macosx.nativewindow" extends="compiler.cfg.macosx">
-        <compilerarg value="-I${java.osx.frameworks.dir}/JavaNativeFoundation.framework/Headers" />
       </compiler>
 
       <!-- linker configuration -->
@@ -446,9 +445,6 @@
         <linkerarg value="QuartzCore" />
         <linkerarg value="-weak_framework" />
         <linkerarg value="Cocoa" />
-        <linkerarg value="-weak_framework" />
-        <linkerarg value="JavaNativeFoundation" />
-        <linkerarg value="-F${java.osx.frameworks.dir}" />
       </linker>
 
       <linker id="linker.cfg.hpux.nativewindow" extends="linker.cfg.hpux">
@@ -735,20 +731,6 @@
       </sequential>
     </macrodef>  
 
-    <target name="c.fixup.jawt.version.macosx" if="isOSX" unless="setup.noNativeAWT">
-      <!-- Edit the link to the JAWT version in the resulting jnilib
-           file; this isn't strictly needed but seems to allow the
-           universal binaries to work on 10.3 machines as well, which
-           is desirable for some end users -->
-      <apply executable="install_name_tool">
-        <arg value="-change" />
-        <arg value="/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Libraries/libjawt.dylib" />
-        <arg value="/System/Library/Frameworks/JavaVM.framework/Libraries/libjawt.dylib" />
-        <srcfile />
-        <fileset dir="${obj.nativewindow}" includes="libnativewindow_awt.jnilib" />
-      </apply>
-    </target>
-
     <target name="c.build.nativewindow.awt" unless="setup.noNativeAWT">
       <c.build c.compiler.src.files="c.src.files.awt"
                c.compiler.use-jawt="true"
@@ -796,7 +778,6 @@
     </target>
 
     <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.awt">
-      <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" />
       <antcall target="c.manifest" inheritRefs="true" />
     </target>
 
diff --git a/make/scripts/make.jogl.all.macosx-java7.sh b/make/scripts/make.jogl.all.macosx-java7.sh
index afb72bf8c..fc7ace9d0 100755
--- a/make/scripts/make.jogl.all.macosx-java7.sh
+++ b/make/scripts/make.jogl.all.macosx-java7.sh
@@ -22,4 +22,4 @@ ant \
     -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.jogl.all.macosx.log
+    $* 2>&1 | tee make.jogl.all.macosx-java7.log
diff --git a/make/scripts/make.jogl.all.macosx-java7u12ea.sh b/make/scripts/make.jogl.all.macosx-java7u12ea.sh
new file mode 100755
index 000000000..88f23b8ee
--- /dev/null
+++ b/make/scripts/make.jogl.all.macosx-java7u12ea.sh
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+if [ -e /opt-share/etc/profile.ant ] ; then
+    . /opt-share/etc/profile.ant
+fi
+
+
+#    -Dc.compiler.debug=true \
+#    -Djavacdebug="true" \
+#    -Djavacdebuglevel="source,lines,vars" \
+#
+#    -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.0_12`
+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.jogl.all.macosx-java7u12ea.log
diff --git a/make/scripts/tests-osx-x64-java7.sh b/make/scripts/tests-osx-x64-java7.sh
index e1b07202b..e870d0752 100755
--- a/make/scripts/tests-osx-x64-java7.sh
+++ b/make/scripts/tests-osx-x64-java7.sh
@@ -8,5 +8,5 @@ export JAVA_HOME PATH
 
 spath=`dirname $0`
 
-. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx $*
+. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx-java7 $*
 
diff --git a/make/scripts/tests-osx-x64-java7OnJava6build.sh b/make/scripts/tests-osx-x64-java7OnJava6build.sh
new file mode 100755
index 000000000..e1b07202b
--- /dev/null
+++ b/make/scripts/tests-osx-x64-java7OnJava6build.sh
@@ -0,0 +1,12 @@
+#! /bin/bash
+
+export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
+
+JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+PATH=$JAVA_HOME/bin:$PATH
+export JAVA_HOME PATH
+
+spath=`dirname $0`
+
+. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx $*
+
diff --git a/make/scripts/tests-osx-x64-java7u12ea.sh b/make/scripts/tests-osx-x64-java7u12ea.sh
new file mode 100755
index 000000000..a8c9bed77
--- /dev/null
+++ b/make/scripts/tests-osx-x64-java7u12ea.sh
@@ -0,0 +1,12 @@
+#! /bin/bash
+
+export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
+
+JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_12`
+PATH=$JAVA_HOME/bin:$PATH
+export JAVA_HOME PATH
+
+spath=`dirname $0`
+
+. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx-java7 $*
+
diff --git a/make/scripts/tests-osx-x64-java7u12eaOnJava6Build.sh b/make/scripts/tests-osx-x64-java7u12eaOnJava6Build.sh
new file mode 100755
index 000000000..dad9c430e
--- /dev/null
+++ b/make/scripts/tests-osx-x64-java7u12eaOnJava6Build.sh
@@ -0,0 +1,12 @@
+#! /bin/bash
+
+export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
+
+JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_12`
+PATH=$JAVA_HOME/bin:$PATH
+export JAVA_HOME PATH
+
+spath=`dirname $0`
+
+. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx $*
+