diff options
43 files changed, 511 insertions, 468 deletions
diff --git a/etc/profile.jogl b/etc/profile.jogl index 1177aaa49..4402adde6 100755 --- a/etc/profile.jogl +++ b/etc/profile.jogl @@ -30,12 +30,12 @@ uname -a | grep -i LINUX && OSS=x11 uname -a | grep -i Darwin && OSS=osx uname -a | grep -i CYGWIN && OSS=win -JOGL_TEST="jogl.test.jar" +JOGL_TEST="jogl-test.jar" -JOGL_JAR_ALL="jogl.all.jar" -JOGL_JAR_ALL_NOAWT="jogl.all-noawt.jar" -JOGL_JAR_ALL_MOBILE="jogl.all-mobile.jar" -JOGL_JAR_SWT="atomic/jogl.swt.jar" +JOGL_JAR_ALL="jogl-all.jar" +JOGL_JAR_ALL_NOAWT="jogl-all-noawt.jar" +JOGL_JAR_ALL_MOBILE="jogl-all-mobile.jar" +JOGL_JAR_SWT="atomic/jogl-swt.jar" JOGL_LIB_ALL="libnativewindow_x11.so libnativewindow_awt.so libjogl_desktop.so libjogl_mobile.so libjogl_cg.so libnewt.so" JOGL_LIB_ALL_NOAWT="libnativewindow_x11.so libjogl_desktop.so libjogl_mobile.so libjogl_cg.so libnewt.so" @@ -76,8 +76,8 @@ export JOGL_LIB_DIR JOGL_ALL_AWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL $JOGL_TEST) JOGL_ALL_NOAWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_NOAWT $JOGL_TEST) -JOGL_MOBILE_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_MOBILE) -JOGL_SWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_SWT) +JOGL_MOBILE_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_MOBILE $JOGL_TEST) +JOGL_SWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_SWT $JOGL_TEST) export JOGL_ALL_AWT_CLASSPATH JOGL_ALL_NOAWT_CLASSPATH JOGL_MOBILE_CLASSPATH JOGL_SWT_CLASSPATH if [ ! -z "$JOGL_PROFILE" ] ; then diff --git a/jnlp-files/atomic/jogl-awt.jnlp b/jnlp-files/atomic/jogl-awt.jnlp index a33eb35a6..8f15a6c58 100644 --- a/jnlp-files/atomic/jogl-awt.jnlp +++ b/jnlp-files/atomic/jogl-awt.jnlp @@ -14,83 +14,83 @@ <all-permissions/> </security> <resources> - <jar href="jar/atomic/jogl.core.jar" /> - <jar href="jar/atomic/jogl.sdk.jar" /> - <jar href="jar/atomic/jogl.util.jar" /> - <jar href="jar/atomic/jogl.awt.jar" /> - <jar href="jar/atomic/jogl.util.awt.jar" /> - <jar href="jar/atomic/jogl.glutess.jar" /> - <jar href="jar/atomic/jogl.glumipmap.jar" /> - <jar href="jar/atomic/jogl.gldesktop.jar" /> - <jar href="jar/atomic/jogl.gldesktop.dbg.jar" /> - <jar href="jar/atomic/jogl.glugldesktop.jar" /> - <jar href="jar/atomic/jogl.util.gldesktop.jar" /> + <jar href="jar/atomic/jogl-core.jar" /> + <jar href="jar/atomic/jogl-sdk.jar" /> + <jar href="jar/atomic/jogl-util.jar" /> + <jar href="jar/atomic/jogl-awt.jar" /> + <jar href="jar/atomic/jogl-util.awt.jar" /> + <jar href="jar/atomic/jogl-glutess.jar" /> + <jar href="jar/atomic/jogl-glumipmap.jar" /> + <jar href="jar/atomic/jogl-gldesktop.jar" /> + <jar href="jar/atomic/jogl-gldesktop-dbg.jar" /> + <jar href="jar/atomic/jogl-glu-gldesktop.jar" /> + <jar href="jar/atomic/jogl-util-gldesktop.jar" /> <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow-awt.jnlp" /> </resources> <resources os="Windows" arch="x86"> - <jar href="jar/atomic/jogl.os.win.jar" /> + <jar href="jar/atomic/jogl-os-win.jar" /> <nativelib href = "jar/atomic/jogl-natives-windows-i586.jar" /> </resources> <resources os="Windows" arch="amd64"> - <jar href="jar/atomic/jogl.os.win.jar" /> + <jar href="jar/atomic/jogl-os-win.jar" /> <nativelib href = "jar/atomic/jogl-natives-windows-amd64.jar" /> </resources> <resources os="Windows" arch="x86_64"> - <jar href="jar/atomic/jogl.os.win.jar" /> + <jar href="jar/atomic/jogl-os-win.jar" /> <nativelib href = "jar/atomic/jogl-natives-windows-amd64.jar" /> </resources> <resources os="SunOS" arch="sparc"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-sparc.jar" /> </resources> <resources os="SunOS" arch="sparcv9"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-sparcv9.jar" /> </resources> <resources os="SunOS" arch="x86"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-i586.jar" /> </resources> <resources os="SunOS" arch="amd64"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-amd64.jar" /> </resources> <resources os="SunOS" arch="x86_64"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-amd64.jar" /> </resources> <resources os="Linux" arch="i386"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="x86"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="amd64"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="x86_64"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-armv7.jar" /> </resources> <resources os="Linux" arch="armv7"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-armv7.jar" /> </resources> <resources os="Mac OS X" arch="i386"> - <jar href="jar/atomic/jogl.os.osx.jar" /> + <jar href="jar/atomic/jogl-os-osx.jar" /> <nativelib href = "jar/atomic/jogl-natives-macosx-universal.jar" /> </resources> <resources os="Mac OS X" arch="x86_64"> - <jar href="jar/atomic/jogl.os.osx.jar" /> + <jar href="jar/atomic/jogl-os-osx.jar" /> <nativelib href = "jar/atomic/jogl-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/atomic/jogl-noawt.jnlp b/jnlp-files/atomic/jogl-noawt.jnlp index 3463a1965..91a1fe89b 100644 --- a/jnlp-files/atomic/jogl-noawt.jnlp +++ b/jnlp-files/atomic/jogl-noawt.jnlp @@ -14,81 +14,81 @@ <all-permissions/> </security> <resources> - <jar href="jar/atomic/jogl.core.jar" /> - <jar href="jar/atomic/jogl.sdk.jar" /> - <jar href="jar/atomic/jogl.util.jar" /> - <jar href="jar/atomic/jogl.glutess.jar" /> - <jar href="jar/atomic/jogl.glumipmap.jar" /> - <jar href="jar/atomic/jogl.gldesktop.jar" /> - <jar href="jar/atomic/jogl.gldesktop.dbg.jar" /> - <jar href="jar/atomic/jogl.glugldesktop.jar" /> - <jar href="jar/atomic/jogl.util.gldesktop.jar" /> + <jar href="jar/atomic/jogl-core.jar" /> + <jar href="jar/atomic/jogl-sdk.jar" /> + <jar href="jar/atomic/jogl-util.jar" /> + <jar href="jar/atomic/jogl-glutess.jar" /> + <jar href="jar/atomic/jogl-glumipmap.jar" /> + <jar href="jar/atomic/jogl-gldesktop.jar" /> + <jar href="jar/atomic/jogl-gldesktop-dbg.jar" /> + <jar href="jar/atomic/jogl-glu-gldesktop.jar" /> + <jar href="jar/atomic/jogl-util-gldesktop.jar" /> <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow-noawt.jnlp" /> </resources> <resources os="Windows" arch="x86"> - <jar href="jar/atomic/jogl.os.win.jar" /> + <jar href="jar/atomic/jogl-os-win.jar" /> <nativelib href = "jar/atomic/jogl-natives-windows-i586.jar" /> </resources> <resources os="Windows" arch="amd64"> - <jar href="jar/atomic/jogl.os.win.jar" /> + <jar href="jar/atomic/jogl-os-win.jar" /> <nativelib href = "jar/atomic/jogl-natives-windows-amd64.jar" /> </resources> <resources os="Windows" arch="x86_64"> - <jar href="jar/atomic/jogl.os.win.jar" /> + <jar href="jar/atomic/jogl-os-win.jar" /> <nativelib href = "jar/atomic/jogl-natives-windows-amd64.jar" /> </resources> <resources os="SunOS" arch="sparc"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-sparc.jar" /> </resources> <resources os="SunOS" arch="sparcv9"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-sparcv9.jar" /> </resources> <resources os="SunOS" arch="x86"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-i586.jar" /> </resources> <resources os="SunOS" arch="amd64"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-amd64.jar" /> </resources> <resources os="SunOS" arch="x86_64"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-solaris-amd64.jar" /> </resources> <resources os="Linux" arch="i386"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="x86"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="amd64"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="x86_64"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-armv7.jar" /> </resources> <resources os="Linux" arch="armv7"> - <jar href="jar/atomic/jogl.os.x11.jar" /> + <jar href="jar/atomic/jogl-os-x11.jar" /> <nativelib href = "jar/atomic/jogl-natives-linux-armv7.jar" /> </resources> <resources os="Mac OS X" arch="i386"> - <jar href="jar/atomic/jogl.os.osx.jar" /> + <jar href="jar/atomic/jogl-os-osx.jar" /> <nativelib href = "jar/atomic/jogl-natives-macosx-universal.jar" /> </resources> <resources os="Mac OS X" arch="x86_64"> - <jar href="jar/atomic/jogl.os.osx.jar" /> + <jar href="jar/atomic/jogl-os-osx.jar" /> <nativelib href = "jar/atomic/jogl-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/atomic/nativewindow-awt.jnlp b/jnlp-files/atomic/nativewindow-awt.jnlp index db80b644f..a993ab14a 100644 --- a/jnlp-files/atomic/nativewindow-awt.jnlp +++ b/jnlp-files/atomic/nativewindow-awt.jnlp @@ -14,57 +14,72 @@ <all-permissions/> </security> <resources> - <jar href="jar/atomic/nativewindow.core.jar" /> - <jar href="jar/atomic/nativewindow.awt.jar"/> + <jar href="jar/atomic/nativewindow-core.jar" /> + <jar href="jar/atomic/nativewindow-awt.jar"/> <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> </resources> <resources os="Windows" arch="x86"> + <jar href="jar/atomic/nativewindow-os-win.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-windows-i586.jar" /> </resources> <resources os="Windows" arch="amd64"> + <jar href="jar/atomic/nativewindow-os-win.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-windows-amd64.jar" /> </resources> <resources os="Windows" arch="x86_64"> + <jar href="jar/atomic/nativewindow-os-win.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-windows-amd64.jar" /> </resources> <resources os="SunOS" arch="sparc"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-sparc.jar" /> </resources> <resources os="SunOS" arch="sparcv9"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-sparcv9.jar" /> </resources> <resources os="SunOS" arch="x86"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-i586.jar" /> </resources> <resources os="SunOS" arch="amd64"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-amd64.jar" /> </resources> <resources os="SunOS" arch="x86_64"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-amd64.jar" /> </resources> <resources os="Linux" arch="i386"> <nativelib href = "jar/atomic/nativewindow-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="x86"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="amd64"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="x86_64"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-armv7.jar" /> </resources> <resources os="Linux" arch="armv7"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-armv7.jar" /> </resources> <resources os="Mac OS X" arch="i386"> + <jar href="jar/atomic/nativewindow-os-osx.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-macosx-universal.jar" /> </resources> <resources os="Mac OS X" arch="x86_64"> + <jar href="jar/atomic/nativewindow-os-osx.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/atomic/nativewindow-noawt.jnlp b/jnlp-files/atomic/nativewindow-noawt.jnlp index fed731042..5cd4872dc 100644 --- a/jnlp-files/atomic/nativewindow-noawt.jnlp +++ b/jnlp-files/atomic/nativewindow-noawt.jnlp @@ -14,68 +14,72 @@ <all-permissions/> </security> <resources> - <jar href="jar/atomic/nativewindow.core.jar" /> + <jar href="jar/atomic/nativewindow-core.jar" /> <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> </resources> <resources os="Windows" arch="x86"> - <jar href="jar/atomic/nativewindow.os.win.jar" /> + <jar href="jar/atomic/nativewindow-os-win.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-windows-i586.jar" /> </resources> <resources os="Windows" arch="amd64"> - <jar href="jar/atomic/nativewindow.os.win.jar" /> + <jar href="jar/atomic/nativewindow-os-win.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-windows-amd64.jar" /> </resources> <resources os="Windows" arch="x86_64"> - <jar href="jar/atomic/nativewindow.os.win.jar" /> + <jar href="jar/atomic/nativewindow-os-win.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-windows-amd64.jar" /> </resources> <resources os="SunOS" arch="sparc"> - <jar href="jar/atomic/nativewindow.os.x11.jar" /> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-sparc.jar" /> </resources> <resources os="SunOS" arch="sparcv9"> - <jar href="jar/atomic/nativewindow.os.x11.jar" /> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-sparcv9.jar" /> </resources> <resources os="SunOS" arch="x86"> - <jar href="jar/atomic/nativewindow.os.x11.jar" /> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-i586.jar" /> </resources> <resources os="SunOS" arch="amd64"> - <jar href="jar/atomic/nativewindow.os.x11.jar" /> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-amd64.jar" /> </resources> <resources os="SunOS" arch="x86_64"> - <jar href="jar/atomic/nativewindow.os.x11.jar" /> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-solaris-amd64.jar" /> </resources> <resources os="Linux" arch="i386"> - <jar href="jar/atomic/nativewindow.os.x11.jar" /> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="x86"> - <jar href="jar/atomic/nativewindow.os.x11.jar" /> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="amd64"> - <jar href="jar/atomic/nativewindow.os.x11.jar" /> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="x86_64"> - <jar href="jar/atomic/nativewindow.os.x11.jar" /> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-armv7.jar" /> </resources> <resources os="Linux" arch="armv7"> + <jar href="jar/atomic/nativewindow-os-x11.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-linux-armv7.jar" /> </resources> <resources os="Mac OS X" arch="i386"> + <jar href="jar/atomic/nativewindow-os-osx.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-macosx-universal.jar" /> </resources> <resources os="Mac OS X" arch="x86_64"> + <jar href="jar/atomic/nativewindow-os-osx.jar" /> <nativelib href = "jar/atomic/nativewindow-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/atomic/newt-awt-jogl.jnlp b/jnlp-files/atomic/newt-awt-jogl.jnlp index 69406e43c..0a43128bb 100644 --- a/jnlp-files/atomic/newt-awt-jogl.jnlp +++ b/jnlp-files/atomic/newt-awt-jogl.jnlp @@ -14,50 +14,50 @@ <all-permissions/> </security> <resources> - <jar href="jar/atomic/newt.core.jar" /> - <jar href="jar/atomic/newt.ogl.jar" /> - <jar href="jar/atomic/newt.awt.jar" /> + <jar href="jar/atomic/newt-core.jar" /> + <jar href="jar/atomic/newt-ogl.jar" /> + <jar href="jar/atomic/newt-awt.jar" /> <extension name="jogl-awt" href="JOGL_CODEBASE_TAG/jogl-awt.jnlp" /> </resources> <resources os="Windows" arch="x86"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-i586.jar" /> </resources> <resources os="Windows" arch="amd64"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" /> </resources> <resources os="Windows" arch="x86_64"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" /> </resources> <resources os="SunOS" arch="sparc"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-sparc.jar" /> </resources> <resources os="SunOS" arch="sparcv9"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-sparcv9.jar" /> </resources> <resources os="SunOS" arch="x86"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-i586.jar" /> </resources> <resources os="SunOS" arch="amd64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" /> </resources> <resources os="SunOS" arch="x86_64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" /> </resources> <resources os="Linux" arch="i386"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="x86"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="amd64"> @@ -65,23 +65,23 @@ <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="x86_64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" /> </resources> <resources os="Linux" arch="armv7"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" /> </resources> <resources os="Mac OS X" arch="i386"> - <jar href="jar/atomic/newt.driver.osx.jar" /> + <jar href="jar/atomic/newt-driver-osx.jar" /> <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" /> </resources> <resources os="Mac OS X" arch="x86_64"> - <jar href="jar/atomic/newt.driver.osx.jar" /> + <jar href="jar/atomic/newt-driver-osx.jar" /> <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/atomic/newt-awt.jnlp b/jnlp-files/atomic/newt-awt.jnlp index 26e45e3fc..6e46b82a4 100644 --- a/jnlp-files/atomic/newt-awt.jnlp +++ b/jnlp-files/atomic/newt-awt.jnlp @@ -14,71 +14,73 @@ <all-permissions/> </security> <resources> - <jar href="jar/atomic/newt.core.jar" /> - <jar href="jar/atomic/newt.awt.jar" /> + <jar href="jar/atomic/newt-core.jar" /> + <jar href="jar/atomic/newt-awt.jar" /> <extension name="nativewindow-awt" href="JOGL_CODEBASE_TAG/nativewindow-awt.jnlp" /> </resources> <resources os="Windows" arch="x86"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-i586.jar" /> </resources> <resources os="Windows" arch="amd64"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" /> </resources> <resources os="Windows" arch="x86_64"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" /> </resources> <resources os="SunOS" arch="sparc"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-sparc.jar" /> </resources> <resources os="SunOS" arch="sparcv9"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-sparcv9.jar" /> </resources> <resources os="SunOS" arch="x86"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-i586.jar" /> </resources> <resources os="SunOS" arch="amd64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" /> </resources> <resources os="SunOS" arch="x86_64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" /> </resources> <resources os="Linux" arch="i386"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="x86"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="amd64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="x86_64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" /> </resources> <resources os="Linux" arch="armv7"> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" /> </resources> <resources os="Mac OS X" arch="i386"> - <jar href="jar/atomic/newt.driver.osx.jar" /> + <jar href="jar/atomic/newt-driver-osx.jar" /> <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" /> </resources> <resources os="Mac OS X" arch="x86_64"> - <jar href="jar/atomic/newt.driver.osx.jar" /> + <jar href="jar/atomic/newt-driver-osx.jar" /> <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/atomic/newt-noawt-jogl.jnlp b/jnlp-files/atomic/newt-noawt-jogl.jnlp index ced8b29c7..5b671edcd 100644 --- a/jnlp-files/atomic/newt-noawt-jogl.jnlp +++ b/jnlp-files/atomic/newt-noawt-jogl.jnlp @@ -14,73 +14,73 @@ <all-permissions/> </security> <resources> - <jar href="jar/atomic/newt.core.jar" /> - <jar href="jar/atomic/newt.ogl.jar" /> + <jar href="jar/atomic/newt-core.jar" /> + <jar href="jar/atomic/newt-ogl.jar" /> <extension name="jogl-noawt" href="JOGL_CODEBASE_TAG/jogl-noawt.jnlp" /> </resources> <resources os="Windows" arch="x86"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-i586.jar" /> </resources> <resources os="Windows" arch="amd64"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" /> </resources> <resources os="Windows" arch="x86_64"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" /> </resources> <resources os="SunOS" arch="sparc"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-sparc.jar" /> </resources> <resources os="SunOS" arch="sparcv9"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-sparcv9.jar" /> </resources> <resources os="SunOS" arch="x86"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-i586.jar" /> </resources> <resources os="SunOS" arch="amd64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" /> </resources> <resources os="SunOS" arch="x86_64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" /> </resources> <resources os="Linux" arch="i386"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="x86"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="amd64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="x86_64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" /> </resources> <resources os="Linux" arch="armv7"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" /> </resources> <resources os="Mac OS X" arch="i386"> - <jar href="jar/atomic/newt.driver.osx.jar" /> + <jar href="jar/atomic/newt-driver-osx.jar" /> <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" /> </resources> <resources os="Mac OS X" arch="x86_64"> - <jar href="jar/atomic/newt.driver.osx.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/atomic/newt-noawt.jnlp b/jnlp-files/atomic/newt-noawt.jnlp index 1616dff88..1161d7a9c 100644 --- a/jnlp-files/atomic/newt-noawt.jnlp +++ b/jnlp-files/atomic/newt-noawt.jnlp @@ -14,56 +14,56 @@ <all-permissions/> </security> <resources> - <jar href="jar/atomic/newt.core.jar" /> + <jar href="jar/atomic/newt-core.jar" /> <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow-noawt.jnlp" /> </resources> <resources os="Windows" arch="x86"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-i586.jar" /> </resources> <resources os="Windows" arch="amd64"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" /> </resources> <resources os="Windows" arch="x86_64"> - <jar href="jar/atomic/newt.driver.win.jar" /> + <jar href="jar/atomic/newt-driver-win.jar" /> <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" /> </resources> <resources os="SunOS" arch="sparc"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-sparc.jar" /> </resources> <resources os="SunOS" arch="sparcv9"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-sparcv9.jar" /> </resources> <resources os="SunOS" arch="x86"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-i586.jar" /> </resources> <resources os="SunOS" arch="amd64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" /> </resources> <resources os="SunOS" arch="x86_64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" /> </resources> <resources os="Linux" arch="i386"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="x86"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="amd64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="x86_64"> - <jar href="jar/atomic/newt.driver.x11.jar" /> + <jar href="jar/atomic/newt-driver-x11.jar" /> <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> @@ -73,11 +73,11 @@ <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" /> </resources> <resources os="Mac OS X" arch="i386"> - <jar href="jar/atomic/newt.driver.osx.jar" /> + <jar href="jar/atomic/newt-driver-osx.jar" /> <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" /> </resources> <resources os="Mac OS X" arch="x86_64"> - <jar href="jar/atomic/newt.driver.osx.jar" /> + <jar href="jar/atomic/newt-driver-osx.jar" /> <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/jogl-all-awt-cg.jnlp b/jnlp-files/jogl-all-awt-cg.jnlp index 18f8f498e..24c22c290 100644 --- a/jnlp-files/jogl-all-awt-cg.jnlp +++ b/jnlp-files/jogl-all-awt-cg.jnlp @@ -14,75 +14,75 @@ <all-permissions/> </security> <resources> - <jar href="jar/jogl.all.jar" /> - <jar href="jar/atomic/jogl.cg.jar" /> + <jar href="jar/jogl-all.jar" /> + <jar href="jar/atomic/jogl-cg.jar" /> <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> </resources> <resources os="Windows" arch="x86"> <nativelib href = "jar/jogl-all-natives-windows-i586.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-windows-i586.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-windows-i586.jar" /> </resources> <resources os="Windows" arch="amd64"> <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-windows-amd64.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-windows-amd64.jar" /> </resources> <resources os="Windows" arch="x86_64"> <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-windows-amd64.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-windows-amd64.jar" /> </resources> <resources os="SunOS" arch="sparc"> <nativelib href = "jar/jogl-all-natives-solaris-sparc.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-solaris-sparc.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-solaris-sparc.jar" /> </resources> <resources os="SunOS" arch="sparcv9"> <nativelib href = "jar/jogl-all-natives-solaris-sparcv9.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-solaris-sparcv9.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-solaris-sparcv9.jar" /> </resources> <resources os="SunOS" arch="x86"> <nativelib href = "jar/jogl-all-natives-solaris-i586.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-solaris-i586.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-solaris-i586.jar" /> </resources> <resources os="SunOS" arch="amd64"> <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-solaris-amd64.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-solaris-amd64.jar" /> </resources> <resources os="SunOS" arch="x86_64"> <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-solaris-amd64.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-solaris-amd64.jar" /> </resources> <resources os="Linux" arch="i386"> <nativelib href = "jar/jogl-all-natives-linux-i586.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-linux-i586.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="x86"> <nativelib href = "jar/jogl-all-natives-linux-i586.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-linux-i586.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-i586.jar" /> </resources> <resources os="Linux" arch="amd64"> <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-linux-amd64.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="x86_64"> <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-linux-amd64.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-linux-armv7.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-armv7.jar" /> </resources> <resources os="Linux" arch="armv7"> <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-linux-armv7.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-armv7.jar" /> </resources> <resources os="Mac OS X" arch="i386"> <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-macosx-universal.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-macosx-universal.jar" /> </resources> <resources os="Mac OS X" arch="x86_64"> <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" /> - <nativelib href = "jar/atomic/jogl_cg-natives-macosx-universal.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-macosx-universal.jar" /> </resources> <component-desc /> diff --git a/jnlp-files/jogl-all-awt.jnlp b/jnlp-files/jogl-all-awt.jnlp index 55ae21d2a..4e05f8dac 100644 --- a/jnlp-files/jogl-all-awt.jnlp +++ b/jnlp-files/jogl-all-awt.jnlp @@ -14,7 +14,7 @@ <all-permissions/> </security> <resources> - <jar href="jar/jogl.all.jar" /> + <jar href="jar/jogl-all.jar" /> <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> </resources> diff --git a/jnlp-files/jogl-all-mobile.jnlp b/jnlp-files/jogl-all-mobile.jnlp index 5f96137c2..43b9b3b09 100644 --- a/jnlp-files/jogl-all-mobile.jnlp +++ b/jnlp-files/jogl-all-mobile.jnlp @@ -14,7 +14,7 @@ <all-permissions/> </security> <resources> - <jar href="jar/jogl.all-mobile.jar" /> + <jar href="jar/jogl-all-mobile.jar" /> <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> </resources> diff --git a/jnlp-files/jogl-all-noawt.jnlp b/jnlp-files/jogl-all-noawt.jnlp index 63f558d38..eed6749c1 100644 --- a/jnlp-files/jogl-all-noawt.jnlp +++ b/jnlp-files/jogl-all-noawt.jnlp @@ -14,7 +14,7 @@ <all-permissions/> </security> <resources> - <jar href="jar/jogl.all-noawt.jar" /> + <jar href="jar/jogl-all-noawt.jar" /> <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> </resources> diff --git a/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer-napplet.html b/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer-napplet.html index 3b77157c6..19a3b2965 100644 --- a/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer-napplet.html +++ b/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer-napplet.html @@ -14,8 +14,8 @@ Demoscene Passivist's Elektronen-Multiplizierer width="640" height="480"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.ElektronenMultiplizierer"> <param name="gl_profile" value="GL2ES2"> @@ -28,8 +28,8 @@ Demoscene Passivist's Elektronen-Multiplizierer type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" java_arguments="-Dsun.java2d.noddraw=true" gl_event_listener_class="com.jogamp.opengl.test.junit.jogl.demos.es2.ElektronenMultiplizierer" diff --git a/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer.html b/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer.html index 2a500c9e6..71c9baff8 100644 --- a/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer.html +++ b/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer.html @@ -15,8 +15,8 @@ Demoscene Passivist's Elektronen-Multiplizierer <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="subapplet.displayname" value="ElektronenMultiplizierer"> @@ -38,8 +38,8 @@ Demoscene Passivist's Elektronen-Multiplizierer pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" subapplet.classname="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run" subapplet.displayname="ElektronenMultiplizierer" diff --git a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-napplet.html b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-napplet.html index 59115ca36..9648b57da 100644 --- a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-napplet.html +++ b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-napplet.html @@ -14,8 +14,8 @@ JOGL Graph Text Demo 01 width="800" height="400"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.graph.demos.GPUTextGLListener0A"> <param name="gl_profile" value="GL2ES2"> @@ -31,8 +31,8 @@ JOGL Graph Text Demo 01 type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" java_arguments="-Dsun.java2d.noddraw=true" gl_event_listener_class="com.jogamp.opengl.test.junit.graph.demos.GPUTextGLListener0A" gl_profile="GL2ES2" diff --git a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html index 1c7d3472b..489984b4f 100644 --- a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html +++ b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html @@ -15,8 +15,8 @@ JOGL Graph Text Demo 01 <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="subapplet.displayname" value="JOGL Graph Text Demo01"> @@ -41,8 +41,8 @@ JOGL Graph Text Demo 01 pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" subapplet.classname="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run" subapplet.displayname="JOGL Graph Text Demo01" diff --git a/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01-napplet.html b/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01-napplet.html index 6efeefc10..8f9783f03 100644 --- a/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01-napplet.html +++ b/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01-napplet.html @@ -14,8 +14,8 @@ JOGL Graph UI-Scene Demo 01 width="640" height="480"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.graph.demos.GPUUISceneGLListener0A"> <param name="gl_profile" value="GL2ES2"> @@ -30,8 +30,8 @@ JOGL Graph UI-Scene Demo 01 type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" java_arguments="-Dsun.java2d.noddraw=true" gl_event_listener_class="com.jogamp.opengl.test.junit.graph.demos.GPUUISceneGLListener0A" gl_profile="GL2ES2" diff --git a/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01.html b/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01.html index 6b32b11e7..429e80311 100644 --- a/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01.html +++ b/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01.html @@ -15,8 +15,8 @@ JOGL Graph UI-Scene Demo 01 <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="subapplet.displayname" value="JOGL Graph UI Demo01"> @@ -40,8 +40,8 @@ JOGL Graph UI-Scene Demo 01 pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" subapplet.classname="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run" subapplet.displayname="JOGL Graph UI Demo01" diff --git a/jnlp-files/jogl-applet-runner-newt-MovieCube-napplet.html b/jnlp-files/jogl-applet-runner-newt-MovieCube-napplet.html index def7b72b9..f569c7c96 100644 --- a/jnlp-files/jogl-applet-runner-newt-MovieCube-napplet.html +++ b/jnlp-files/jogl-applet-runner-newt-MovieCube-napplet.html @@ -14,8 +14,8 @@ JogAmp's MovieCube - GLMediaPlayer Demo 01 width="510" height="300"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube"> <param name="gl_profile" value="GL2ES2"> @@ -28,8 +28,8 @@ JogAmp's MovieCube - GLMediaPlayer Demo 01 type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" java_arguments="-Dsun.java2d.noddraw=true" gl_event_listener_class="com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube" diff --git a/jnlp-files/jogl-applet-runner-newt-MovieCube.html b/jnlp-files/jogl-applet-runner-newt-MovieCube.html index 6b1654ed7..7cb00244e 100644 --- a/jnlp-files/jogl-applet-runner-newt-MovieCube.html +++ b/jnlp-files/jogl-applet-runner-newt-MovieCube.html @@ -15,8 +15,8 @@ JogAmp's MovieCube - GLMediaPlayer Demo 01 <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="subapplet.displayname" value="MovieCube"> @@ -38,8 +38,8 @@ JogAmp's MovieCube - GLMediaPlayer Demo 01 pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" subapplet.classname="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run" subapplet.displayname="MovieCube" diff --git a/jnlp-files/jogl-applet-runner-newt-gears-normal-launcheronly.html b/jnlp-files/jogl-applet-runner-newt-gears-normal-launcheronly.html index 91e989346..a9e42d342 100644 --- a/jnlp-files/jogl-applet-runner-newt-gears-normal-launcheronly.html +++ b/jnlp-files/jogl-applet-runner-newt-gears-normal-launcheronly.html @@ -21,8 +21,8 @@ JOGL NEWT JNLP Applet Runner Special Keys:<br> <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="subapplet.displayname" value="JOGL GearsES2 Applet"> @@ -43,8 +43,8 @@ JOGL NEWT JNLP Applet Runner Special Keys:<br> pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" subapplet.classname="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run" subapplet.displayname="JOGL GearsES2 Applet" @@ -75,8 +75,8 @@ The applet above is instantiated with the following code: <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="subapplet.displayname" value="JOGL GearsES2 Applet"> @@ -97,8 +97,8 @@ The applet above is instantiated with the following code: pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" subapplet.classname="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run" subapplet.displayname="JOGL GearsES2 Applet" diff --git a/jnlp-files/jogl-applet-runner-newt-gears-normal-napplet.html b/jnlp-files/jogl-applet-runner-newt-gears-normal-napplet.html index 9db6d8cc2..37473befe 100644 --- a/jnlp-files/jogl-applet-runner-newt-gears-normal-napplet.html +++ b/jnlp-files/jogl-applet-runner-newt-gears-normal-napplet.html @@ -20,8 +20,8 @@ JOGL NEWT Applet Runner Special Keys:<br> width="200" height="200"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2"> <param name="gl_profile" value="GL2ES2"> @@ -34,8 +34,8 @@ JOGL NEWT Applet Runner Special Keys:<br> type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" java_arguments="-Dsun.java2d.noddraw=true" gl_event_listener_class="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2" gl_profile="GL2ES2" @@ -58,8 +58,8 @@ The applet above is instantiated with the following code: width="200" height="200"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2"> <param name="gl_profile" value="GL2ES2"> @@ -72,8 +72,8 @@ The applet above is instantiated with the following code: type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" java_arguments="-Dsun.java2d.noddraw=true" gl_event_listener_class="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2" gl_profile="GL2ES2" @@ -90,7 +90,7 @@ The applet above is instantiated with the following code: </P> <P> -Note that the jogl.test.jar, which contains the test applet class, +Note that the jogl-test.jar, which contains the test applet class, <B>does not need to be signed</B>! JogAmp Community signs jogl.jar and gluegen-rt.jar, which contain JOGL's supporting classes; this is the only diff --git a/jnlp-files/jogl-applet-runner-newt-gears-normal-napplet2.html b/jnlp-files/jogl-applet-runner-newt-gears-normal-napplet2.html index ba2f69ef4..63df4ed60 100644 --- a/jnlp-files/jogl-applet-runner-newt-gears-normal-napplet2.html +++ b/jnlp-files/jogl-applet-runner-newt-gears-normal-napplet2.html @@ -21,8 +21,8 @@ If Applet is out of browser window, it is closeable. width="200" height="200"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2"> <param name="gl_profile" value="GL2ES2"> @@ -36,8 +36,8 @@ If Applet is out of browser window, it is closeable. type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" java_arguments="-Dsun.java2d.noddraw=true" gl_event_listener_class="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2" gl_profile="GL2ES2" @@ -61,8 +61,8 @@ The applet above is instantiated with the following code: width="200" height="200"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2"> <param name="gl_profile" value="GL2ES2"> @@ -76,8 +76,8 @@ The applet above is instantiated with the following code: type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" java_arguments="-Dsun.java2d.noddraw=true" gl_event_listener_class="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2" gl_profile="GL2ES2" @@ -95,7 +95,7 @@ The applet above is instantiated with the following code: </P> <P> -Note that the jogl.test.jar, which contains the test applet class, +Note that the jogl-test.jar, which contains the test applet class, <B>does not need to be signed</B>! JogAmp Community signs jogl.jar and gluegen-rt.jar, which contain JOGL's supporting classes; this is the only diff --git a/jnlp-files/jogl-applet-runner-newt-gears-normal.html b/jnlp-files/jogl-applet-runner-newt-gears-normal.html index c8d654dbc..a6dd16a0c 100644 --- a/jnlp-files/jogl-applet-runner-newt-gears-normal.html +++ b/jnlp-files/jogl-applet-runner-newt-gears-normal.html @@ -35,8 +35,8 @@ JOGL NEWT JNLP Applet Runner Special Keys:<br> <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="subapplet.displayname" value="JOGL GearsES2 Applet"> @@ -58,8 +58,8 @@ JOGL NEWT JNLP Applet Runner Special Keys:<br> pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" subapplet.classname="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run" subapplet.displayname="JOGL GearsES2 Applet" @@ -91,8 +91,8 @@ The applet above is instantiated with the following code: <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="subapplet.displayname" value="JOGL GearsES2 Applet"> @@ -114,8 +114,8 @@ The applet above is instantiated with the following code: pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" subapplet.classname="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run" subapplet.displayname="JOGL GearsES2 Applet" @@ -154,7 +154,7 @@ Where the referenced JNLP file <em>jogl-applet-runner-newt.jnlp</em> looks as fo <resources> <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/> <property name="sun.java2d.noddraw" value="true"/> - <jar href="jar/jogl.test.jar" main="true"/> + <jar href="jar/jogl-test.jar" main="true"/> <extension name="jogl-all-awt" href="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp" /> </resources> @@ -170,7 +170,7 @@ Where the referenced JNLP file <em>jogl-applet-runner-newt.jnlp</em> looks as fo </P> <P> -Note that the jogl.test.jar, which contains the test applet class, +Note that the jogl-test.jar, which contains the test applet class, <B>does not need to be signed</B>! JogAmp Community signs applet-launcher.jar, jogl.jar and gluegen-rt.jar, which contain the JNLPAppletLauncher and JOGL's supporting classes; this is the only diff --git a/jnlp-files/jogl-applet-runner-newt-gears-special-napplet.html b/jnlp-files/jogl-applet-runner-newt-gears-special-napplet.html index 3c1895b45..7df167844 100644 --- a/jnlp-files/jogl-applet-runner-newt-gears-special-napplet.html +++ b/jnlp-files/jogl-applet-runner-newt-gears-special-napplet.html @@ -11,8 +11,8 @@ JOGL NEWT JNLP Applet Runner Special Keys: width="1" height="1"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2"> <param name="gl_profile" value="GL2ES2"> @@ -32,8 +32,8 @@ JOGL NEWT JNLP Applet Runner Special Keys: type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" java_arguments="-Dsun.java2d.noddraw=true" gl_event_listener_class="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2" gl_profile="GL2ES2" diff --git a/jnlp-files/jogl-applet-runner-newt-gears-special.html b/jnlp-files/jogl-applet-runner-newt-gears-special.html index dcbe898e2..0f5911414 100644 --- a/jnlp-files/jogl-applet-runner-newt-gears-special.html +++ b/jnlp-files/jogl-applet-runner-newt-gears-special.html @@ -12,8 +12,8 @@ JOGL NEWT JNLP Applet Runner Special Keys: <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar"> + jar/jogl-all.jar, + jar/jogl-test.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="subapplet.displayname" value="JOGL GearsES2 Applet Transparent"> @@ -42,8 +42,8 @@ JOGL NEWT JNLP Applet Runner Special Keys: pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar, - jar/jogl.test.jar" + jar/jogl-all.jar, + jar/jogl-test.jar" codebase_lookup" value="false" subapplet.classname="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run" subapplet.displayname="JOGL GearsES2 Applet Transparent" diff --git a/jnlp-files/jogl-applet-runner-newt.jnlp b/jnlp-files/jogl-applet-runner-newt.jnlp index 259e39f18..c33e1b761 100644 --- a/jnlp-files/jogl-applet-runner-newt.jnlp +++ b/jnlp-files/jogl-applet-runner-newt.jnlp @@ -12,7 +12,7 @@ <resources> <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/> <property name="sun.java2d.noddraw" value="true"/> - <jar href="jar/jogl.test.jar" main="true"/> + <jar href="jar/jogl-test.jar" main="true"/> <extension name="jogl-all-awt" href="jogl-all-awt.jnlp" /> </resources> diff --git a/jnlp-files/jogl-applet-version-lancheronly.html b/jnlp-files/jogl-applet-version-lancheronly.html index 685d9115c..6880152fc 100644 --- a/jnlp-files/jogl-applet-version-lancheronly.html +++ b/jnlp-files/jogl-applet-version-lancheronly.html @@ -20,7 +20,7 @@ and your platform. <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar"> + jar/jogl-all.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="jogamp.opengl.awt.VersionApplet"> <param name="subapplet.displayname" value="JOGL Applet Version"> @@ -36,7 +36,7 @@ and your platform. pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar" + jar/jogl-all.jar" codebase_lookup" value="false" subapplet.classname="jogamp.opengl.awt.VersionApplet" subapplet.displayname="JOGL Applet Version" diff --git a/jnlp-files/jogl-applet-version-napplet.html b/jnlp-files/jogl-applet-version-napplet.html index e8104cb60..aeccb710a 100644 --- a/jnlp-files/jogl-applet-version-napplet.html +++ b/jnlp-files/jogl-applet-version-napplet.html @@ -16,7 +16,7 @@ and your platform. width="800" height="600"> <param name="code" value="jogamp.opengl.awt.VersionApplet"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar"> + jar/jogl-all.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <comment> <embed code="jogamp.opengl.awt.VersionApplet" @@ -24,7 +24,7 @@ and your platform. type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar" + jar/jogl-all.jar" java_arguments="-Dsun.java2d.noddraw=true"> <noembed>Sorry, no Java support detected.</noembed> </embed> @@ -41,7 +41,7 @@ The applet above is instantiated with the following code: width="800" height="600"> <param name="code" value="jogamp.opengl.awt.VersionApplet"> <param name="archive" value="jar/gluegen-rt.jar, - jar/jogl.all.jar"> + jar/jogl-all.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <comment> <embed code="jogamp.opengl.awt.VersionApplet" @@ -49,7 +49,7 @@ The applet above is instantiated with the following code: type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/gluegen-rt.jar, - jar/jogl.all.jar" + jar/jogl-all.jar" java_arguments="-Dsun.java2d.noddraw=true"> <noembed>Sorry, no Java support detected.</noembed> </embed> diff --git a/jnlp-files/jogl-applet-version.html b/jnlp-files/jogl-applet-version.html index 5b738964e..948e63095 100644 --- a/jnlp-files/jogl-applet-version.html +++ b/jnlp-files/jogl-applet-version.html @@ -22,7 +22,7 @@ otherwise it shall fallback to <a href="http://jogamp.org/applet-launcher/www/"> <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar"> + jar/jogl-all.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="jogamp.opengl.awt.VersionApplet"> <param name="subapplet.displayname" value="JOGL Applet Version"> @@ -39,7 +39,7 @@ otherwise it shall fallback to <a href="http://jogamp.org/applet-launcher/www/"> pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="jar/applet-launcher.jar, jar/gluegen-rt.jar, - jar/jogl.all.jar" + jar/jogl-all.jar" codebase_lookup" value="false" subapplet.classname="jogamp.opengl.awt.VersionApplet" subapplet.displayname="JOGL Applet Version" diff --git a/make/build-common.xml b/make/build-common.xml index 93835e0f1..b2885c8af 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -250,167 +250,168 @@ <!-- Atomic JavaSE JARS --> - <property name="nativewindow.core.jar" value="${build.nativewindow}/nativewindow.core.jar" /> - <property name="nativewindow.awt.jar" value="${build.nativewindow}/nativewindow.awt.jar" /> - <property name="nativewindow.os.x11.jar" value="${build.nativewindow}/nativewindow.os.x11.jar" /> - <property name="nativewindow.os.win.jar" value="${build.nativewindow}/nativewindow.os.win.jar" /> - <property name="nativewindow.os.macosx.jar" value="${build.nativewindow}/nativewindow.os.macosx.jar" /> + <property name="nativewindow-core.jar" value="${build.nativewindow}/nativewindow-core.jar" /> + <property name="nativewindow-awt.jar" value="${build.nativewindow}/nativewindow-awt.jar" /> + <property name="nativewindow-os-x11.jar" value="${build.nativewindow}/nativewindow-os-x11.jar" /> + <property name="nativewindow-os-win.jar" value="${build.nativewindow}/nativewindow-os-win.jar" /> + <property name="nativewindow-os-osx.jar" value="${build.nativewindow}/nativewindow-os-osx.jar" /> <path id="nativewindow_all_atoms.classpath"> - <pathelement location="${nativewindow.core.jar}" /> - <pathelement location="${nativewindow.awt.jar}" /> - <pathelement location="${nativewindow.os.x11.jar}" /> - <pathelement location="${nativewindow.os.win.jar}" /> - <pathelement location="${nativewindow.os.macosx.jar}" /> + <pathelement location="${nativewindow-core.jar}" /> + <pathelement location="${nativewindow-awt.jar}" /> + <pathelement location="${nativewindow-os-x11.jar}" /> + <pathelement location="${nativewindow-os-win.jar}" /> + <pathelement location="${nativewindow-os-osx.jar}" /> </path> <path id="nativewindow_all-noawt_atoms.classpath"> - <pathelement location="${nativewindow.core.jar}" /> - <pathelement location="${nativewindow.os.x11.jar}" /> - <pathelement location="${nativewindow.os.win.jar}" /> - <pathelement location="${nativewindow.os.macosx.jar}" /> + <pathelement location="${nativewindow-core.jar}" /> + <pathelement location="${nativewindow-os-x11.jar}" /> + <pathelement location="${nativewindow-os-win.jar}" /> + <pathelement location="${nativewindow-os-osx.jar}" /> </path> <path id="nativewindow_core_atoms.classpath"> - <pathelement location="${nativewindow.core.jar}" /> + <pathelement location="${nativewindow-core.jar}" /> </path> - <property name="jogl.core.jar" value="${build.jogl}/jogl.core.jar" /> - <property name="jogl.sdk.jar" value="${build.jogl}/jogl.sdk.jar" /> - <property name="jogl.glmobile.jar" value="${build.jogl}/jogl.glmobile.jar" /> - <property name="jogl.glmobile.dbg.jar" value="${build.jogl}/jogl.glmobile.dbg.jar" /> - <property name="jogl.util.jar" value="${build.jogl}/jogl.util.jar" /> - <property name="jogl.glutess.jar" value="${build.jogl}/jogl.glu.tess.jar" /> - <property name="jogl.glumipmap.jar" value="${build.jogl}/jogl.glu.mipmap.jar" /> - <property name="jogl.util.fixedfuncemu.jar" value="${build.jogl}/jogl.util.fixedfuncemu.jar" /> - <property name="jogl.awt.jar" value="${build.jogl}/jogl.awt.jar" /> - <property name="jogl.swt.jar" value="${build.jogl}/jogl.swt.jar" /> - <property name="jogl.util.awt.jar" value="${build.jogl}/jogl.util.awt.jar" /> - <property name="jogl.os.x11.jar" value="${build.jogl}/jogl.os.x11.jar" /> - <property name="jogl.os.win.jar" value="${build.jogl}/jogl.os.win.jar" /> - <property name="jogl.os.osx.jar" value="${build.jogl}/jogl.os.osx.jar" /> - <property name="jogl.os.android.jar" value="${build.jogl}/jogl.os.android.jar" /> - <property name="jogl.gldesktop.jar" value="${build.jogl}/jogl.gldesktop.jar" /> - <property name="jogl.gldesktop.dbg.jar" value="${build.jogl}/jogl.gldesktop.dbg.jar" /> - <property name="jogl.glugldesktop.jar" value="${build.jogl}/jogl.glu.gldesktop.jar" /> - <property name="jogl.util.gldesktop.jar" value="${build.jogl}/jogl.util.gldesktop.jar" /> - <property name="jogl.omx.jar" value="${build.jogl}/jogl.omx.jar" /> - <property name="jogl.cg.jar" value="${build.jogl}/jogl.cg.jar" /> + <property name="jogl-core.jar" value="${build.jogl}/jogl-core.jar" /> + <property name="jogl-sdk.jar" value="${build.jogl}/jogl-sdk.jar" /> + <property name="jogl-glmobile.jar" value="${build.jogl}/jogl-glmobile.jar" /> + <property name="jogl-glmobile-dbg.jar" value="${build.jogl}/jogl-glmobile-dbg.jar" /> + <property name="jogl-util.jar" value="${build.jogl}/jogl-util.jar" /> + <property name="jogl-glutess.jar" value="${build.jogl}/jogl-glu-tess.jar" /> + <property name="jogl-glumipmap.jar" value="${build.jogl}/jogl-glu-mipmap.jar" /> + <property name="jogl-util-fixedfuncemu.jar" value="${build.jogl}/jogl-util-fixedfuncemu.jar" /> + <property name="jogl-awt.jar" value="${build.jogl}/jogl-awt.jar" /> + <property name="jogl-swt.jar" value="${build.jogl}/jogl-swt.jar" /> + <property name="jogl-util-awt.jar" value="${build.jogl}/jogl-util-awt.jar" /> + <property name="jogl-os-x11.jar" value="${build.jogl}/jogl-os-x11.jar" /> + <property name="jogl-os-win.jar" value="${build.jogl}/jogl-os-win.jar" /> + <property name="jogl-os-osx.jar" value="${build.jogl}/jogl-os-osx.jar" /> + <property name="jogl-os-android.jar" value="${build.jogl}/jogl-os-android.jar" /> + <property name="jogl-gldesktop.jar" value="${build.jogl}/jogl-gldesktop.jar" /> + <property name="jogl-gldesktop-dbg.jar" value="${build.jogl}/jogl-gldesktop-dbg.jar" /> + <property name="jogl-glu-gldesktop.jar" value="${build.jogl}/jogl-glu-gldesktop.jar" /> + <property name="jogl-util-gldesktop.jar" value="${build.jogl}/jogl-util-gldesktop.jar" /> + <property name="jogl-omx.jar" value="${build.jogl}/jogl-omx.jar" /> + <property name="jogl-cg.jar" value="${build.jogl}/jogl-cg.jar" /> <path id="jogl_all_atoms.classpath"> - <pathelement location="${jogl.core.jar}" /> - <pathelement location="${jogl.sdk.jar}" /> - <pathelement location="${jogl.glmobile.jar}" /> - <pathelement location="${jogl.glmobile.dbg.jar}" /> - <pathelement location="${jogl.util.jar}" /> - <pathelement location="${jogl.glutess.jar}" /> - <pathelement location="${jogl.glumipmap.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> - <pathelement location="${jogl.awt.jar}" /> - <pathelement location="${jogl.swt.jar}" /> - <pathelement location="${jogl.util.awt.jar}" /> - <pathelement location="${jogl.os.x11.jar}" /> - <pathelement location="${jogl.os.win.jar}" /> - <pathelement location="${jogl.os.osx.jar}" /> - <pathelement location="${jogl.gldesktop.jar}" /> - <pathelement location="${jogl.gldesktop.dbg.jar}" /> - <pathelement location="${jogl.glugldesktop.jar}" /> - <pathelement location="${jogl.util.gldesktop.jar}" /> - <pathelement location="${jogl.omx.jar}" /> + <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl-sdk.jar}" /> + <pathelement location="${jogl-glmobile.jar}" /> + <pathelement location="${jogl-glmobile-dbg.jar}" /> + <pathelement location="${jogl-util.jar}" /> + <pathelement location="${jogl-glutess.jar}" /> + <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-util-fixedfuncemu.jar}" /> + <pathelement location="${jogl-awt.jar}" /> + <pathelement location="${jogl-swt.jar}" /> + <pathelement location="${jogl-util-awt.jar}" /> + <pathelement location="${jogl-os-x11.jar}" /> + <pathelement location="${jogl-os-win.jar}" /> + <pathelement location="${jogl-os-osx.jar}" /> + <pathelement location="${jogl-gldesktop.jar}" /> + <pathelement location="${jogl-gldesktop-dbg.jar}" /> + <pathelement location="${jogl-glu-gldesktop.jar}" /> + <pathelement location="${jogl-util-gldesktop.jar}" /> + <pathelement location="${jogl-omx.jar}" /> </path> <path id="jogl_all-noawt_atoms.classpath"> - <pathelement location="${jogl.core.jar}" /> - <pathelement location="${jogl.sdk.jar}" /> - <pathelement location="${jogl.glmobile.jar}" /> - <pathelement location="${jogl.glmobile.dbg.jar}" /> - <pathelement location="${jogl.util.jar}" /> - <pathelement location="${jogl.glutess.jar}" /> - <pathelement location="${jogl.glumipmap.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> - <pathelement location="${jogl.os.x11.jar}" /> - <pathelement location="${jogl.os.win.jar}" /> - <pathelement location="${jogl.os.osx.jar}" /> - <pathelement location="${jogl.gldesktop.jar}" /> - <pathelement location="${jogl.gldesktop.dbg.jar}" /> - <pathelement location="${jogl.glugldesktop.jar}" /> - <pathelement location="${jogl.util.gldesktop.jar}" /> - <pathelement location="${jogl.omx.jar}" /> + <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl-sdk.jar}" /> + <pathelement location="${jogl-glmobile.jar}" /> + <pathelement location="${jogl-glmobile-dbg.jar}" /> + <pathelement location="${jogl-util.jar}" /> + <pathelement location="${jogl-glutess.jar}" /> + <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-util-fixedfuncemu.jar}" /> + <pathelement location="${jogl-os-x11.jar}" /> + <pathelement location="${jogl-os-win.jar}" /> + <pathelement location="${jogl-os-osx.jar}" /> + <pathelement location="${jogl-gldesktop.jar}" /> + <pathelement location="${jogl-gldesktop-dbg.jar}" /> + <pathelement location="${jogl-glu-gldesktop.jar}" /> + <pathelement location="${jogl-util-gldesktop.jar}" /> + <pathelement location="${jogl-omx.jar}" /> </path> <path id="jogl_all-mobile_atoms.classpath"> - <pathelement location="${jogl.core.jar}" /> - <pathelement location="${jogl.glmobile.jar}" /> - <pathelement location="${jogl.glmobile.dbg.jar}" /> - <pathelement location="${jogl.util.jar}" /> - <pathelement location="${jogl.glutess.jar}" /> - <pathelement location="${jogl.glumipmap.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> - <pathelement location="${jogl.omx.jar}" /> + <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl-glmobile.jar}" /> + <pathelement location="${jogl-glmobile-dbg.jar}" /> + <pathelement location="${jogl-util.jar}" /> + <pathelement location="${jogl-glutess.jar}" /> + <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-util-fixedfuncemu.jar}" /> + <pathelement location="${jogl-os-x11.jar}" /> + <pathelement location="${jogl-omx.jar}" /> </path> <path id="jogl_all-android_atoms.classpath"> - <pathelement location="${jogl.core.jar}" /> - <pathelement location="${jogl.glmobile.jar}" /> - <pathelement location="${jogl.glmobile.dbg.jar}" /> - <pathelement location="${jogl.util.jar}" /> - <pathelement location="${jogl.glutess.jar}" /> - <pathelement location="${jogl.glumipmap.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> - <pathelement location="${jogl.os.android.jar}" /> - <pathelement location="${jogl.omx.jar}" /> + <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl-glmobile.jar}" /> + <pathelement location="${jogl-glmobile-dbg.jar}" /> + <pathelement location="${jogl-util.jar}" /> + <pathelement location="${jogl-glutess.jar}" /> + <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-util-fixedfuncemu.jar}" /> + <pathelement location="${jogl-os-android.jar}" /> + <pathelement location="${jogl-omx.jar}" /> </path> <!-- - ${jogl.core.jar} ${jogl.glutess.jar} ${jogl.glumipmap.jar} ${jogl.glugldesktop.jar} ${jogl.os.x11.jar} ${jogl.os.win.jar} ${jogl.os.osx.jar} ${jogl.gldesktop.jar} ${jogl.gldesktop.dbg.jar} ${jogl.glmobile.jar} ${jogl.glmobile.dbg.jar} ${jogl.omx.jar} ${jogl.util.jar} ${jogl.util.gldesktop.jar} ${jogl.util.awt.jar} ${jogl.util.fixedfuncemu.jar} ${jogl.sdk.jar} --> - - <property name="newt.core.jar" value="${build.newt}/newt.core.jar" /> - <property name="newt.ogl.jar" value="${build.newt}/newt.ogl.jar" /> - <property name="newt.awt.jar" value="${build.newt}/newt.awt.jar" /> - <property name="newt.event.jar" value="${build.newt}/newt.event.jar" /> <!-- using NEWT events w/o NEWT --> - <property name="newt.driver.x11.jar" value="${build.newt}/newt.driver.x11.jar" /> - <property name="newt.driver.win.jar" value="${build.newt}/newt.driver.win.jar" /> - <property name="newt.driver.macosx.jar" value="${build.newt}/newt.driver.macosx.jar" /> - <property name="newt.driver.android.jar" value="${build.newt}/newt.driver.android.jar" /> <!-- excluded from all --> - <property name="newt.driver.kd.jar" value="${build.newt}/newt.driver.kd.jar" /> <!-- excluded from all --> - <property name="newt.driver.intelgdl.jar" value="${build.newt}/newt.driver.intelgdl.jar" /> <!-- excluded from all --> - <property name="newt.driver.broadcomegl.jar" value="${build.newt}/newt.driver.broadcomegl.jar" /> <!-- excluded from all --> + ${jogl-core.jar} ${jogl-glutess.jar} ${jogl-glumipmap.jar} ${jogl-glu-gldesktop.jar} ${jogl-os-x11.jar} ${jogl-os-win.jar} ${jogl-os-osx.jar} ${jogl-gldesktop.jar} ${jogl-gldesktop-dbg.jar} ${jogl-glmobile.jar} ${jogl-glmobile-dbg.jar} ${jogl-omx.jar} ${jogl-util.jar} ${jogl-util-gldesktop.jar} ${jogl-util-awt.jar} ${jogl-util-fixedfuncemu.jar} ${jogl-sdk.jar} --> + + <property name="newt-core.jar" value="${build.newt}/newt-core.jar" /> + <property name="newt-ogl.jar" value="${build.newt}/newt-ogl.jar" /> + <property name="newt-awt.jar" value="${build.newt}/newt-awt.jar" /> + <property name="newt-event.jar" value="${build.newt}/newt-event.jar" /> <!-- using NEWT events w/o NEWT --> + <property name="newt-driver-x11.jar" value="${build.newt}/newt-driver-x11.jar" /> + <property name="newt-driver-win.jar" value="${build.newt}/newt-driver-win.jar" /> + <property name="newt-driver-osx.jar" value="${build.newt}/newt-driver-osx.jar" /> + <property name="newt-driver-android.jar" value="${build.newt}/newt-driver-android.jar" /> <!-- excluded from all --> + <property name="newt-driver-kd.jar" value="${build.newt}/newt-driver-kd.jar" /> <!-- excluded from all --> + <property name="newt-driver-intelgdl.jar" value="${build.newt}/newt-driver-intelgdl.jar" /> <!-- excluded from all --> + <property name="newt-driver-broadcomegl.jar" value="${build.newt}/newt-driver-broadcomegl.jar" /> <!-- excluded from all --> <path id="newt_all_atoms.classpath"> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> - <pathelement location="${newt.awt.jar}" /> - <pathelement location="${newt.driver.x11.jar}" /> - <pathelement location="${newt.driver.win.jar}" /> - <pathelement location="${newt.driver.macosx.jar}" /> + <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt-ogl.jar}" /> + <pathelement location="${newt-awt.jar}" /> + <pathelement location="${newt-driver-x11.jar}" /> + <pathelement location="${newt-driver-win.jar}" /> + <pathelement location="${newt-driver-osx.jar}" /> </path> <path id="newt_all-noawt_atoms.classpath"> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> - <pathelement location="${newt.driver.x11.jar}" /> - <pathelement location="${newt.driver.win.jar}" /> - <pathelement location="${newt.driver.macosx.jar}" /> + <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt-ogl.jar}" /> + <pathelement location="${newt-driver-x11.jar}" /> + <pathelement location="${newt-driver-win.jar}" /> + <pathelement location="${newt-driver-osx.jar}" /> </path> <path id="newt_all-mobile_atoms.classpath"> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> - <pathelement location="${newt.driver.x11.jar}" /> - <pathelement location="${newt.driver.win.jar}" /> + <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt-ogl.jar}" /> + <pathelement location="${newt-driver-x11.jar}" /> + <pathelement location="${newt-driver-win.jar}" /> </path> <path id="newt_all-android_atoms.classpath"> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> - <pathelement location="${newt.driver.android.jar}" /> + <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt-ogl.jar}" /> + <pathelement location="${newt-driver-android.jar}" /> </path> <!-- JavaSE combinations --> <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" /> <property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" /> - <property name="jogl.test.jar" value="${jar}/jogl.test.jar"/> - <property name="jogl.test-android.jar" value="${jar}/jogl.test-android.jar"/> - <property name="jogl.test-android.apk" value="${jar}/jogl.test-android.apk"/> + <property name="jogl-test.jar" value="${jar}/jogl-test.jar"/> + <property name="jogl-test-android.jar" value="${jar}/jogl-test-android.jar"/> + <property name="jogl-test-android.apk" value="${jar}/jogl-test-android.apk"/> <!-- JavaSE combinations . AWT --> - <property name="jogl.all.jar" value="${jar}/jogl.all.jar" /> + <property name="jogl-all.jar" value="${jar}/jogl-all.jar" /> <!-- JavaSE combinations . NO.AWT --> - <property name="jogl.all-noawt.jar" value="${jar}/jogl.all-noawt.jar" /> - <property name="jogl.all-mobile.jar" value="${jar}/jogl.all-mobile.jar" /> - <property name="jogl.all-android.jar" value="${jar}/jogl.all-android.jar" /> - <property name="jogl.all-android.apk" value="${jar}/jogl.all-android-${android.abi}.apk" /> + <property name="jogl-all-noawt.jar" value="${jar}/jogl-all-noawt.jar" /> + <property name="jogl-all-mobile.jar" value="${jar}/jogl-all-mobile.jar" /> + <property name="jogl-all-android.jar" value="${jar}/jogl-all-android.jar" /> + <property name="jogl-all-android.apk" value="${jar}/jogl-all-android-${android.abi}.apk" /> <path id="swt_gluegen.classpath"> <pathelement location="${gluegen-rt.jar}" /> @@ -477,7 +478,7 @@ <pathelement location="${android.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> - <pathelement location="${jogl.all.jar}" /> + <pathelement location="${jogl-all.jar}" /> </path> <!-- Test Run w/ AWT .. --> @@ -486,12 +487,12 @@ <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> <pathelement location="${gluegen-rt.jar}" /> - <pathelement location="${jogl.all.jar}" /> - <pathelement location="${jogl.test.jar}" /> + <pathelement location="${jogl-all.jar}" /> + <pathelement location="${jogl-test.jar}" /> </path> <property name="junit_jogl_awt.run.jars" - value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/> - <property name="junit_jogl_awt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/> + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all.jar}${path.separator}${jogl-test.jar}"/> + <property name="junit_jogl_awt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all.jar}${path.separator}${jogl-test.jar}"/> <!-- Test Run w/o AWT .. --> <path id="junit_jogl_noawt.run.classpath"> @@ -499,12 +500,12 @@ <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> <pathelement location="${gluegen-rt.jar}" /> - <pathelement location="${jogl.all-noawt.jar}" /> - <pathelement location="${jogl.test.jar}" /> + <pathelement location="${jogl-all-noawt.jar}" /> + <pathelement location="${jogl-test.jar}" /> </path> <property name="junit_jogl_noawt.run.jars" - value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/> - <property name="junit_jogl_noawt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/> + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${jogl-test.jar}"/> + <property name="junit_jogl_noawt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${jogl-test.jar}"/> <!-- Test Run w/ SWT .. --> <path id="junit_jogl_swt.run.classpath"> @@ -513,11 +514,11 @@ <pathelement location="${ant-junit.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> - <pathelement location="${jogl.all.jar}" /> - <pathelement location="${jogl.test.jar}" /> + <pathelement location="${jogl-all.jar}" /> + <pathelement location="${jogl-test.jar}" /> </path> <property name="junit_jogl_swt.run.jars" - value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${swt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/> + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${swt.jar}${path.separator}${jogl-all.jar}${path.separator}${jogl-test.jar}"/> <!-- Test Run w/ Android [w/o AWT] .. --> <path id="junit_jogl_android.run.classpath"> @@ -526,13 +527,13 @@ <pathelement location="${ant-junit.jar}" /> <pathelement location="${android.jar}" /> <pathelement location="${gluegen-rt-android.jar}" /> - <pathelement location="${jogl.all-android.jar}" /> - <pathelement location="${jogl.test.jar}" /> + <pathelement location="${jogl-all-android.jar}" /> + <pathelement location="${jogl-test.jar}" /> </path> <property name="junit_jogl_android.run.jars" - value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt-android.jar}${path.separator}${jogl.all-android.jar}${path.separator}${jogl.test.jar}"/> + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt-android.jar}${path.separator}${jogl-all-android.jar}${path.separator}${jogl-test.jar}"/> <property name="junit.run.remote.apks" - value="${gluegen.root}/${rootrel.build}/jogamp.android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${jogl.all-android.apk}${path.separator}${jogl.test.apk}"/> + value="${gluegen.root}/${rootrel.build}/jogamp.android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${jogl-all-android.apk}${path.separator}${jogl-test.apk}"/> <!-- Dummy extra CLASSPATH value, maybe overwritten --> <property name="junit_extra_classpath" value=""/> diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 0c7328c4a..6845354f6 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1550,7 +1550,7 @@ <srcfileset dir="${src.java}" includes="${java.part.nonjava}"/> <targetfileset dir="." - includes="${jogl.util.jar} ${jogl.util.fixedfuncemu.jar}" /> + includes="${jogl-util.jar} ${jogl-util-fixedfuncemu.jar}" /> </dependset> </target> <target name="build-jars" depends="build-jars-dependset,build-jars-javase" /> @@ -1570,48 +1570,48 @@ </target> <target name="build-jars-os-desktop-javase" depends="setup-manifestfile"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.x11.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-os-x11.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glx}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.win.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-os-win.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.wgl}" /> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.osx.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-os-osx.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.cgl}"/> </jar> </target> <target name="build-jars-android" depends="setup-manifestfile" if="isAndroid"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.android.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-os-android.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.android}"/> </jar> </target> <target name="build-jars-mobile-javase" depends="setup-manifestfile"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glmobile.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.egl} ${java.part.es1} ${java.part.es2}" excludes="${java.part.awt} ${java.part.swt} ${java.part.es1.dbg} ${java.part.es2.dbg}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.dbg.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glmobile-dbg.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.es1.dbg} ${java.part.es2.dbg}"/> </jar> </target> <target name="build-jars-awt-javase" depends="setup-manifestfile" unless="setup.noAWT"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.awt.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.awt}" /> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.awt.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.awt}"/> </jar> </target> <target name="build-jars-swt-javase" depends="setup-manifestfile" unless="setup.noSWT"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.swt.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-swt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.swt}" /> </jar> @@ -1619,22 +1619,22 @@ <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase"> <!--os specific gldesktop--> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.gldesktop.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-gldesktop.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.gldesktop}" excludes="${java.part.gldesktop.dbg} ${java.part.glugldesktop}"/> </jar> <!-- misc --> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.gldesktop.dbg.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-gldesktop-dbg.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.gldesktop.dbg}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glugldesktop.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glu-gldesktop.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glugldesktop}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.gldesktop.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-gldesktop.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.gldesktop}" excludes="${java.part.awt} ${java.part.util.awt} ${java.part.swt}"/> @@ -1643,50 +1643,50 @@ <target name="build-jars-javase" depends="setup-manifestfile, build-jars-android, build-jars-mobile-javase, build-jars-desktop-javase, build-jars-awt-javase, build-jars-swt-javase"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.core.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}" excludes="${java.part.core.exclude}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.sdk.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-sdk.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.sdk}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glutess.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glutess.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glutess}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glumipmap.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glumipmap.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glumipmap}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util} ${java.part.util.glsl} ${java.part.util.graph}" excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/> <fileset dir="resources/assets" includes="jogl/util/**" /> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-fixedfuncemu.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.fixedfuncemu}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.omx.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-omx.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.openmax}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.cg.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-cg.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.nv-cg}"/> </jar> <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true"> <fileset dir="${obj.jogl}"> <include name="*.${native.library.suffix}" /> - <exclude name="*jogl_cg.${native.library.suffix}" /> + <exclude name="*jogl-cg.${native.library.suffix}" /> </fileset> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl_cg-natives-${os.and.arch}.jar" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-cg-natives-${os.and.arch}.jar" filesonly="true"> <fileset dir="${obj.jogl}"> - <include name="*jogl_cg.${native.library.suffix}" /> + <include name="*jogl-cg.${native.library.suffix}" /> </fileset> </jar> </target> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 233108823..c77558d6b 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -820,7 +820,7 @@ </target> <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.awt.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.awt}" excludes="${java.excludes.awt}"/> @@ -828,28 +828,28 @@ </target> <target name="build-jars-x11" depends="setup-manifestfile"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.x11.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-os-x11.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.x11}" /> </jar> </target> <target name="build-jars-windows" depends="setup-manifestfile"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.win.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-os-win.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.windows}" /> </jar> </target> <target name="build-jars-macosx" depends="setup-manifestfile"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.macosx.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-os-osx.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.macosx}" /> </jar> </target> <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-x11,build-jars-windows,build-jars-macosx"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.core.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}" excludes="${java.part.awt} ${java.part.x11} ${java.part.windows}"/> diff --git a/make/build-newt.xml b/make/build-newt.xml index 695c86d19..a6be5042e 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -701,52 +701,52 @@ </target> <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.awt.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.awt}"/> </jar> </target> <target name="build-jars-opengl" depends="setup-manifestfile" unless="setup.noOpenGL"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.ogl.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-ogl.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.opengl}"/> </jar> </target> <target name="build-jars-driver" depends="setup-manifestfile"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.x11.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-x11.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.x11}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.win.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-win.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.windows}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.macosx.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-osx.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.macosx}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.kd.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-kd.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.kd}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.broadcomegl.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-broadcomegl.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.broadcomegl}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.intelgdl.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-intelgdl.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.intelgdl}"/> </jar> </target> <target name="build-jars-javase" depends="setup-manifestfile,build-jars-opengl,build-jars-awt,build-jars-driver"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.core.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.event.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-event.jar}" filesonly="true"> <fileset dir="${classes}"> <include name="com/jogamp/newt/Display*" /> <include name="com/jogamp/newt/Screen*" /> @@ -759,7 +759,7 @@ </target> <target name="build-jars-android" depends="setup-manifestfile" if="isAndroid"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.android.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-android.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.android}"/> </jar> diff --git a/make/build-test.xml b/make/build-test.xml index f5437902e..51eadfebd 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -51,7 +51,7 @@ <fileset dir="." includes="*.png" /> <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> - <fileset file="${jogl.test.jar}" /> + <fileset file="${jogl-test.jar}" /> </delete> </target> @@ -85,7 +85,7 @@ </filterset> </copy> - <jar manifest="${build.test}/manifest-test.mf" destfile="${jogl.test.jar}" filesonly="true"> + <jar manifest="${build.test}/manifest-test.mf" destfile="${jogl-test.jar}" filesonly="true"> <!-- get all class files, but skip any resource files that external tools might have copied into the class directory (otherwise, it's possible to get the same resource file twice in the jar) --> @@ -121,7 +121,7 @@ </filterset> </copy> - <jar manifest="${build.test}/manifest-test-android.mf" destfile="${jogl.test-android.jar}" filesonly="true"> + <jar manifest="${build.test}/manifest-test-android.mf" destfile="${jogl-test-android.jar}" filesonly="true"> <!-- get all class files, but skip any resource files that external tools might have copied into the class directory (otherwise, it's possible to get the same resource file twice in the jar) --> @@ -134,7 +134,7 @@ assetsdir="resources/assets-test" jarsrcdir="${src}/test" jarbuilddir="${jar}" - jarbasename="jogl.test-android" + jarbasename="jogl-test-android" nativebuilddir="${lib}" nativebasename="non-existing" androidmanifest.path="resources/android/AndroidManifest-test.xml" @@ -149,8 +149,8 @@ <mkdir dir="${obj.test}" /> <mkdir dir="${classes}" /> - <property name="jogl.test.jar.path" location="${jogl.test.jar}"/> <!-- absolute path --> - <echo message="jogl.test.jar ${jogl.test.jar.path}"/> + <property name="jogl-test.jar.path" location="${jogl-test.jar}"/> <!-- absolute path --> + <echo message="jogl-test.jar ${jogl-test.jar.path}"/> <uptodate property="test.compile.skip"> <srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "${src.test}" includes="**"/> @@ -159,7 +159,7 @@ <srcfiles dir="${src}/nativewindow" /> <srcfiles dir="${src}/jogl" /> <srcfiles dir="${src}/newt" /> - <mapper type="merge" to="${jogl.test.jar.path}"/> + <mapper type="merge" to="${jogl-test.jar.path}"/> </uptodate> </target> diff --git a/make/build.xml b/make/build.xml index 9258df0e9..23aa218b4 100644 --- a/make/build.xml +++ b/make/build.xml @@ -99,7 +99,7 @@ </target> <target name="one.jar.dir.android" depends="one.jar.dir.prep" if="isAndroid" unless="one.dir.skip"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-android.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-android.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_core_atoms.classpath"/> @@ -111,7 +111,7 @@ </target> <target name="one.jar.dir" depends="one.jar.dir.prep,one.jar.dir.android" unless="one.dir.skip"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all_atoms.classpath"/> @@ -120,7 +120,7 @@ </zips> </archives> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-noawt.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-noawt.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all-noawt_atoms.classpath"/> @@ -129,7 +129,7 @@ </zips> </archives> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-mobile.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-mobile.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all-noawt_atoms.classpath"/> @@ -147,8 +147,8 @@ </target> <target name="android.package.jogl.skip.check" depends="init,gluegen.cpptasks.detect.os"> - <uptodate property="android.package.jogl.skip" targetfile="${jogl.all-android.apk}"> - <srcfiles dir="${jar}" includes="jogl.all-android.jar" /> + <uptodate property="android.package.jogl.skip" targetfile="${jogl-all-android.apk}"> + <srcfiles dir="${jar}" includes="jogl-all-android.jar" /> <srcfiles dir="resources/android" includes="**" /> </uptodate> </target> @@ -158,7 +158,7 @@ assetsdir="resources/assets" jarsrcdir="${src}/jogl/classes" jarbuilddir="${jar}" - jarbasename="jogl.all-android" + jarbasename="jogl-all-android" nativebuilddir="${lib}" nativebasename="" android.abi="${android.abi}" @@ -173,12 +173,12 @@ <uptodate property="one.dir.skip.native" targetfile="${jar}/jogl-all-natives-${os.and.arch}.jar"> <srcfiles dir="${lib}" includes="*.${native.library.suffix}" /> </uptodate> - <uptodate property="one.dir.skip.all" targetfile="${jogl.all.jar}"> + <uptodate property="one.dir.skip.all" targetfile="${jogl-all.jar}"> <srcfiles dir="${build.nativewindow}" includes="*.jar"/> <srcfiles dir="${build.jogl}" includes="*.jar"/> <srcfiles dir="${build.newt}" includes="*.jar"/> </uptodate> - <uptodate property="one.dir.skip.android" targetfile="${jogl.all-android.jar}"> + <uptodate property="one.dir.skip.android" targetfile="${jogl-all-android.jar}"> <srcfiles dir="${build.nativewindow}" includes="*.jar"/> <srcfiles dir="${build.jogl}" includes="*.jar"/> <srcfiles dir="${build.newt}" includes="*.jar"/> diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh index 2d91f278f..4067e65c9 100755 --- a/make/scripts/setenv-jogl.sh +++ b/make/scripts/setenv-jogl.sh @@ -93,8 +93,8 @@ CLASSPATH=.:$GLUEGEN_JAR:$JOGL_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS export CLASSPATH # We use TempJarCache per default now! -#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR -#export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR +export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR echo JOGAMP_ALL_AWT_CLASSPATH: $CLASSPATH echo JOGAMP_ALL_NOAWT_CLASSPATH: $CLASSPATH diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 702b0dc8c..8f4237012 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -69,11 +69,11 @@ function jrun() { #D_ARGS="-Dnewt.test.Screen.disableScreenMode -Dnewt.debug.Screen" #D_ARGS="-Djogl.debug.ExtensionAvailabilityCache -Djogl.debug=all -Dnativewindow.debug=all -Djogamp.debug.ProcAddressHelper=true -Djogamp.debug.NativeLibrary=true -Djogamp.debug.NativeLibrary.Lookup=true" #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" + #D_ARGS="-Djogl.debug=all -Djogamp.debug.Lock -Djogamp.common.utils.locks.Lock.timeout=600000" #D_ARGS="-Dnewt.debug.MainThread" #D_ARGS="-Dnewt.debug.Window" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all" #D_ARGS="-Dnativewindow.debug.GraphicsConfiguration -Dnativewindow.debug.NativeWindow" - #D_ARGS="-Djogl.debug=all" #D_ARGS="-Djogl.debug.GLCanvas -Djogl.debug.Animator -Djogl.debug.GLDrawable -Djogl.debug.GLContext -Djogl.debug.GLContext.TraceSwitch" #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.ExtensionAvailabilityCache" #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GLProfile -Djogl.debug.GLDrawable" @@ -120,11 +120,9 @@ function jrun() { #D_ARGS="-Dnativewindow.debug.ToolkitLock.TraceLock" #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode -Djogl.debug.TraceGL" #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLState" - #D_ARGS="-Djogamp.debug.JARUtil" - #D_ARGS="-Djogamp.debug.TempFileCache" - #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JARUtil" - #D_ARGS="-Djogamp.debug.JNILibLoader" - #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.gluegen.UseTempJarCache=false -Djogamp.debug.JARUtil" + #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil" + #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil" + #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogamp.gluegen.UseTempJarCache=false" #D_ARGS="-Dnewt.test.EDTMainThread -Dnewt.debug.MainThread" #C_ARG="com.jogamp.newt.util.MainThread" #D_ARGS="-Dnewt.debug.MainThread" @@ -143,6 +141,8 @@ function jrun() { X_ARGS="-Djava.awt.headless=false $X_ARGS" else export CLASSPATH=$JOGAMP_ALL_NOAWT_CLASSPATH + #export CLASSPATH=$JOGAMP_MOBILE_CLASSPATH + #export CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILD_DIR/jar/atomic/jogl-core.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-gldesktop.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-util.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-core.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-core.jar:$JOGL_BUILD_DIR/jar/atomic/newt-driver-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-ogl.jar:$JOGL_BUILD_DIR/jar/jogl-test.jar:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS X_ARGS="-Djava.awt.headless=true $X_ARGS" fi if [ $swton -eq 1 ] ; then @@ -332,8 +332,8 @@ function testawtswt() { #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTexture01AWT #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileNEWT $* -testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01AWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01NEWT $* +#testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01AWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite02NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTextureSequence01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTextureSequence01AWT $* diff --git a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java index d901096bc..d160eccff 100644 --- a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java @@ -47,8 +47,8 @@ public class CgDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { Platform.initSingleton(); if(TempJarCache.isInitialized()) { - // Cg class and natives are available in their single atomic JAR files only - JNILibLoaderBase.addNativeJarLibs(CgDynamicLibraryBundleInfo.class, "jogl_cg", null); + // only: jogl-cg.jar -> jogl-cg-natives-<os.and.arch>.jar [atomic JAR files only] + JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { CgDynamicLibraryBundleInfo.class }, null, null ); } return null; } diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index f85c6ba23..ed457b0ea 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -37,6 +37,7 @@ package javax.media.opengl; +import jogamp.nativewindow.NWJNILibLoader; import jogamp.opengl.Debug; import jogamp.opengl.GLDrawableFactoryImpl; import jogamp.opengl.DesktopGLDynamicLookupHelper; @@ -133,11 +134,17 @@ public class GLProfile { Platform.initSingleton(); if(TempJarCache.isInitialized()) { - String[] atomicNativeJarBaseNames = new String[] { "nativewindow", "jogl", null }; - if( ReflectionUtil.isClassAvailable("com.jogamp.newt.NewtFactory", GLProfile.class.getClassLoader()) ) { - atomicNativeJarBaseNames[2] = "newt"; + final ClassLoader cl = GLProfile.class.getClassLoader(); + // either: [jogl-all.jar, jogl-all-noawt.jar, jogl-all-mobile.jar] -> jogl-all-natives-<os.and.arch>.jar + // or: nativewindow-core.jar -> nativewindow-natives-<os.and.arch>.jar, + // jogl-core.jar -> jogl-natives-<os.and.arch>.jar, + // (newt-core.jar -> newt-natives-<os.and.arch>.jar)? (if available) + final String newtFactoryClassName = "com.jogamp.newt.NewtFactory"; + final Class<?>[] classesFromJavaJars = new Class<?>[] { NWJNILibLoader.class, GLProfile.class, null }; + if( ReflectionUtil.isClassAvailable(newtFactoryClassName, cl) ) { + classesFromJavaJars[2] = ReflectionUtil.getClass(newtFactoryClassName, false, cl); } - JNILibLoaderBase.addNativeJarLibs(GLProfile.class, "jogl-all", atomicNativeJarBaseNames); + JNILibLoaderBase.addNativeJarLibs(classesFromJavaJars, "-all", new String[] { "-noawt", "-mobile", "-core" } ); } initProfilesForDefaultDevices(firstUIActionOnProcess); return null; @@ -1497,8 +1504,10 @@ public class GLProfile { System.err.println("GLProfile.init hasGLES1Impl "+hasGLES1Impl); System.err.println("GLProfile.init hasGLES2Impl "+hasGLES2Impl); System.err.println("GLProfile.init defaultDevice "+defaultDevice); - System.err.println("GLProfile.init profile order "+array2String(GL_PROFILE_LIST_ALL)); - System.err.println(JoglVersion.getDefaultOpenGLInfo(null)); + System.err.println("GLProfile.init profile order "+array2String(GL_PROFILE_LIST_ALL)); + if(hasGL234Impl || hasGLES1Impl || hasGLES2Impl) { // avoid deadlock + System.err.println(JoglVersion.getDefaultOpenGLInfo(null)); + } } } @@ -1527,7 +1536,7 @@ public class GLProfile { boolean isSet = GLContext.getAvailableGLVersionsSet(device); if(DEBUG) { - System.err.println("Info: GLProfile.initProfilesForDevice: "+device+", isSet "+isSet); + System.err.println("Info: GLProfile.initProfilesForDevice: "+device+" ("+device.getClass().getName()+"), isSet "+isSet+", hasDesktopGLFactory "+hasDesktopGLFactory+", hasEGLFactory "+hasEGLFactory); } if(isSet) { // Avoid recursion and check whether impl. is sane! @@ -1901,9 +1910,14 @@ public class GLProfile { { initSingleton(); + if(null==defaultDevice) { // avoid NPE and notify of incomplete initialization + throw new GLException("No default device available"); + } + if(null==device) { device = defaultDevice; } + final String deviceKey = device.getUniqueID(); HashMap<String /*GLProfile_name*/, GLProfile> map = deviceConn2ProfileMap.get(deviceKey); if( null != map ) { diff --git a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java index 99bc71c4a..6c15f9a2b 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java +++ b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java @@ -44,7 +44,9 @@ public class NWJNILibLoader extends JNILibLoaderBase { Platform.initSingleton(); final String libName = "nativewindow_"+ossuffix ; if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) { - addNativeJarLibs(NWJNILibLoader.class, "jogl-all", new String[] { "nativewindow" } ); + // either: [jogl-all.jar, jogl-all-noawt.jar, jogl-all-mobile.jar] -> jogl-all-natives-<os.and.arch>.jar + // or: nativewindow-core.jar -> nativewindow-natives-<os.and.arch>.jar + addNativeJarLibs(new Class<?>[] { NWJNILibLoader.class }, "-all", new String[] { "-noawt", "-mobile", "-core" } ); } return new Boolean(loadLibrary(libName, false, NWJNILibLoader.class.getClassLoader())); } diff --git a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java index 2db9d8d05..bc0eb7531 100644 --- a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java +++ b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java @@ -42,6 +42,8 @@ package jogamp.newt; import java.security.AccessController; import java.security.PrivilegedAction; +import jogamp.nativewindow.NWJNILibLoader; + import com.jogamp.common.jvm.JNILibLoaderBase; import com.jogamp.common.os.Platform; import com.jogamp.common.util.cache.TempJarCache; @@ -54,7 +56,10 @@ public class NEWTJNILibLoader extends JNILibLoaderBase { Platform.initSingleton(); final String libName = "newt"; if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) { - addNativeJarLibs(NEWTJNILibLoader.class, "jogl-all", new String[] { "nativewindow", "newt" } ); + // either: [jogl-all.jar, jogl-all-noawt.jar, jogl-all-mobile.jar] -> jogl-all-natives-<os.and.arch>.jar + // or: nativewindow-core.jar -> nativewindow-natives-<os.and.arch>.jar, + // newt-core.jar -> newt-natives-<os.and.arch>.jar + JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { NWJNILibLoader.class, NEWTJNILibLoader.class }, "-all", new String[] { "-noawt", "-mobile", "-core" } ); } loadLibrary(libName, false, NEWTJNILibLoader.class.getClassLoader()); return null; |