From f8cbd63d360a8d138a82d31bb53e65485ae64b42 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 8 Apr 2010 04:11:07 +0200 Subject: Added doc/deployment: JOGL-JAR-BUNDELING.txt A first FAQ about the (new) JAR partitioning. lstjars/lstjars.linux_amd64-20100406.log A first deployment payload measurement in kBytes :) New JAR Partitioning: All-In-One (*all*): - with AWT - without AWT See JOGL-JAR-BUNDELING.txt Atomic: See JOGL-JAR-BUNDELING.txt - Removed property setup.noall, since the *all* targets are mandatory now. Currently - Added gl4 part (still empty) - Fixed make/lstjars.sh and etc/profile.jogl (new JAR bundles) - Fixed make/lstjars.sh to produce JAR and PACK200 numbers, and using the *all* bundles if possible. MacOsX: - Fix missing refactoring in src/newt/native/MacWindow.m - Adding missing NSWindowDelegate protocol to NewtMacWindow as mandatory since 10.3.6 Misc: - Applied: 'gluegen.cpptasks.striplibs' to all native libraries. - Use path.seperator (ant) and system.env.library.path (gluegen), for junit runs. --- doc/deployment/JOGL-JAR-BUNDELING.txt | 138 ++++++ .../lstjars/lstjars.linux_amd64-20100406.log | 540 +++++++++++++++++++++ etc/profile.jogl | 22 +- make/build-jogl.xml | 199 ++++---- make/build-nativewindow.xml | 44 +- make/build-newt.xml | 43 +- make/jogl.properties | 2 +- make/lstjars.sh | 129 ++--- make/make.jogl.all.linux-x86_64.sh | 5 +- make/make.jogl.all.win32.bat | 14 +- .../com/jogamp/opengl/impl/NativeLibLoader.java | 2 +- .../opengl/test/junit/texture/awt/Texture1.java | 4 + src/newt/native/MacWindow.m | 2 +- src/newt/native/NewtMacWindow.h | 2 +- 14 files changed, 922 insertions(+), 224 deletions(-) create mode 100644 doc/deployment/JOGL-JAR-BUNDELING.txt create mode 100644 doc/deployment/lstjars/lstjars.linux_amd64-20100406.log diff --git a/doc/deployment/JOGL-JAR-BUNDELING.txt b/doc/deployment/JOGL-JAR-BUNDELING.txt new file mode 100644 index 000000000..cf4edd7a3 --- /dev/null +++ b/doc/deployment/JOGL-JAR-BUNDELING.txt @@ -0,0 +1,138 @@ + ++++++++++++++++++++++++++++++ ++++ Native Libraries ++++++++ ++++++++++++++++++++++++++++++ + +Gluegen native libraries + libgluegen-rt.so + +NativeWindow native libraries + libnativewindow_awt.so + libnativewindow_jvm.so + libnativewindow_x11.so + + +JOGL native libraries + libjogl_desktop.so + libjogl_gl2es12.so + libjogl_es1.so + libjogl_es2.so + libjogl_cg.so + +NEWT native libraries + libnewt.so + ++++++++++++++++++++++++++++++ ++++ Gluegen - Mandatory +++++ ++++++++++++++++++++++++++++++ + +Gluegen JAR - Always + + Core [pick 1] + gluegen-rt.jar + ++++++++++++++++++++++++++++++ ++++ All In One Deployment +++ ++++++++++++++++++++++++++++++ + +This might be the best solution +for desktop (maybe webstart). + +It is much faster to download +a (maybe bigger) file once and cache +it for most purposes, than to download +tens of files where its cache might not +be reuseable. + + +With AWT: + nativewindow.all.jar + jogl.all.jar + newt.all.jar (optional, if AWT is used only) + + +Without AWT + nativewindow.all-noawt.jar + jogl.all-noawt.jar + newt.all-noawt.jar + + ++++++++++++++++++++++++++++++ ++++ Atomic Deployment +++++++ ++++++++++++++++++++++++++++++ + +This is a fine tuned solution +where every byte counts. + +It is also possible to use this +strategy as a starting point for +efficient manual deployment. + +Cores: + nativewindow.core.jar + jogl.core.jar + + Newt (optional): + newt.core.jar + newt.ogl.jar (to use NEWT with JOGL) + + +Platform (x11/win/osx/embedded) + + Chose the same platform for all picks :) + + NativeWindow [pick 0..1]: + nativewindow.os.x11.jar + + Jogl [pick 1]: + jogl.egl.jar + jogl.os.x11.jar + jogl.os.win.jar + jogl.os.osx.jar + + Newt [pick 0..1] (optional): + newt.os.x11.jar + newt.os.win.jar + newt.os.osx.jar + + +Jogl GL [pick 1..n] + jogl.gles1.jar + jogl.gles1.dbg.jar + jogl.gles2.jar + jogl.gles2.dbg.jar + + jogl.gl2es12.jar + + jogl.gl2.jar + jogl.gl2.dbg.jar + + jogl.gl3.jar + jogl.gl3.dbg.jar + + jogl.gl4.jar + jogl.gl4.dbg.jar + + +Jogl Toolkits/Misc [pick n] (optional): + jogl.util.jar + jogl.util.gl2.jar + jogl.util.fixedfuncemu.jar + + +AWT [pick n] (optional): + nativewindow.awt.jar + + jogl.awt.jar + jogl.util.awt.jar (if using jogl.util) + + newt.awt.jar + +GLU [pick n] (optional): + jogl.glutess.jar + jogl.glumipmap.jar + jogl.glugl2.jar + + + + diff --git a/doc/deployment/lstjars/lstjars.linux_amd64-20100406.log b/doc/deployment/lstjars/lstjars.linux_amd64-20100406.log new file mode 100644 index 000000000..48dcd562c --- /dev/null +++ b/doc/deployment/lstjars/lstjars.linux_amd64-20100406.log @@ -0,0 +1,540 @@ +cp: cannot stat `../../gluegen/build-x86_64/gluegen-rt-natives-linux-i586.jar': No such file or directory +cp: cannot stat `../../gluegen/build-x86_64/gluegen-rt-natives-linux-i586-cdc.jar': No such file or directory +Native Libraries +4 libgluegen-rt.so.gz +24 libjogl_cg.so.gz +144 libjogl_desktop.so.gz +36 libjogl_es1.so.gz +36 libjogl_es2.so.gz +40 libjogl_gl2es12.so.gz +4 libnativewindow_awt.so.gz +4 libnativewindow_jvm.so.gz +8 libnativewindow_x11.so.gz +12 libnewt.so.gz +312 total + +list gluegen-rt-cdc.jar to gluegen-rt-cdc.lst +list gluegen-rt.jar to gluegen-rt.lst +list jogl.all.cdc.jar to jogl.all.cdc.lst +list jogl.all.jar to jogl.all.lst +list jogl.all-noawt.jar to jogl.all-noawt.lst +list jogl.awt.jar to jogl.awt.lst +list jogl.cg.jar to jogl.cg.lst +list jogl.core.cdc.jar to jogl.core.cdc.lst +list jogl.core.jar to jogl.core.lst +list jogl.egl.cdc.jar to jogl.egl.cdc.lst +list jogl.egl.jar to jogl.egl.lst +list jogl.gl2.dbg.jar to jogl.gl2.dbg.lst +list jogl.gl2es12.cdc.jar to jogl.gl2es12.cdc.lst +list jogl.gl2es12.jar to jogl.gl2es12.lst +list jogl.gl2.jar to jogl.gl2.lst +list jogl.gl3.dbg.jar to jogl.gl3.dbg.lst +list jogl.gl3.jar to jogl.gl3.lst +list jogl.gl4.dbg.jar to jogl.gl4.dbg.lst +list jogl.gl4.jar to jogl.gl4.lst +list jogl.gles1.cdc.jar to jogl.gles1.cdc.lst +list jogl.gles1.dbg.cdc.jar to jogl.gles1.dbg.cdc.lst +list jogl.gles1.dbg.jar to jogl.gles1.dbg.lst +list jogl.gles1.jar to jogl.gles1.lst +list jogl.gles2.cdc.jar to jogl.gles2.cdc.lst +list jogl.gles2.dbg.cdc.jar to jogl.gles2.dbg.cdc.lst +list jogl.gles2.dbg.jar to jogl.gles2.dbg.lst +list jogl.gles2.jar to jogl.gles2.lst +list jogl.glu.gl2.jar to jogl.glu.gl2.lst +list jogl.glu.mipmap.cdc.jar to jogl.glu.mipmap.cdc.lst +list jogl.glu.mipmap.jar to jogl.glu.mipmap.lst +list jogl.glu.tess.cdc.jar to jogl.glu.tess.cdc.lst +list jogl.glu.tess.jar to jogl.glu.tess.lst +list jogl-natives-linux-amd64-cdc.jar to jogl-natives-linux-amd64-cdc.lst +list jogl-natives-linux-amd64.jar to jogl-natives-linux-amd64.lst +list jogl.os.osx.cdc.jar to jogl.os.osx.cdc.lst +list jogl.os.osx.jar to jogl.os.osx.lst +list jogl.os.win.cdc.jar to jogl.os.win.cdc.lst +list jogl.os.win.jar to jogl.os.win.lst +list jogl.os.x11.cdc.jar to jogl.os.x11.cdc.lst +list jogl.os.x11.jar to jogl.os.x11.lst +list jogl.sdk.jar to jogl.sdk.lst +list jogl.test.jar to jogl.test.lst +list jogl.util.awt.jar to jogl.util.awt.lst +list jogl.util.cdc.jar to jogl.util.cdc.lst +list jogl.util.fixedfuncemu.cdc.jar to jogl.util.fixedfuncemu.cdc.lst +list jogl.util.fixedfuncemu.jar to jogl.util.fixedfuncemu.lst +list jogl.util.gl2.jar to jogl.util.gl2.lst +list jogl.util.jar to jogl.util.lst +list nativewindow.all.cdc.jar to nativewindow.all.cdc.lst +list nativewindow.all.jar to nativewindow.all.lst +list nativewindow.all-noawt.jar to nativewindow.all-noawt.lst +list nativewindow.awt.jar to nativewindow.awt.lst +list nativewindow.core.cdc.jar to nativewindow.core.cdc.lst +list nativewindow.core.jar to nativewindow.core.lst +list nativewindow-natives-linux-amd64-cdc.jar to nativewindow-natives-linux-amd64-cdc.lst +list nativewindow-natives-linux-amd64.jar to nativewindow-natives-linux-amd64.lst +list nativewindow.os.x11.cdc.jar to nativewindow.os.x11.cdc.lst +list nativewindow.os.x11.jar to nativewindow.os.x11.lst +list newt.all.cdc.jar to newt.all.cdc.lst +list newt.all.jar to newt.all.lst +list newt.all-noawt.jar to newt.all-noawt.lst +list newt.awt.jar to newt.awt.lst +list newt.broadcomegl.cdc.jar to newt.broadcomegl.cdc.lst +list newt.broadcomegl.jar to newt.broadcomegl.lst +list newt.core.cdc.jar to newt.core.cdc.lst +list newt.core.jar to newt.core.lst +list newt-natives-linux-amd64-cdc.jar to newt-natives-linux-amd64-cdc.lst +list newt-natives-linux-amd64.jar to newt-natives-linux-amd64.lst +list newt.ogl.cdc.jar to newt.ogl.cdc.lst +list newt.ogl.jar to newt.ogl.lst +list newt.os.osx.jar to newt.os.osx.lst +list newt.os.win.jar to newt.os.win.lst +list newt.os.x11.jar to newt.os.x11.lst +mv: cannot stat `jogl.all.cdc.lst': No such file or directory +mv: cannot stat `nativewindow.all.cdc.lst': No such file or directory +mv: cannot stat `newt.all.cdc.lst': No such file or directory +mv: cannot stat `jogl.gl2es12.*.lst': No such file or directory +duplicates - w/o gl2es12.* gl2.* + +com/jogamp/openmax/OMXEventListener.class +com/jogamp/openmax/OMXInstance.class +com/jogamp/openmax/OMXInstance$EGLImageTexture.class +mv: cannot stat `jogl.all.cdc.lst': No such file or directory +mv: cannot stat `nativewindow.all.cdc.lst': No such file or directory +mv: cannot stat `newt.all.cdc.lst': No such file or directory +all vs allparts delta + +--- allparts.lst 2010-04-06 14:27:30.945355748 +0200 ++++ allall.lst 2010-04-06 14:27:31.002253659 +0200 +@@ -1,3 +1,10 @@ ++com/jogamp/audio/windows/waveout/Audio.class ++com/jogamp/audio/windows/waveout/Mixer.class ++com/jogamp/audio/windows/waveout/Mixer$FillerThread.class ++com/jogamp/audio/windows/waveout/Mixer$MixerThread.class ++com/jogamp/audio/windows/waveout/SoundBuffer.class ++com/jogamp/audio/windows/waveout/Track.class ++com/jogamp/audio/windows/waveout/Vec3f.class + com/jogamp/common/nio/AbstractBuffer.class + com/jogamp/common/nio/AbstractLongBuffer.class + com/jogamp/common/nio/Buffers.class +JOGL Deployment Payload for jar + +JOGL ES1 NEWT CORE +44 gluegen-rt.jar +48 nativewindow.all-noawt.jar +148 jogl.core.jar +116 jogl.util.jar +44 jogl.egl.jar +28 jogl.gles1.jar +88 newt.all-noawt.jar +4 libgluegen-rt.so.gz +4 libnativewindow_jvm.so.gz +36 libjogl_es1.so.gz +12 libnewt.so.gz +572 total + +JOGL ES2 NEWT CORE +44 gluegen-rt.jar +48 nativewindow.all-noawt.jar +148 jogl.core.jar +116 jogl.util.jar +44 jogl.egl.jar +32 jogl.gles2.jar +88 newt.all-noawt.jar +4 libgluegen-rt.so.gz +4 libnativewindow_jvm.so.gz +36 libjogl_es2.so.gz +12 libnewt.so.gz +576 total + +JOGL ES2 NEWT CORE FIXED +44 gluegen-rt.jar +48 nativewindow.all-noawt.jar +148 jogl.core.jar +116 jogl.util.jar +44 jogl.egl.jar +32 jogl.gles2.jar +28 jogl.util.fixedfuncemu.jar +88 newt.all-noawt.jar +4 libgluegen-rt.so.gz +4 libnativewindow_jvm.so.gz +36 libjogl_es2.so.gz +12 libnewt.so.gz +604 total + +JOGL GL2ES12 NEWT +44 gluegen-rt.jar +48 nativewindow.all-noawt.jar +148 jogl.core.jar +116 jogl.util.jar +56 jogl.os.x11.jar +36 jogl.gl2es12.jar +88 newt.all-noawt.jar +4 libgluegen-rt.so.gz +40 libjogl_gl2es12.so.gz +12 libnewt.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_jvm.so.gz +604 total + +JOGL GL2 NEWT +44 gluegen-rt.jar +48 nativewindow.all-noawt.jar +148 jogl.core.jar +116 jogl.util.jar +56 jogl.os.x11.jar +120 jogl.gl2.jar +88 newt.all-noawt.jar +4 libgluegen-rt.so.gz +144 libjogl_desktop.so.gz +12 libnewt.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_jvm.so.gz +792 total + +JOGL GL2 AWT +44 gluegen-rt.jar +84 nativewindow.all.jar +148 jogl.core.jar +116 jogl.util.jar +56 jogl.os.x11.jar +120 jogl.gl2.jar +64 jogl.awt.jar +4 libgluegen-rt.so.gz +144 libjogl_desktop.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_awt.so.gz +4 libnativewindow_jvm.so.gz +796 total + +JOGL ALL AWT +44 gluegen-rt.jar +84 nativewindow.all.jar +1876 jogl.all.jar +4 libgluegen-rt.so.gz +144 libjogl_desktop.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_awt.so.gz +4 libnativewindow_jvm.so.gz +2168 total + +JOGL ALL No AWT +44 gluegen-rt.jar +48 nativewindow.all-noawt.jar +1772 jogl.all-noawt.jar +88 newt.all-noawt.jar +4 libgluegen-rt.so.gz +144 libjogl_desktop.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_jvm.so.gz +12 libnewt.so.gz +2124 total + +JOGL CDCFP DESKTOP +44 gluegen-rt-cdc.jar +84 nativewindow.all.jar +792 jogl.all.cdc.jar +88 newt.all.cdc.jar +4 libgluegen-rt.so.gz +40 libjogl_gl2es12.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_jvm.so.gz +12 libnewt.so.gz +1076 total + +JOGL CDCFP ES1 MOBILE +44 gluegen-rt-cdc.jar +148 jogl.core.cdc.jar +44 jogl.egl.cdc.jar +28 jogl.gles1.cdc.jar +116 jogl.util.cdc.jar +48 nativewindow.all.cdc.jar +88 newt.all.cdc.jar +4 libgluegen-rt.so.gz +36 libjogl_es1.so.gz +4 libnativewindow_jvm.so.gz +12 libnewt.so.gz +572 total + +JOGL CDCFP ES2 MOBILE +44 gluegen-rt-cdc.jar +148 jogl.core.cdc.jar +44 jogl.egl.cdc.jar +32 jogl.gles2.cdc.jar +116 jogl.util.cdc.jar +48 nativewindow.all.cdc.jar +88 newt.all.cdc.jar +4 libgluegen-rt.so.gz +36 libjogl_es2.so.gz +4 libnativewindow_jvm.so.gz +12 libnewt.so.gz +576 total + +JOGL GLU +56 jogl.glu.gl2.jar +68 jogl.glu.mipmap.cdc.jar +68 jogl.glu.mipmap.jar +48 jogl.glu.tess.cdc.jar +48 jogl.glu.tess.jar +288 total + +JOGL EVERYTHING +1876 jogl.all.jar +84 nativewindow.all.jar +108 newt.all.jar +4 libgluegen-rt.so.gz +4 libnativewindow_jvm.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_awt.so.gz +144 libjogl_desktop.so.gz +36 libjogl_es1.so.gz +36 libjogl_es2.so.gz +40 libjogl_gl2es12.so.gz +12 libnewt.so.gz +2356 total + +pack200 gluegen-rt-cdc.pack.gz gluegen-rt-cdc.jar +pack200 gluegen-rt.pack.gz gluegen-rt.jar +pack200 jogl.all.cdc.pack.gz jogl.all.cdc.jar +pack200 jogl.all.pack.gz jogl.all.jar +pack200 jogl.all-noawt.pack.gz jogl.all-noawt.jar +pack200 jogl.awt.pack.gz jogl.awt.jar +pack200 jogl.cg.pack.gz jogl.cg.jar +pack200 jogl.core.cdc.pack.gz jogl.core.cdc.jar +pack200 jogl.core.pack.gz jogl.core.jar +pack200 jogl.egl.cdc.pack.gz jogl.egl.cdc.jar +pack200 jogl.egl.pack.gz jogl.egl.jar +pack200 jogl.gl2.dbg.pack.gz jogl.gl2.dbg.jar +pack200 jogl.gl2es12.cdc.pack.gz jogl.gl2es12.cdc.jar +pack200 jogl.gl2es12.pack.gz jogl.gl2es12.jar +pack200 jogl.gl2.pack.gz jogl.gl2.jar +pack200 jogl.gl3.dbg.pack.gz jogl.gl3.dbg.jar +pack200 jogl.gl3.pack.gz jogl.gl3.jar +pack200 jogl.gl4.dbg.pack.gz jogl.gl4.dbg.jar +pack200 jogl.gl4.pack.gz jogl.gl4.jar +pack200 jogl.gles1.cdc.pack.gz jogl.gles1.cdc.jar +pack200 jogl.gles1.dbg.cdc.pack.gz jogl.gles1.dbg.cdc.jar +pack200 jogl.gles1.dbg.pack.gz jogl.gles1.dbg.jar +pack200 jogl.gles1.pack.gz jogl.gles1.jar +pack200 jogl.gles2.cdc.pack.gz jogl.gles2.cdc.jar +pack200 jogl.gles2.dbg.cdc.pack.gz jogl.gles2.dbg.cdc.jar +pack200 jogl.gles2.dbg.pack.gz jogl.gles2.dbg.jar +pack200 jogl.gles2.pack.gz jogl.gles2.jar +pack200 jogl.glu.gl2.pack.gz jogl.glu.gl2.jar +pack200 jogl.glu.mipmap.cdc.pack.gz jogl.glu.mipmap.cdc.jar +pack200 jogl.glu.mipmap.pack.gz jogl.glu.mipmap.jar +pack200 jogl.glu.tess.cdc.pack.gz jogl.glu.tess.cdc.jar +pack200 jogl.glu.tess.pack.gz jogl.glu.tess.jar +pack200 jogl-natives-linux-amd64-cdc.pack.gz jogl-natives-linux-amd64-cdc.jar +pack200 jogl-natives-linux-amd64.pack.gz jogl-natives-linux-amd64.jar +pack200 jogl.os.osx.cdc.pack.gz jogl.os.osx.cdc.jar +pack200 jogl.os.osx.pack.gz jogl.os.osx.jar +pack200 jogl.os.win.cdc.pack.gz jogl.os.win.cdc.jar +pack200 jogl.os.win.pack.gz jogl.os.win.jar +pack200 jogl.os.x11.cdc.pack.gz jogl.os.x11.cdc.jar +pack200 jogl.os.x11.pack.gz jogl.os.x11.jar +pack200 jogl.sdk.pack.gz jogl.sdk.jar +pack200 jogl.test.pack.gz jogl.test.jar +pack200 jogl.util.awt.pack.gz jogl.util.awt.jar +pack200 jogl.util.cdc.pack.gz jogl.util.cdc.jar +pack200 jogl.util.fixedfuncemu.cdc.pack.gz jogl.util.fixedfuncemu.cdc.jar +pack200 jogl.util.fixedfuncemu.pack.gz jogl.util.fixedfuncemu.jar +pack200 jogl.util.gl2.pack.gz jogl.util.gl2.jar +pack200 jogl.util.pack.gz jogl.util.jar +pack200 nativewindow.all.cdc.pack.gz nativewindow.all.cdc.jar +pack200 nativewindow.all.pack.gz nativewindow.all.jar +pack200 nativewindow.all-noawt.pack.gz nativewindow.all-noawt.jar +pack200 nativewindow.awt.pack.gz nativewindow.awt.jar +pack200 nativewindow.core.cdc.pack.gz nativewindow.core.cdc.jar +pack200 nativewindow.core.pack.gz nativewindow.core.jar +pack200 nativewindow-natives-linux-amd64-cdc.pack.gz nativewindow-natives-linux-amd64-cdc.jar +pack200 nativewindow-natives-linux-amd64.pack.gz nativewindow-natives-linux-amd64.jar +pack200 nativewindow.os.x11.cdc.pack.gz nativewindow.os.x11.cdc.jar +pack200 nativewindow.os.x11.pack.gz nativewindow.os.x11.jar +pack200 newt.all.cdc.pack.gz newt.all.cdc.jar +pack200 newt.all.pack.gz newt.all.jar +pack200 newt.all-noawt.pack.gz newt.all-noawt.jar +pack200 newt.awt.pack.gz newt.awt.jar +pack200 newt.broadcomegl.cdc.pack.gz newt.broadcomegl.cdc.jar +pack200 newt.broadcomegl.pack.gz newt.broadcomegl.jar +pack200 newt.core.cdc.pack.gz newt.core.cdc.jar +pack200 newt.core.pack.gz newt.core.jar +pack200 newt-natives-linux-amd64-cdc.pack.gz newt-natives-linux-amd64-cdc.jar +pack200 newt-natives-linux-amd64.pack.gz newt-natives-linux-amd64.jar +pack200 newt.ogl.cdc.pack.gz newt.ogl.cdc.jar +pack200 newt.ogl.pack.gz newt.ogl.jar +pack200 newt.os.osx.pack.gz newt.os.osx.jar +pack200 newt.os.win.pack.gz newt.os.win.jar +pack200 newt.os.x11.pack.gz newt.os.x11.jar +JOGL Deployment Payload for pack.gz + +JOGL ES1 NEWT CORE +16 gluegen-rt.pack.gz +12 nativewindow.all-noawt.pack.gz +56 jogl.core.pack.gz +44 jogl.util.pack.gz +16 jogl.egl.pack.gz +12 jogl.gles1.pack.gz +28 newt.all-noawt.pack.gz +4 libgluegen-rt.so.gz +4 libnativewindow_jvm.so.gz +36 libjogl_es1.so.gz +12 libnewt.so.gz +240 total + +JOGL ES2 NEWT CORE +16 gluegen-rt.pack.gz +12 nativewindow.all-noawt.pack.gz +56 jogl.core.pack.gz +44 jogl.util.pack.gz +16 jogl.egl.pack.gz +16 jogl.gles2.pack.gz +28 newt.all-noawt.pack.gz +4 libgluegen-rt.so.gz +4 libnativewindow_jvm.so.gz +36 libjogl_es2.so.gz +12 libnewt.so.gz +244 total + +JOGL ES2 NEWT CORE FIXED +16 gluegen-rt.pack.gz +12 nativewindow.all-noawt.pack.gz +56 jogl.core.pack.gz +44 jogl.util.pack.gz +16 jogl.egl.pack.gz +16 jogl.gles2.pack.gz +16 jogl.util.fixedfuncemu.pack.gz +28 newt.all-noawt.pack.gz +4 libgluegen-rt.so.gz +4 libnativewindow_jvm.so.gz +36 libjogl_es2.so.gz +12 libnewt.so.gz +260 total + +JOGL GL2ES12 NEWT +16 gluegen-rt.pack.gz +12 nativewindow.all-noawt.pack.gz +56 jogl.core.pack.gz +44 jogl.util.pack.gz +24 jogl.os.x11.pack.gz +16 jogl.gl2es12.pack.gz +28 newt.all-noawt.pack.gz +4 libgluegen-rt.so.gz +40 libjogl_gl2es12.so.gz +12 libnewt.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_jvm.so.gz +264 total + +JOGL GL2 NEWT +16 gluegen-rt.pack.gz +12 nativewindow.all-noawt.pack.gz +56 jogl.core.pack.gz +44 jogl.util.pack.gz +24 jogl.os.x11.pack.gz +60 jogl.gl2.pack.gz +28 newt.all-noawt.pack.gz +4 libgluegen-rt.so.gz +144 libjogl_desktop.so.gz +12 libnewt.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_jvm.so.gz +412 total + +JOGL GL2 AWT +16 gluegen-rt.pack.gz +20 nativewindow.all.pack.gz +56 jogl.core.pack.gz +44 jogl.util.pack.gz +24 jogl.os.x11.pack.gz +60 jogl.gl2.pack.gz +20 jogl.awt.pack.gz +4 libgluegen-rt.so.gz +144 libjogl_desktop.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_awt.so.gz +4 libnativewindow_jvm.so.gz +404 total + +JOGL ALL AWT +16 gluegen-rt.pack.gz +20 nativewindow.all.pack.gz +680 jogl.all.pack.gz +4 libgluegen-rt.so.gz +144 libjogl_desktop.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_awt.so.gz +4 libnativewindow_jvm.so.gz +880 total + +JOGL ALL No AWT +16 gluegen-rt.pack.gz +12 nativewindow.all-noawt.pack.gz +612 jogl.all-noawt.pack.gz +28 newt.all-noawt.pack.gz +4 libgluegen-rt.so.gz +144 libjogl_desktop.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_jvm.so.gz +12 libnewt.so.gz +840 total + +JOGL CDCFP DESKTOP +16 gluegen-rt-cdc.pack.gz +20 nativewindow.all.pack.gz +232 jogl.all.cdc.pack.gz +28 newt.all.cdc.pack.gz +4 libgluegen-rt.so.gz +40 libjogl_gl2es12.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_jvm.so.gz +12 libnewt.so.gz +364 total + +JOGL CDCFP ES1 MOBILE +16 gluegen-rt-cdc.pack.gz +56 jogl.core.cdc.pack.gz +16 jogl.egl.cdc.pack.gz +12 jogl.gles1.cdc.pack.gz +44 jogl.util.cdc.pack.gz +12 nativewindow.all.cdc.pack.gz +28 newt.all.cdc.pack.gz +4 libgluegen-rt.so.gz +36 libjogl_es1.so.gz +4 libnativewindow_jvm.so.gz +12 libnewt.so.gz +240 total + +JOGL CDCFP ES2 MOBILE +16 gluegen-rt-cdc.pack.gz +56 jogl.core.cdc.pack.gz +16 jogl.egl.cdc.pack.gz +16 jogl.gles2.cdc.pack.gz +44 jogl.util.cdc.pack.gz +12 nativewindow.all.cdc.pack.gz +28 newt.all.cdc.pack.gz +4 libgluegen-rt.so.gz +36 libjogl_es2.so.gz +4 libnativewindow_jvm.so.gz +12 libnewt.so.gz +244 total + +JOGL GLU +20 jogl.glu.gl2.pack.gz +24 jogl.glu.mipmap.cdc.pack.gz +24 jogl.glu.mipmap.pack.gz +20 jogl.glu.tess.cdc.pack.gz +20 jogl.glu.tess.pack.gz +108 total + +JOGL EVERYTHING +680 jogl.all.pack.gz +20 nativewindow.all.pack.gz +32 newt.all.pack.gz +4 libgluegen-rt.so.gz +4 libnativewindow_jvm.so.gz +8 libnativewindow_x11.so.gz +4 libnativewindow_awt.so.gz +144 libjogl_desktop.so.gz +36 libjogl_es1.so.gz +36 libjogl_es2.so.gz +40 libjogl_gl2es12.so.gz +12 libnewt.so.gz +1020 total + diff --git a/etc/profile.jogl b/etc/profile.jogl index f42a2504b..42162457e 100755 --- a/etc/profile.jogl +++ b/etc/profile.jogl @@ -28,11 +28,13 @@ uname -a | grep -i Darwin && OSS=osx JOGL_AWT="jogl.awt.jar jogl.util.awt.jar newt.awt.jar nativewindow.awt.jar" -JOGL_CORE="nativewindow.core.jar nativewindow.x11.jar jogl.core.jar newt.core.jar newt.$OSS.jar newt.ogl.jar jogl.util.jar" +JOGL_CORE="nativewindow.core.jar nativewindow.os.$OSS.jar jogl.core.jar jogl.os.$OSS.jar newt.core.jar newt.os.$OSS.jar newt.ogl.jar jogl.util.jar" -JOGL_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.gl2es12.$OSS.jar jogl.gl2.$OSS.jar jogl.gl2.dbg.jar jogl.util.gl2.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar jogl.util.fixedfuncemu.jar jogl.cg.jar" +JOGL_TEST="jogl.test.jar" + +JOGL_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.util.gl2.jar jogl.gl3.jar jogl.gl3.dbg.jar jogl.gl4.jar jogl.gl4.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar jogl.util.fixedfuncemu.jar jogl.cg.jar" JOGL_JAR_ALL="$JOGL_JAR_ALL_NOAWT $JOGL_AWT" -JOGL_LIB_ALL="libjogl_gl2.so libjogl_es1.so libjogl_es2.so libnewt.so libjogl_awt.so" +JOGL_LIB_ALL="libjogl_desktop.so libjogl_es1.so libjogl_es2.so libnewt.so libjogl_awt.so" JOGL_JAR_ES1_MIN="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.egl.jar" JOGL_JAR_ES1_MAX="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.egl.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT" @@ -44,15 +46,15 @@ JOGL_JAR_ES2_MAX="$JOGL_CORE jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl JOGL_LIB_ES2_MIN="libjogl_es2.so libnewt.so" JOGL_LIB_ES2_MAX="libjogl_es2.so libnewt.so libjogl_awt.so libnativewindow_x11.so libnativewindow_awt.so" -JOGL_JAR_GL2ES12_MIN="$JOGL_CORE jogl.gl2es12.$OSS.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar" -JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.gl2es12.$OSS.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar jogl.gl2es12.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT" +JOGL_JAR_GL2ES12_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar" +JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar jogl.gl2es12.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT" JOGL_LIB_GL2ES12_MIN="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so" JOGL_LIB_GL2ES12_MAX="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so" -JOGL_JAR_GL2_MIN="$JOGL_CORE jogl.gl2.$OSS.jar jogl.gl2.dbg.jar" -JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.gl2.$OSS.jar jogl.gl2.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT jogl.cg.jar" -JOGL_LIB_GL2_MIN="libjogl_gl2.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so" -JOGL_LIB_GL2_MAX="libjogl_gl2.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so" +JOGL_JAR_GL2_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar" +JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT jogl.cg.jar" +JOGL_LIB_GL2_MIN="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so" +JOGL_LIB_GL2_MAX="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so" export JOGL_JAR_ALL JOGL_JAR_ALL_NOAWT JOGL_JAR_ES1_MIN JOGL_JAR_ES1_MAX JOGL_JAR_ES2_MIN JOGL_JAR_ES2_MAX JOGL_JAR_GL2ES12_MIN JOGL_JAR_GL2ES12_MAX JOGL_JAR_GL2_MIN JOGL_JAR_GL2_MAX export JOGL_LIB_ALL JOGL_LIB_ES1_MIN JOGL_LIB_ES1_MAX JOGL_LIB_ES2_MIN JOGL_LIB_ES2_MAX JOGL_LIB_GL2ES12_MIN JOGL_LIB_GL2ES12_MAX JOGL_LIB_GL2_MIN JOGL_LIB_GL2_MAX @@ -96,7 +98,7 @@ export JOGL_LIB_DIR if [ ! -z "$JOGL_PROFILE" ] ; then case "$JOGL_PROFILE" in JOGL_ALL) - JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL) + JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL $JOGL_TEST) ;; JOGL_ALL_NOAWT) JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_NOAWT) diff --git a/make/build-jogl.xml b/make/build-jogl.xml index d516c21eb..e8d37dd05 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -83,12 +83,7 @@ - - - - - @@ -131,6 +126,12 @@ + + + + @@ -288,14 +289,15 @@ + - + - + @@ -322,7 +324,7 @@ - + @@ -378,14 +380,14 @@ - + - + @@ -440,28 +447,26 @@ - - - + + + + + - - - + - - - + @@ -1462,7 +1467,7 @@ - + @@ -1598,9 +1603,9 @@ - - + @@ -1646,7 +1651,11 @@ - + + + + + @@ -1717,32 +1726,33 @@ - + - - - + + + - - + + - - + + + + + + + - + - - - + + + - - + + + + + - + + + + @@ -1812,7 +1824,7 @@ - + @@ -1823,7 +1835,7 @@ - + @@ -1837,7 +1849,7 @@ includes="${java.part.util.fixedfuncemu.shadercode}"/> - + - + - - - - - - - + + includes="${java.part.gl2}, ${java.part.openmax}" + excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/> - + + includes="${java.part.gl3}, ${java.part.openmax}" + excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/> - - - - + + + + includes="${java.part.gl4}, ${java.part.openmax}" + excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/> + includes="${java.part.gl2.dbg}"/> + + + + + + - + - - - - - - - - - - + + diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index e76c37a84..b34ad3954 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -80,14 +80,9 @@ - - - - - @@ -239,11 +234,12 @@ - + + - + @@ -759,6 +755,10 @@ + + + + @@ -835,39 +835,39 @@ - + - + - + - - - - - - + + + + + + - - - - - + - + - - - - @@ -95,7 +91,6 @@ - @@ -211,14 +206,14 @@ - + - + @@ -239,7 +234,7 @@ - + @@ -248,16 +243,16 @@ - + - - - + + + @@ -265,9 +260,9 @@ - - - + + + @@ -633,6 +628,10 @@ + + + + @@ -727,36 +726,36 @@ - + - + - + - + - + - + - + diff --git a/make/jogl.properties b/make/jogl.properties index 4f5f4d44b..34a593dac 100644 --- a/make/jogl.properties +++ b/make/jogl.properties @@ -16,5 +16,5 @@ # default location, modify the appropriate variable to point to the # absolute path of the lib directory # -windows.cg.lib=C:/Program Files/Nvidia Corporation/Cg/lib +windows.cg.lib=C:/Cg-2.2/lib x11.cg.lib=/usr/lib diff --git a/make/lstjars.sh b/make/lstjars.sh index 5357cde11..7159c184e 100644 --- a/make/lstjars.sh +++ b/make/lstjars.sh @@ -1,17 +1,18 @@ #! /bin/sh THISDIR=$(pwd) -STATDIR=$THISDIR/../stats BUILDDIR=$1 shift BUILDDIR_GLUEGEN=$1 shift if [ -z "$BUILDDIR" -o -z "$BUILDDIR_GLUEGEN" ] ; then - echo "usage $0 " + echo "usage $0 [-skippack200]" exit 1 fi +STATDIR=$BUILDDIR-stats + skippack200=0 if [ "$1" = "-skippack200" ] ; then skippack200=1 @@ -23,6 +24,69 @@ function report() { du -ksc $* } +OSS=x11 +ARCH=linux-amd64 + +function listdeployment() { + JAR_SUFFIX=$1 + shift + + echo JOGL Deployment Payload for $JAR_SUFFIX + echo + + echo JOGL ES1 NEWT CORE + report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es1.so.gz libnewt.so.gz + echo + + echo JOGL ES2 NEWT CORE + report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz + echo + + echo JOGL ES2 NEWT CORE FIXED + report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz + echo + + echo JOGL GL2ES12 NEWT + report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2es12.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz + echo + + echo JOGL GL2 NEWT + report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz + echo + + echo JOGL GL2 AWT + report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz + echo + + echo JOGL ALL AWT + report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz + echo + + echo JOGL ALL No AWT + report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz + echo + + echo JOGL CDCFP DESKTOP + report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz + echo + + echo JOGL CDCFP ES1 MOBILE + report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnativewindow_jvm.so.gz libnewt.so.gz + echo + + echo JOGL CDCFP ES2 MOBILE + report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnativewindow_jvm.so.gz libnewt.so.gz + echo + + echo JOGL GLU + report jogl.glu.*$JAR_SUFFIX + echo + + echo JOGL EVERYTHING + report *.all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libjogl_desktop.so.gz libjogl_es1.so.gz libjogl_es2.so.gz libjogl_gl2es12.so.gz libnewt.so.gz + echo +} + rm -rf $STATDIR mkdir -p $STATDIR cp -a $BUILDDIR/nativewindow/obj/*.so $STATDIR @@ -59,7 +123,7 @@ done rm -rf nope mkdir -p nope -mv *.cdc.lst *.all.lst nope/ +mv *.cdc.lst *.all*.lst nope/ mv jogl.gl2es12.*.lst jogl.gl2.*.lst nope/ echo duplicates - w/o gl2es12.* gl2.* @@ -67,16 +131,18 @@ echo sort jogl*.lst | uniq -d mv nope/* . -mv *.cdc.lst *.all.lst nope/ +mv *.cdc.lst *.all*.lst nope/ cat *.lst | sort -u > allparts.lst mv nope/* . -cat *.all.lst | sort -u > allall.lst +cat *.all.lst gluegen-rt.lst | sort -u > allall.lst cat jogl.all.cdc.lst newt.all.cdc.lst nativewindow.core.lst | sort -u > allcdc.lst echo all vs allparts delta echo diff -Nur allparts.lst allall.lst +listdeployment jar + if [ $skippack200 -eq 0 ] ; then for i in *.jar ; do fname=$i @@ -84,57 +150,6 @@ if [ $skippack200 -eq 0 ] ; then echo pack200 $bname.pack.gz $fname pack200 $bname.pack.gz $fname done - JAR_SUFFIX=pack.gz -else - JAR_SUFFIX=jar + listdeployment pack.gz fi -OSS=x11 - -echo JOGL ES1 NEWT CORE -report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es1.so.gz libnewt.so.gz -echo - -echo JOGL ES2 NEWT CORE -report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz -echo - -echo JOGL ES2 NEWT CORE FIXED -report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz -echo - -echo JOGL GL2ES12 NEWT -report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2es12.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz -echo - -echo JOGL GL2 NEWT -report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz -echo - -echo JOGL GL2 AWT -report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX nativewindow.awt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz -echo - -echo JOGL ALL -report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX newt.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz libnewt.so.gz -echo - -echo JOGL CDCFP DESKTOP -report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz -echo - -echo JOGL CDCFP ES1 MOBILE -report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.core.cdc.$JAR_SUFFIX newt.broadcomegl.cdc.$JAR_SUFFIX newt.core.cdc.$JAR_SUFFIX newt.ogl.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnativewindow_jvm.so.gz libnewt.so.gz -echo - -echo JOGL CDCFP ES2 MOBILE -report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.core.cdc.$JAR_SUFFIX newt.broadcomegl.cdc.$JAR_SUFFIX newt.core.cdc.$JAR_SUFFIX newt.ogl.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnativewindow_jvm.so.gz libnewt.so.gz -echo - -echo JOGL GLU -report jogl.glu.*pack.gz -echo - -echo JOGL EVERYTHING -report *.all.pack.gz -echo diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh index b5f860bd4..b6c5e9d63 100644 --- a/make/make.jogl.all.linux-x86_64.sh +++ b/make/make.jogl.all.linux-x86_64.sh @@ -5,8 +5,8 @@ if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then fi # -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 -# -Dc.compiler.debug=true -# -Dbuild.noarchives=true +# -Dc.compiler.debug=true \ +# -Dbuild.noarchives=true \ # -Dgluegen.cpptasks.detected.os=true \ # -DisUnix=true \ @@ -18,7 +18,6 @@ fi ant \ -Dbuild.noarchives=true \ -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 \ - -Dc.compiler.debug=true \ -Drootrel.build=build-x86_64 \ -DuseKD=true \ -DuseOpenMAX=true \ diff --git a/make/make.jogl.all.win32.bat b/make/make.jogl.all.win32.bat index 8525b5a45..da45cbd7b 100644 --- a/make/make.jogl.all.win32.bat +++ b/make/make.jogl.all.win32.bat @@ -1,7 +1,11 @@ -set THISDIR="C:\SUN\JOGL2" -set J2RE_HOME=c:\jre6 -set JAVA_HOME=c:\jdk6 -set PATH=%JAVA_HOME%\bin;%PATH% +set THISDIR="C:\JOGL" + +set J2RE_HOME=c:\jre1.6.0_19 +set JAVA_HOME=c:\jdk1.6.0_19 +set ANT_PATH=C:\apache-ant-1.7.1 + +set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% + set LIB_GEN=%THISDIR%\lib set CLASSPATH=.;%THISDIR%\build-win32\classes REM -Dc.compiler.debug=true @@ -9,4 +13,4 @@ REM -DuseOpenMAX=true REM -DuseKD=true REM -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2 -ant -Dbuild.noarchives=true -Dc.compiler.debug=true -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1 +ant -Dbuild.noarchives=true -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1 diff --git a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java index 0e5885349..b6024f240 100644 --- a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java +++ b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java @@ -61,7 +61,7 @@ public class NativeLibLoader extends NativeLibLoaderBase { public static void loadGLDesktop() { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - loadLibrary("jogl_gl2", nativeOSPreload, true); + loadLibrary("jogl_desktop", nativeOSPreload, true); return null; } }); diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java index bf80ec7b3..56d669756 100755 --- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java +++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java @@ -118,4 +118,8 @@ public class Texture1 { frame.dispose(); frame=null; } + + public static void main(String args[]) { + org.junit.runner.JUnitCore.main(Texture1.class.getName()); + } } diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m index 01563a0d1..8c9792b19 100644 --- a/src/newt/native/MacWindow.m +++ b/src/newt/native/MacWindow.m @@ -33,7 +33,7 @@ #import -#import "com_sun_newt_macosx_MacWindow.h" +#import "com_jogamp_newt_macosx_MacWindow.h" #import "NewtMacWindow.h" #import "EventListener.h" diff --git a/src/newt/native/NewtMacWindow.h b/src/newt/native/NewtMacWindow.h index e19be2ed8..560cfe408 100644 --- a/src/newt/native/NewtMacWindow.h +++ b/src/newt/native/NewtMacWindow.h @@ -55,7 +55,7 @@ @end -@interface NewtMacWindow : NSWindow +@interface NewtMacWindow : NSWindow { } -- cgit v1.2.3