Skip to content
The Jenkins Controller is preparing for shutdown. No new builds can be started.
Success

Changes

Summary

  1. OSX Java6/Java7: Adapt to used JDK (Apple's Java6 or Oracle's Java7) (details)
  2. OSX/Java7 darwin/jawt_md.h Workaround ; Disable OSX/i386 if compiled w/ (details)
  3. Add property 'jvmJava.exe' -> ${java.home}/bin/java, default jvm for (details)
Commit 4aa36ed61fd1bb434f2a5dd4d7dbffd6f87a446d by Sven Gothel
OSX Java6/Java7: Adapt to used JDK (Apple's Java6 or Oracle's Java7)

- Pick-up OSX Java7 locations if setup via ${java.home} and files available
  - host.rt.jar, target.rt.jar
  - java.home.dir
  - java.includes.dir
  - java.includes.dir.platform
  - java.lib.dir.platform

- Remove 'very old' Java4/5 OSX locations
- Remove java.osx.frameworks.dir, since JavaNativeFoundation.h dependencies are removed
The file was modifiedmake/scripts/make.gluegen.all.macosx-java7.sh (diff)
The file was modifiedmake/jogamp-env.xml (diff)
The file was modifiedmake/gluegen-cpptasks-base.xml (diff)
Commit e4fc97f6c08d58d1a62543fdfda92fddfda6ee68 by Sven Gothel
OSX/Java7 darwin/jawt_md.h Workaround ; Disable OSX/i386 if compiled w/ Java7 [1.7 - 2.0]; Valid Java range [1.6 - 2.0].

- OSX/Java7 darwin/jawt_md.h Workaround
  Include JOGL's JNI MacOSX platform headers, since Oracle's Java7 darwin/jawt_md.h
  has X11 dependencies and does not define JAWT_SurfaceLayers.

- Disable OSX/i386 if compiled w/ Java7 [1.7 - 2.0]
  Set macosx32 depending on 'ant.java.version'

- Valid Java range [1.6 - 2.0]
  Foresee new Java versions 1.9 and 2.0 :)
The file was modifiedmake/gluegen-cpptasks-base.xml (diff)
The file was addedmake/stub_includes/jni/macosx/jawt_md.h (diff)
The file was addedmake/stub_includes/jni/macosx/jni_md.h (diff)
The file was modifiedmake/jogamp-env.xml (diff)
Commit 6b86764f2e195b4046000fd5a7fcf3331ca72d21 by Sven Gothel
Add property 'jvmJava.exe' -> ${java.home}/bin/java, default jvm for unit tests; Add optional property 'jvmJava7.exe' for Java7 unit tests.
The file was modifiedmake/jogamp-env.xml (diff)