diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-gluegen.xml | 2 | ||||
| -rw-r--r-- | make/build-jogl.xml (renamed from make/build.xml) | 562 | ||||
| -rwxr-xr-x | make/config/intptr.cfg (renamed from make/intptr.cfg) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/cg-common-CustomJavaCode.java (renamed from make/cg-common-CustomJavaCode.java) | 0 | ||||
| -rw-r--r-- | make/config/jogl/cg-common.cfg (renamed from make/cg-common.cfg) | 0 | ||||
| -rw-r--r-- | make/config/jogl/cgl-macosx.cfg (renamed from make/cgl-macosx.cfg) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/cglext.cfg (renamed from make/cglext.cfg) | 2 | ||||
| -rwxr-xr-x | make/config/jogl/egl.cfg (renamed from make/egl.cfg) | 4 | ||||
| -rwxr-xr-x | make/config/jogl/eglext.cfg (renamed from make/eglext.cfg) | 2 | ||||
| -rw-r--r-- | make/config/jogl/gl-common-extensions.cfg (renamed from make/gl-common-extensions.cfg) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-common-gl2.cfg (renamed from make/gl-common-gl2.cfg) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-common.cfg (renamed from make/gl-common.cfg) | 2 | ||||
| -rw-r--r-- | make/config/jogl/gl-desktop-tracker.cfg (renamed from make/gl-desktop-tracker.cfg) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/gl-desktop.cfg (renamed from make/gl-desktop.cfg) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/gl-es1.cfg (renamed from make/gl-es1.cfg) | 13 | ||||
| -rwxr-xr-x | make/config/jogl/gl-es2.cfg (renamed from make/gl-es2.cfg) | 4 | ||||
| -rw-r--r-- | make/config/jogl/gl-gl2.cfg (renamed from make/gl-gl2.cfg) | 13 | ||||
| -rw-r--r-- | make/config/jogl/gl-gl2es12.cfg (renamed from make/gl-gl2es12.cfg) | 13 | ||||
| -rwxr-xr-x | make/config/jogl/gl-headers.cfg (renamed from make/gl-headers.cfg) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-if-CustomJavaCode-gl.java (renamed from make/gl-if-CustomJavaCode-gl.java) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-if-CustomJavaCode-gles2.java (renamed from make/gl-if-CustomJavaCode-gles2.java) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/gl-if-gl.cfg (renamed from make/gl-if-gl.cfg) | 2 | ||||
| -rwxr-xr-x | make/config/jogl/gl-if-gl2_es1.cfg (renamed from make/gl-if-gl2_es1.cfg) | 10 | ||||
| -rwxr-xr-x | make/config/jogl/gl-if-gl2_es2.cfg (renamed from make/gl-if-gl2_es2.cfg) | 2 | ||||
| -rw-r--r-- | make/config/jogl/gl-ignore-gl2_es12-special.cfg (renamed from make/gl-ignore-gl2_es12-special.cfg) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomCCode-gl2.c (renamed from make/gl-impl-CustomCCode-gl2.c) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomCCode-gl2es12.c (renamed from make/gl-impl-CustomCCode-gl2es12.c) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomCCode-gles1.c (renamed from make/gl-impl-CustomCCode-gles1.c) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomCCode-gles2.c (renamed from make/gl-impl-CustomCCode-gles2.c) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-common.java (renamed from make/gl-impl-CustomJavaCode-common.java) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gl2.java (renamed from make/gl-impl-CustomJavaCode-gl2.java) | 8 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java (renamed from make/gl-impl-CustomJavaCode-gl2_es2.java) | 0 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java (renamed from make/gl-impl-CustomJavaCode-gl2es12.java) | 8 | ||||
| -rwxr-xr-x | make/config/jogl/gl-impl-CustomJavaCode-gles1.java (renamed from make/gl-impl-CustomJavaCode-gles1.java) | 4 | ||||
| -rwxr-xr-x | make/config/jogl/gl-impl-CustomJavaCode-gles2.java (renamed from make/gl-impl-CustomJavaCode-gles2.java) | 4 | ||||
| -rwxr-xr-x | make/config/jogl/gl-macosx-nsig.cfg (renamed from make/gl-macosx-nsig.cfg) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/gl-win32-nsig.cfg (renamed from make/gl-win32-nsig.cfg) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/gl-x11-nsig.cfg (renamed from make/gl-x11-nsig.cfg) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/glu-CustomJavaCode-base.java (renamed from make/glu-CustomJavaCode-base.java) | 120 | ||||
| -rw-r--r-- | make/config/jogl/glu-CustomJavaCode-gl2.java (renamed from make/glu-CustomJavaCode-gl2.java) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/glu-CustomJavaCode-gl2es1.java (renamed from make/glu-CustomJavaCode-gl2es1.java) | 18 | ||||
| -rwxr-xr-x | make/config/jogl/glu-base.cfg (renamed from make/glu-base.cfg) | 0 | ||||
| -rw-r--r-- | make/config/jogl/glu-common.cfg (renamed from make/glu-common.cfg) | 3 | ||||
| -rwxr-xr-x | make/config/jogl/glu-gl2.cfg (renamed from make/glu-gl2.cfg) | 2 | ||||
| -rwxr-xr-x | make/config/jogl/glu-gl2es1.cfg (renamed from make/glu-gl2es1.cfg) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/glx-CustomCCode.c (renamed from make/glx-CustomCCode.c) | 0 | ||||
| -rw-r--r-- | make/config/jogl/glx-x11.cfg (renamed from make/glx-x11.cfg) | 2 | ||||
| -rwxr-xr-x | make/config/jogl/glxext.cfg (renamed from make/glxext.cfg) | 4 | ||||
| -rwxr-xr-x | make/config/jogl/nsig.cfg (renamed from make/nsig.cfg) | 0 | ||||
| -rwxr-xr-x | make/config/jogl/wgl-CustomCCode.c (renamed from make/wgl-CustomCCode.c) | 0 | ||||
| -rw-r--r-- | make/config/jogl/wgl-win32.cfg (renamed from make/wgl-win32.cfg) | 2 | ||||
| -rw-r--r-- | make/config/jogl/wglext.cfg (renamed from make/wglext.cfg) | 2 | ||||
| -rwxr-xr-x | make/config/nwi/jawt-CustomJavaCode.java (renamed from make/jawt-CustomJavaCode.java) | 0 | ||||
| -rwxr-xr-x | make/config/nwi/jawt-DrawingSurfaceInfo-CustomJavaCode.java (renamed from make/jawt-DrawingSurfaceInfo-CustomJavaCode.java) | 6 | ||||
| -rw-r--r-- | make/config/nwi/jawt-macosx.cfg (renamed from make/jawt-macosx.cfg) | 8 | ||||
| -rw-r--r-- | make/config/nwi/jawt-win32.cfg (renamed from make/jawt-win32.cfg) | 10 | ||||
| -rw-r--r-- | make/config/nwi/jawt-x11.cfg (renamed from make/jawt-x11.cfg) | 8 | ||||
| -rwxr-xr-x | make/config/nwi/x11-CustomCCode.c (renamed from make/x11-CustomCCode.c) | 8 | ||||
| -rw-r--r-- | make/config/nwi/x11-lib.cfg (renamed from make/x11-lib.cfg) | 4 | ||||
| -rw-r--r-- | make/jogl.compiler.xml | 1 | ||||
| -rw-r--r-- | make/lstjars.sh | 57 | ||||
| -rw-r--r-- | make/make.jogl.all.linux-x86.sh | 1 | ||||
| -rw-r--r-- | make/make.jogl.all.macosx.sh | 9 | ||||
| -rw-r--r-- | make/newt.compiler.xml | 15 | ||||
| -rw-r--r-- | make/newtRIversion | 8 | ||||
| -rw-r--r-- | make/newtversion | 8 | ||||
| -rw-r--r-- | make/nwi.compiler.xml | 15 | ||||
| -rw-r--r-- | make/nwiRIversion | 8 | ||||
| -rw-r--r-- | make/nwiversion | 8 | ||||
| -rw-r--r-- | make/stub_includes/opengl/cg.c (renamed from make/stub_includes/common/cg.c) | 0 | ||||
| -rw-r--r-- | make/stub_includes/opengl/gl.c (renamed from make/stub_includes/common/gl.c) | 0 | ||||
| -rwxr-xr-x | make/stub_includes/opengl/gles1.c (renamed from make/stub_includes/common/gles1.c) | 0 | ||||
| -rwxr-xr-x | make/stub_includes/opengl/gles2.c (renamed from make/stub_includes/common/gles2.c) | 0 | ||||
| -rw-r--r-- | make/stub_includes/opengl/glu-impl.c (renamed from make/stub_includes/common/glu-impl.c) | 0 | ||||
| -rw-r--r-- | make/stub_includes/opengl/glu.c (renamed from make/stub_includes/common/glu.c) | 0 |
75 files changed, 452 insertions, 530 deletions
diff --git a/make/build-gluegen.xml b/make/build-gluegen.xml index fb21071ef..992599cdb 100644 --- a/make/build-gluegen.xml +++ b/make/build-gluegen.xml @@ -176,4 +176,4 @@ <antcall target="build.gluegen.task" /> </target> -</project>
\ No newline at end of file +</project> diff --git a/make/build.xml b/make/build-jogl.xml index 6b4f6e850..e51116ed3 100644 --- a/make/build.xml +++ b/make/build-jogl.xml @@ -14,7 +14,7 @@ - - NOTE: because the GlueGen config files have their own relative paths - which cannot be overridden by GlueGen, GlueGen MUST be run from - - the "make" directory. This also means that this build.xml MUST + - the "make" directory. This also means that this build-jogl.xml MUST - be run from the "make" directory. - - Public targets: @@ -48,26 +48,25 @@ - - Some environment defs affecting compilation - jogl.cdcfp - Using the CDC Java runtime library + setup.cdcfp - Using the CDC Java runtime library - no DoubleBuffer - no LongBuffer This will set - -> jogl.noAWT - -> jogl.nogl2 + -> setup.noAWT + -> setup.nogl2 - Internal settings, may not be necessary to set them manually, since all JAR archives are orthogonal. - jogl.noes1 - jogl.noes2 - jogl.nogl2 - jogl.noAWT - jogl.noutil - no com.sun.opengl.util.* - jogl.nonewt - jogl.noX11WindowsMacOsX, which implies: - jogl.noX11 - jogl.noWindows - jogl.noMacOsX + setup.noes1 + setup.noes2 + setup.nogl2 + setup.noAWT + setup.noutil - no com.sun.opengl.util.* + setup.noX11WindowsMacOsX, which implies: + setup.noX11 + setup.noWindows + setup.noMacOsX --> <project name="JOGL" basedir="." default="all"> @@ -91,58 +90,58 @@ --> <target name="base.init"> - <condition property="jogl.noes"> + <condition property="setup.noes"> <and> - <isset property="jogl.noes1"/> - <isset property="jogl.noes2"/> + <isset property="setup.noes1"/> + <isset property="setup.noes2"/> </and> </condition> - <condition property="jogl.nogl2"> - <isset property="jogl.cdcfp"/> + <condition property="setup.nogl2"> + <isset property="setup.cdcfp"/> </condition> - <condition property="jogl.noAWT"> - <isset property="jogl.cdcfp"/> + <condition property="setup.noAWT"> + <isset property="setup.cdcfp"/> </condition> <condition property="isCDCFP"> - <isset property="jogl.cdcfp"/> + <isset property="setup.cdcfp"/> </condition> <condition property="javac.bootclasspath.jar" value="../../gluegen/make/lib/cdc_fp.jar"> - <isset property="jogl.cdcfp"/> + <isset property="setup.cdcfp"/> </condition> - <echo message="jogl.cdcfp: ${jogl.cdcfp}" /> - <echo message="jogl.noAWT: ${jogl.noAWT}" /> + <echo message="setup.cdcfp: ${setup.cdcfp}" /> + <echo message="setup.noAWT: ${setup.noAWT}" /> <echo message="javac.bootclasspath.jar: ${javac.bootclasspath.jar}" /> - <echo message="jogl.noes : ${jogl.noes}" /> - <echo message="jogl.noes1: ${jogl.noes1}" /> - <echo message="jogl.noes2: ${jogl.noes2}" /> - <echo message="jogl.nogl2: ${jogl.nogl2}" /> + <echo message="setup.noes : ${setup.noes}" /> + <echo message="setup.noes1: ${setup.noes1}" /> + <echo message="setup.noes2: ${setup.noes2}" /> + <echo message="setup.nogl2: ${setup.nogl2}" /> - <condition property="jogl.noX11WindowsMacOsX"> + <condition property="setup.noX11WindowsMacOsX"> <and> - <isset property="jogl.noX11"/> - <isset property="jogl.noWindows"/> - <isset property="jogl.noMacOsX"/> + <isset property="setup.noX11"/> + <isset property="setup.noWindows"/> + <isset property="setup.noMacOsX"/> </and> </condition> - <condition property="jogl.noX11"> - <isset property="jogl.noX11WindowsMacOsX"/> + <condition property="setup.noX11"> + <isset property="setup.noX11WindowsMacOsX"/> </condition> - <condition property="jogl.noWindows"> - <isset property="jogl.noX11WindowsMacOsX" /> + <condition property="setup.noWindows"> + <isset property="setup.noX11WindowsMacOsX" /> </condition> - <condition property="jogl.noMacOsX"> - <isset property="jogl.noX11WindowsMacOsX" /> + <condition property="setup.noMacOsX"> + <isset property="setup.noX11WindowsMacOsX" /> </condition> - <echo message="jogl.noX11WindowsMacOsX: ${jogl.noX11WindowsMacOsX}" /> - <echo message="jogl.noX11: ${jogl.noX11}" /> - <echo message="jogl.noWindows: ${jogl.noWindows}" /> - <echo message="jogl.noMacOsX: ${jogl.noMacOsX}" /> + <echo message="setup.noX11WindowsMacOsX: ${setup.noX11WindowsMacOsX}" /> + <echo message="setup.noX11: ${setup.noX11}" /> + <echo message="setup.noWindows: ${setup.noWindows}" /> + <echo message="setup.noMacOsX: ${setup.noMacOsX}" /> <!-- partitioning --> @@ -171,7 +170,7 @@ value="com/sun/opengl/impl/glsl/fixed/**"/> <property name="java.part.gl2es12.x11" - value="com/sun/opengl/impl/gl2es12/**, com/sun/opengl/impl/x11/glx/*, com/sun/opengl/impl/x11/*"/> + value="com/sun/opengl/impl/gl2es12/**, com/sun/opengl/impl/x11/glx/*"/> <property name="java.part.gl2es12.win" value="com/sun/opengl/impl/gl2es12/**, com/sun/opengl/impl/windows/wgl/*"/> @@ -183,7 +182,7 @@ value="javax/media/opengl/TraceGL2ES12.*, javax/media/opengl/DebugGL2ES12.*"/> <property name="java.part.gl2.x11" - value="com/sun/opengl/impl/**/gl2/**, com/sun/opengl/impl/x11/glx/*, com/sun/opengl/impl/x11/*"/> + value="com/sun/opengl/impl/**/gl2/**, com/sun/opengl/impl/x11/glx/*"/> <property name="java.part.gl2.win" value="com/sun/opengl/impl/**/gl2/**, com/sun/opengl/impl/windows/wgl/*"/> @@ -207,7 +206,7 @@ value="javax/media/opengl/TraceGLES2.*, javax/media/opengl/DebugGLES2.*"/> <property name="java.part.awt" - value="com/sun/opengl/impl/jawt/**, javax/media/opengl/awt/**, com/sun/opengl/impl/**/awt/**"/> + value="javax/media/opengl/awt/**, com/sun/opengl/impl/**/awt/**"/> <property name="java.part.util" value="com/sun/opengl/util/io/**, com/sun/opengl/util/texture/**, com/sun/opengl/impl/packrect/*"/> @@ -218,70 +217,59 @@ <property name="java.part.util.gl2" value="com/sun/opengl/util/**/gl2/**"/> - <property name="java.part.newt" - value="com/sun/javafx/newt/*, com/sun/javafx/newt/x11/*, com/sun/javafx/newt/windows/*, com/sun/javafx/newt/kd/*"/> - - <property name="java.part.newt.awt" - value="com/sun/javafx/newt/awt/*"/> - <!-- condition excludes --> <condition property="java.excludes.egl" value="${java.part.egl}"> <and> - <isset property="jogl.noes1"/> - <isset property="jogl.noes2"/> + <isset property="setup.noes1"/> + <isset property="setup.noes2"/> </and> </condition> <condition property="java.excludes.gl2" value="${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.util.gl2}, ${java.part.glugl2}"> - <isset property="jogl.nogl2"/> + <isset property="setup.nogl2"/> </condition> <condition property="java.excludes.es1" value="${java.part.es1}, ${java.part.es1.dbg}"> - <isset property="jogl.noes1"/> + <isset property="setup.noes1"/> </condition> <condition property="java.excludes.es2" value="${java.part.es2}, ${java.part.es2.dbg}"> - <isset property="jogl.noes2"/> + <isset property="setup.noes2"/> </condition> <condition property="java.excludes.awt" - value="${java.part.awt}, ${java.part.util.awt}, ${java.part.newt.awt}"> - <isset property="jogl.noAWT"/> + value="${java.part.awt}, ${java.part.util.awt}"> + <isset property="setup.noAWT"/> </condition> <condition property="java.excludes.util" value="${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}"> - <isset property="jogl.noutil"/> + <isset property="setup.noutil"/> </condition> <condition property="java.excludes.x11" value="${java.part.x11}"> - <isset property="jogl.noX11"/> + <isset property="setup.noX11"/> </condition> <condition property="java.excludes.win" value="${java.part.win}"> - <isset property="jogl.noWindows"/> + <isset property="setup.noWindows"/> </condition> <condition property="java.excludes.macosx" value="${java.part.macosx}"> - <isset property="jogl.noMacOsX"/> - </condition> - - <condition property="java.excludes.newt" - value="${java.part.newt}, ${java.part.newt.awt}"> - <isset property="jogl.nonewt"/> + <isset property="setup.noMacOsX"/> </condition> <condition property="java.excludes.cdcfp" value="com/sun/opengl/util/AWTAnimatorImpl*, com/sun/opengl/util/TGAWriter*, com/sun/opengl/util/texture/spi/awt/**"> - <isset property="jogl.cdcfp"/> + <isset property="setup.cdcfp"/> </condition> <property name="java.excludes.javadoc.packagenames" @@ -290,7 +278,7 @@ <property name="java.excludes.fixme" value="com/sun/opengl/impl/gl2/fixme/** com/sun/javafx/audio/windows/waveout/TestSpatialization.java" /> - <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.egl}, ${java.excludes.gl2}, ${java.excludes.es1}, ${java.excludes.es2}, ${java.excludes.awt}, ${java.excludes.glugl2}, ${java.excludes.util}, ${java.excludes.x11}, ${java.excludes.win}, ${java.excludes.macosx}, ${java.excludes.newt}, ${java.excludes.cdcfp}" /> + <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.egl}, ${java.excludes.gl2}, ${java.excludes.es1}, ${java.excludes.es2}, ${java.excludes.awt}, ${java.excludes.glugl2}, ${java.excludes.util}, ${java.excludes.x11}, ${java.excludes.win}, ${java.excludes.macosx}, ${java.excludes.cdcfp}" /> <echo message="java.excludes.all: ${java.excludes.all}" /> @@ -348,15 +336,15 @@ <isset property="rootrel.build"/> </not> </condition> - <property name="rootrel.src.java" value="src/classes" /> - <property name="rootrel.src.c.jogl" value="src/native/jogl" /> - <property name="rootrel.src.c.newt" value="src/native/newt" /> - <property name="rootrel.src.c.openmax" value="src/native/openmax" /> + <property name="rootrel.build.jogl" value="${rootrel.build}-jogl" /> + <property name="rootrel.src.java" value="src/jogl/classes" /> + <property name="rootrel.src.c" value="src/jogl/native" /> + <property name="rootrel.src.c.openmax" value="src/jogl/native/openmax" /> - <property name="rootrel.src.generated" value="${rootrel.build}/gensrc" /> + <property name="rootrel.src.generated" value="${rootrel.build.jogl}/gensrc" /> <property name="rootrel.generated.c.jogl" value="${rootrel.src.generated}/native/jogl" /> <property name="rootrel.generated.c.cg" value="${rootrel.src.generated}/native/jogl_cg" /> - <property name="rootrel.obj" value="${rootrel.build}/obj" /> + <property name="rootrel.obj" value="${rootrel.build.jogl}/obj" /> <property name="rootrel.obj.jogl" value="${rootrel.obj}/jogl" /> <property name="rootrel.obj.cg" value="${rootrel.obj}/jogl_cg" /> @@ -367,11 +355,12 @@ <property name="gluegen.build.xml" value="${gluegen.make.dir}/build.xml" /> <property name="gluegen.jar" value="../../gluegen/${rootrel.build}/gluegen.jar" /> <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" /> + <property name="nwi.all.jar" value="../${rootrel.build}-nwi/nwi.all.jar" /> <!-- The source directories. --> <property name="src.java" value="${project.root}/${rootrel.src.java}" /> <property name="src.c" value="${project.root}/${rootrel.src.c}" /> - <property name="build" value="${project.root}/${rootrel.build}" /> + <property name="build" value="${project.root}/${rootrel.build.jogl}" /> <property name="tempdir" value="${project.root}/build-temp" /> <!-- The generated source directories. --> @@ -379,7 +368,6 @@ <property name="src.generated.java" value="${src.generated}/classes" /> <property name="src.generated.java.cg" value="${src.generated}/classes/com/sun/opengl/cg" /> <property name="src.generated.c" value="${src.generated}/native/jogl" /> - <property name="src.generated.c.newt" value="${src.generated}/native/newt" /> <property name="src.generated.c.openmax" value="${src.generated}/native/openmax" /> <property name="src.generated.c.cg" value="${src.generated}/native/jogl_cg" /> @@ -390,8 +378,8 @@ <property name="obj.cg" value="${project.root}/${rootrel.obj.cg}" /> <!-- The GL headers from which Java files are generated --> - <property name="config" value="${project.root}/make" /> - <property name="stub.includes" value="${config}/stub_includes" /> + <property name="config" value="${make}/config/jogl" /> + <property name="stub.includes" value="${make}/stub_includes" /> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> <property name="stub.includes.opengl" value="${stub.includes}/opengl" /> <property name="stub.includes.common" value="${stub.includes}/common" /> @@ -412,7 +400,7 @@ <include name="jni/**" /> </fileset> <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" /> - <fileset id="stub.includes.dependencies.fileset.3" dir="."> + <fileset id="stub.includes.dependencies.fileset.3" dir="${config}"> <include name="*.cfg" /> <include name="gl*.java" /> <include name="*.c" /> @@ -428,8 +416,8 @@ </dirset> <fileset id="stub.includes.cg.dependencies.fileset" dir="."> <include name="${stub.includes.dir}/cg/**" /> - <include name="cg-common.cfg" /> - <include name="cg-common-CustomJavaCode.java" /> + <include name="${config}/cg-common.cfg" /> + <include name="${config}/cg-common-CustomJavaCode.java" /> </fileset> <!-- Create the classpath that includes GlueGen and @@ -440,6 +428,11 @@ <pathelement location="${antlr.jar}" /> </path> + <path id="nwigluegen.classpath"> + <pathelement location="${nwi.all.jar}" /> + <pathelement location="${gluegen-rt.jar}" /> + </path> + <!-- Create the classpath that includes GlueGen and - the current classes for building the composable pipelines. --> @@ -468,8 +461,6 @@ <property name="jogl.gl2.dbg.jar" value="${build}/jogl.gl2.dbg.jar" /> <property name="jogl.fixed.jar" value="${build}/jogl.fixed.jar" /> <property name="jogl.awt.jar" value="${build}/jogl.awt.jar" /> - <property name="newt.jar" value="${build}/newt.jar" /> - <property name="newt.awt.jar" value="${build}/newt.awt.jar" /> <property name="jogl.util.jar" value="${build}/jogl.util.jar" /> <property name="jogl.util.gl2.jar" value="${build}/jogl.util.gl2.jar" /> <property name="jogl.util.awt.jar" value="${build}/jogl.util.awt.jar" /> @@ -483,7 +474,7 @@ <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /> <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 ${base_version} Specification" /> <property name="javadoc.overview" value="spec-overview.html" /> - <property name="javadoc.spec.packagenames" value="javax.media.nwi.*,javax.media.opengl.*,com.sun.javafx.newt" /> + <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.sun.opengl.util.*" /> @@ -491,22 +482,22 @@ <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to <a href="http://jcp.org/en/jsr/detail?id=231">license terms</a>." /> </target> - <target name="declare.gl.gles1" unless="jogl.noes1"> + <target name="declare.gl.gles1" unless="setup.noes1"> <property name="gles1.headers" value="${stub.includes.dir}/opengl/GLES/*.h" /> <!-- NOTE: this MUST be relative for FileSet --> <!-- CHECK: this may need to be pruned for each platform --> </target> - <target name="declare.gl.gles2" unless="jogl.noes2"> + <target name="declare.gl.gles2" unless="setup.noes2"> <property name="gles2.headers" value="${stub.includes.dir}/opengl/GLES2/*.h" /> <!-- NOTE: this MUST be relative for FileSet --> <!-- CHECK: this may need to be pruned for each platform --> </target> - <target name="declare.gl.gles" unless="jogl.noes" depends="declare.gl.gles1, declare.gl.gles2"> + <target name="declare.gl.gles" unless="setup.noes" depends="declare.gl.gles1, declare.gl.gles2"> <!-- Prepare to build the EGL interface --> <property name="window.es.cfg" value="${config}/egl.cfg" /> <property name="window.es.ext.cfg" value="${config}/eglext.cfg" /> <property name="window.es.system" value="egl"/> </target> - <target name="declare.gl.gl2" unless="jogl.nogl2"> + <target name="declare.gl.gl2" unless="setup.nogl2"> <property name="gl2.headers" value="${stub.includes.dir}/opengl/GL/*.h" /> <!-- NOTE: this MUST be relative for FileSet --> <!-- CHECK: this may need to be pruned for each platform --> </target> @@ -529,11 +520,6 @@ <mkdir dir="${src.generated.c}/MacOSX" /> <mkdir dir="${src.generated.c}/Windows" /> <mkdir dir="${src.generated.c}/X11" /> - <mkdir dir="${src.generated.c.newt}" /> - <mkdir dir="${src.generated.c.newt}/MacOSX" /> - <mkdir dir="${src.generated.c.newt}/Windows" /> - <mkdir dir="${src.generated.c.newt}/X11" /> - <mkdir dir="${src.generated.c.newt}/KD" /> <mkdir dir="${src.generated.c.openmax}" /> <mkdir dir="${classes}" /> <mkdir dir="${obj}" /> @@ -624,7 +610,7 @@ <target name="java.generate.copy2temp"> <copy todir="${tempdir}"> - <fileset dir="../${rootrel.build}" + <fileset dir="../${rootrel.build.jogl}" includes="gensrc/classes/**" /> </copy> </target> @@ -632,8 +618,8 @@ <target name="java.generate.gl_if"> <echo message="Generating GL interface" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/gles2.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/gles2.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/gl-if-gl.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -644,8 +630,8 @@ <target name="java.generate.gl2_es1_if"> <echo message="Generating GL2_ES1 interface" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/gles1.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/gles1.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/gl-if-gl2_es1.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -656,8 +642,8 @@ <target name="java.generate.gl2_es2_if"> <echo message="Generating GL2_ES2 interface" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/gles2.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/gles2.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/gl-if-gl2_es2.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -668,8 +654,8 @@ <target name="java.generate.gl2"> <echo message="Generating GL2 interface and implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/gl.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/gl.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/gl-gl2.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -680,8 +666,8 @@ <target name="java.generate.gl2es12"> <echo message="Generating GL2ES12 interface and implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/gl.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/gl.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/gl-gl2es12.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -692,8 +678,8 @@ <target name="java.generate.gles1"> <echo message="Generating GLES1 interface and implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/gles1.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/gles1.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/gl-es1.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -704,8 +690,8 @@ <target name="java.generate.gles2"> <echo message="Generating GLES2 interface and implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/gles2.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/gles2.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/gl-es2.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -728,8 +714,8 @@ <target name="java.generate.glu.base"> <echo message="Generating GLU class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/glu.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/glu.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/glu-base.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -740,8 +726,8 @@ <target name="java.generate.glu.GL2ES1"> <echo message="Generating GLU class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/glu.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/glu.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/glu-gl2es1.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -749,11 +735,11 @@ </gluegen> </target> - <target name="java.generate.glu.GL2" unless="jogl.nogl2"> + <target name="java.generate.glu.GL2" unless="setup.nogl2"> <echo message="Generating GLU class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.common}/glu.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/glu.c" + outputRootDir="../${rootrel.build.jogl}" config="${config}/glu-gl2.cfg" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -761,11 +747,11 @@ </gluegen> </target> - <target name="java.generate.platform.glext" unless="jogl.nogl2"> + <target name="java.generate.platform.glext" unless="setup.nogl2"> <echo message="Generating platform-specific OpenGL extension class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${glext.platform.header}" - outputRootDir="../${rootrel.build}" + outputRootDir="../${rootrel.build.jogl}" config="${glext.platform.cfg}" includeRefid="stub.includes.fileset.all.gl2" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -773,24 +759,12 @@ </gluegen> </target> - <target name="java.generate.window.lib" if="windowlib.os.cfg"> - <echo message="Generating Windowing Lib implementation class" /> - <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.dir}/${window.os.system}/window-lib.c" - outputRootDir="../${rootrel.build}" - config="${windowlib.os.cfg}" - includeRefid="stub.includes.fileset.platform" - emitter="com.sun.gluegen.JavaEmitter"> - <classpath refid="gluegen.classpath" /> - </gluegen> - </target> - - <target name="java.generate.window.system.es" if="window.es.cfg" unless="jogl.noes"> + <target name="java.generate.window.system.es" if="window.es.cfg" unless="setup.noes"> <echo message="Generating EGL implementation class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.es.system}/** ${stub.includes.dir}/common/**" /> <gluegen src="${stub.includes.dir}/${window.es.system}/window-system.c" - outputRootDir="../${rootrel.build}" + outputRootDir="../${rootrel.build.jogl}" config="${window.es.cfg}" includeRefid="stub.includes.fileset.platform" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -798,12 +772,12 @@ </gluegen> </target> - <target name="java.generate.window.system.es.ext" if="window.es.ext.cfg" unless="jogl.noes"> + <target name="java.generate.window.system.es.ext" if="window.es.ext.cfg" unless="setup.noes"> <echo message="Generating EGLExt implementation class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.es.system}/** ${stub.includes.dir}/common/**" /> <gluegen src="${stub.includes.dir}/${window.es.system}/window-system-ext.c" - outputRootDir="../${rootrel.build}" + outputRootDir="../${rootrel.build.jogl}" config="${window.es.ext.cfg}" includeRefid="stub.includes.fileset.platform" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -811,11 +785,11 @@ </gluegen> </target> - <target name="java.generate.window.system.os" if="window.os.cfg" unless="jogl.nogl2"> + <target name="java.generate.window.system.os" if="window.os.cfg" unless="setup.nogl2"> <echo message="Generating WGL/GLX/CGL/EGL implementation class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.dir}/${window.os.system}/window-system.c" - outputRootDir="../${rootrel.build}" + outputRootDir="../${rootrel.build.jogl}" config="${window.os.cfg}" includeRefid="stub.includes.fileset.platform" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -823,62 +797,45 @@ </gluegen> </target> - <target name="java.generate.jawt" unless="jogl.noAWT"> - <!-- NOTE: the "literalInclude" in this GlueGen call is simply to - - get around the fact that neither FileSet nor DirSet can - - handle different drives in an effective manner. --> - <echo message="Generating JAWT interface class" /> - <echo message="java.home.dir=${java.home.dir}" /> - <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${jawt.platform.header}" - outputRootDir="../${rootrel.build}" - config="${jawt.cfg}" - literalInclude="${stub.includes.dir}/jni" - includeRefid="stub.includes.fileset.platform" - emitter="com.sun.gluegen.JavaEmitter"> - <classpath refid="gluegen.classpath" /> - </gluegen> + <target name="java.generate.SystemUtil.javame_cdc_fp" if="setup.cdcfp"> + <copy file="../src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/impl/SystemUtil.java" /> </target> - <target name="java.generate.SystemUtil.javame_cdc_fp" if="jogl.cdcfp"> - <copy file="../src/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/impl/SystemUtil.java" /> - </target> - - <target name="java.generate.SystemUtil.javase" unless="jogl.cdcfp"> - <copy file="../src/classes/com/sun/opengl/impl/SystemUtil.java.javase" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/impl/SystemUtil.java" /> + <target name="java.generate.SystemUtil.javase" unless="setup.cdcfp"> + <copy file="../src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/impl/SystemUtil.java" /> </target> <!-- Generate the SystemUtil class for this particular profile --> <target name="java.generate.SystemUtil" depends="java.generate.SystemUtil.javase, java.generate.SystemUtil.javame_cdc_fp" /> - <target name="java.generate.BufferUtil.javame_cdc_fp" if="jogl.cdcfp"> - <copy file="../src/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp" tofile="../${rootrel.build}/gensrc/classes/javax/media/opengl/util/BufferUtil.java" /> + <target name="java.generate.BufferUtil.javame_cdc_fp" if="setup.cdcfp"> + <copy file="../src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp" tofile="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/util/BufferUtil.java" /> </target> - <target name="java.generate.BufferUtil.javase" unless="jogl.cdcfp"> - <copy file="../src/classes/javax/media/opengl/util/BufferUtil.java.javase" tofile="../${rootrel.build}/gensrc/classes/javax/media/opengl/util/BufferUtil.java" /> + <target name="java.generate.BufferUtil.javase" unless="setup.cdcfp"> + <copy file="../src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javase" tofile="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/util/BufferUtil.java" /> </target> <!-- Generate the BufferUtil class for this particular profile --> <target name="java.generate.BufferUtil" depends="java.generate.BufferUtil.javase, java.generate.BufferUtil.javame_cdc_fp" /> - <target name="java.generate.TextureIO.javame_cdc_fp" if="jogl.cdcfp"> - <copy file="../src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/util/texture/TextureIO.java" /> - <copy file="../src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/util/texture/spi/DDSImage.java" /> - <copy file="../src/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/util/texture/spi/TGAImage.java" /> + <target name="java.generate.TextureIO.javame_cdc_fp" if="setup.cdcfp"> + <copy file="../src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/util/texture/TextureIO.java" /> + <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/util/texture/spi/DDSImage.java" /> + <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/util/texture/spi/TGAImage.java" /> </target> - <target name="java.generate.TextureIO.javase" unless="jogl.cdcfp"> + <target name="java.generate.TextureIO.javase" unless="setup.cdcfp"> <!-- For debugging --> <!-- - <copy file="../src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/util/texture/TextureIO.java" /> - <copy file="../src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/util/texture/spi/DDSImage.java" /> - <copy file="../src/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/util/texture/spi/TGAImage.java" /> + <copy file="../src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/util/texture/TextureIO.java" /> + <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/util/texture/spi/DDSImage.java" /> + <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/util/texture/spi/TGAImage.java" /> --> - <copy file="../src/classes/com/sun/opengl/util/texture/TextureIO.java.javase" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/util/texture/TextureIO.java" /> - <copy file="../src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/util/texture/spi/DDSImage.java" /> - <copy file="../src/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase" tofile="../${rootrel.build}/gensrc/classes/com/sun/opengl/util/texture/spi/TGAImage.java" /> + <copy file="../src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/util/texture/TextureIO.java" /> + <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/util/texture/spi/DDSImage.java" /> + <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase" tofile="../${rootrel.build.jogl}/gensrc/classes/com/sun/opengl/util/texture/spi/TGAImage.java" /> </target> @@ -889,9 +846,7 @@ <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.os.system}/** ${stub.includes.dir}/${window.es.system}/** ${stub.includes.dir}/common/** ${stub.includes.dir}/opengl/**" /> <antcall target="java.generate.platform.glext" inheritRefs="true" /> - <antcall target="java.generate.window.lib" inheritRefs="true" /> <antcall target="java.generate.window.system.os" inheritRefs="true" /> - <antcall target="java.generate.jawt" inheritRefs="true" /> </target> <!-- @@ -921,11 +876,8 @@ <antcall target="java.generate.gl.platforms" inheritRefs="true"> <param name="window.os.system" value="x11"/> <param name="window.os.cfg" value="${config}/glx-x11.cfg" /> - <param name="windowlib.os.cfg" value="${config}/x11-lib.cfg" /> <param name="glext.platform.cfg" value="${config}/glxext.cfg" /> <param name="glext.platform.header" value="${stub.includes.dir}/x11/glxext.c" /> - <param name="jawt.cfg" value="${config}/jawt-x11.cfg" /> - <param name="jawt.platform.header" value="${stub.includes.dir}/jni/x11/jawt_md.h" /> </antcall> <echo message="Generating platform-specifics: Win32" /> @@ -934,8 +886,6 @@ <param name="window.os.cfg" value="${config}/wgl-win32.cfg" /> <param name="glext.platform.cfg" value="${config}/wglext.cfg" /> <param name="glext.platform.header" value="${stub.includes.dir}/win32/wglext.c" /> - <param name="jawt.cfg" value="${config}/jawt-win32.cfg" /> - <param name="jawt.platform.header" value="${stub.includes.dir}/jni/win32/jawt_md.h" /> </antcall> <echo message="Generating platform-specifics: MaxOsX" /> @@ -944,8 +894,6 @@ <param name="window.os.cfg" value="${config}/cgl-macosx.cfg" /> <param name="glext.platform.cfg" value="${config}/cglext.cfg" /> <param name="glext.platform.header" value="${stub.includes.dir}/macosx/cglext.c" /> - <param name="jawt.cfg" value="${config}/jawt-macosx.cfg" /> - <param name="jawt.platform.header" value="${stub.includes.dir}/jni/macosx/jawt_md.h" /> </antcall> <!-- Generate GLU class --> @@ -991,8 +939,8 @@ classpathref="gluegen.classpath" /> <!-- Generate CgGL interface class --> - <gluegen src="${stub.includes.common}/cg.c" - outputRootDir="../${rootrel.build}" + <gluegen src="${stub.includes.opengl}/cg.c" + outputRootDir="../${rootrel.build.jogl}" config="cg-common.cfg" includeRefid="stub.includes.cg.fileset.all" emitter="com.sun.gluegen.JavaEmitter"> @@ -1004,7 +952,7 @@ <!-- - Build and dependency rules for the composable pipeline --> - <target name="java.generate.composable.pipeline.check.es1" unless="jogl.noes1"> + <target name="java.generate.composable.pipeline.check.es1" unless="setup.noes1"> <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> @@ -1020,7 +968,7 @@ </target> - <target name="java.generate.composable.pipeline.check.es2" unless="jogl.noes2"> + <target name="java.generate.composable.pipeline.check.es2" unless="setup.noes2"> <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> @@ -1036,7 +984,7 @@ </target> - <target name="java.generate.composable.pipeline.check.gl2es12" unless="jogl.nogl2"> + <target name="java.generate.composable.pipeline.check.gl2es12" unless="setup.nogl2"> <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> @@ -1051,7 +999,7 @@ targetfile="${src.generated.java}/javax/media/opengl/DebugGL2ES12.java" /> </target> - <target name="java.generate.composable.pipeline.check.gl2" unless="jogl.nogl2"> + <target name="java.generate.composable.pipeline.check.gl2" unless="setup.nogl2"> <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> @@ -1100,13 +1048,13 @@ <target name="java.generate.composable.pipeline.check"> <condition property="java.generate.composable.pipeline.skip.es1"> - <isset property="jogl.noes1"/> + <isset property="setup.noes1"/> </condition> <condition property="java.generate.composable.pipeline.skip.es2"> - <isset property="jogl.noes2"/> + <isset property="setup.noes2"/> </condition> <condition property="java.generate.composable.pipeline.skip.gl2"> - <isset property="jogl.nogl2"/> + <isset property="setup.nogl2"/> </condition> </target> <target name="java.generate.composable.pipeline" depends="java.generate.composable.pipeline.check, java.generate.composable.pipeline.es1, java.generate.composable.pipeline.es2, java.generate.composable.pipeline.gl2"> @@ -1116,7 +1064,8 @@ <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> - <srcfilelist dir="${classes}/javax/media/opengl/sub/fixed" files="GLFixedFuncIf.class" /> + <srcfilelist dir="${classes}/com/sun/opengl/util/glsl/fixed" files="FixedFuncHook.class" /> + <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES1.class" /> <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES2.class" /> <targetfileset dir="${src.generated.java}/com/sun/opengl/impl/fixed" includes="GLFixedFuncImpl.java" /> @@ -1124,16 +1073,16 @@ <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.generate.composable.pipeline.custom.skip.glfixfunc" - srcfile="${classes}/javax/media/opengl/GL2ES2.class" - targetfile="${src.generated.java}/javax/media/opengl/impl/fixed/GLFixedFuncImpl.java" /> + srcfile="${classes}/javax/media/opengl/GL2ES1.class" + targetfile="${src.generated.java}/com/sun/opengl/util/glsl/fixed/FixedFuncImpl.java" /> </target> <target name="java.generate.composable.pipeline.custom.glfixfunc" depends="java.generate.composable.pipeline.custom.check.glfixfunc" unless="java.generate.composable.pipeline.custom.skip.glfixfunc"> <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true"> - <arg value="javax.media.opengl.sub.fixed.GLFixedFuncIf" /> - <arg value="${src.generated.java}/com/sun/opengl/impl/fixed" /> - <arg value="com.sun.opengl.impl.fixed.GLFixedFuncImpl" /> - <arg value="javax.media.opengl.sub.fixed.GLFixedFuncHookIf" /> - <arg value="javax.media.opengl.GL" /> + <arg value="javax.media.opengl.GL2ES1" /> + <arg value="${src.generated.java}/com/sun/opengl/util/glsl/fixed" /> + <arg value="com.sun.opengl.util.glsl.fixed.FixedFuncImpl" /> + <arg value="com.sun.opengl.util.glsl.fixed.FixedFuncHook" /> + <arg value="javax.media.opengl.GL2ES2" /> <arg value="prolog_xor_downstream" /> <classpath refid="pipeline.classpath" /> </java> @@ -1151,11 +1100,11 @@ <!-- Perform the first pass Java compile. --> <javac destdir="${classes}" - classpath="${gluegen-rt.jar}" - includes="javax/media/nwi/** javax/media/opengl/sub/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java" + includes="javax/media/opengl/sub/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java" fork="yes" memoryMaximumSize="128m" source="1.4" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="nwigluegen.classpath"/> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> @@ -1166,11 +1115,11 @@ <javac destdir="${classes}" excludes="${java.excludes.all}" source="${jogl.sourcelevel}" - classpath="${gluegen-rt.jar}" bootclasspath="${javac.bootclasspath.jar}" fork="yes" memoryMaximumSize="128m" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="nwigluegen.classpath"/> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> @@ -1181,10 +1130,10 @@ <javac destdir="${classes}" excludes="${java.excludes.all}" source="${jogl.sourcelevel}" - classpath="${gluegen-rt.jar}" fork="yes" memoryMaximumSize="128m" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="nwigluegen.classpath"/> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> @@ -1197,11 +1146,11 @@ <javac destdir="${classes}" excludes="${java.excludes.all}" source="${jogl.sourcelevel}" - classpath="${gluegen-rt.jar}" bootclasspath="${javac.bootclasspath.jar}" fork="yes" memoryMaximumSize="128m" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="nwigluegen.classpath"/> <src path="${src.generated.java}" /> </javac> </target> @@ -1211,10 +1160,10 @@ <javac destdir="${classes}" excludes="${java.excludes.all}" source="${jogl.sourcelevel}" - classpath="${gluegen-rt.jar}" fork="yes" memoryMaximumSize="128m" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="nwigluegen.classpath"/> <src path="${src.generated.java}" /> </javac> </target> @@ -1432,105 +1381,60 @@ <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition> - <!-- since properties are immutable, we need one for each target --> - <condition property="@{output.lib.name}.useLibJAWT"> - <istrue value="@{c.compiler.use-jawt}" /> - </condition> - <echo message="c.compiler.use-jawt @{c.compiler.use-jawt}"/> - <echo message="@{output.lib.name}.useLibJAWT ${@{output.lib.name}.useLibJAWT}"/> - - <condition property="@{output.lib.name}.useLibJVM"> - <and> - <isset property="isHPUX"/> - <isset property="@{output.lib.name}.useLibJAWT"/> - </and> - </condition> - - <patternset id="c.src.files.jogl.awt"> - <include name="${rootrel.src.c.jogl}/JAWT*.c"/> - <include name="${rootrel.generated.c.jogl}/X11/JAWT*.c" if="isX11"/> - <include name="${rootrel.generated.c.jogl}/MacOSX/JAWT*.c" if="isOSX"/> - <include name="${rootrel.generated.c.jogl}/Windows/JAWT*.c" if="isWindows"/> - </patternset> - - <patternset id="c.src.files.newt"> - <!-- FIXME: NEWT should be moved to another library --> - <include name="${rootrel.src.c.newt}/WindowsWindow.c" if="isWindows"/> - <include name="${rootrel.src.c.newt}/*.m" if="isOSX"/> - <include name="${rootrel.src.c.newt}/X11Window.c" if="isX11"/> - <include name="${rootrel.src.c.newt}/KDWindow.c" if="useKD"/> - </patternset> - <patternset id="c.src.files.jogl.gl2"> - <include name="${rootrel.src.c.jogl}/XineramaHelper.c" if="isX11"/> - <!-- Xinerama supporting functions for Linux only (for now) --> - <!-- Also supported on Solaris, but works differently --> - <include name="${rootrel.src.c.jogl}/Xinerama.c" if="isLinux"/> - <include name="${rootrel.src.c.jogl}/MacOSXWindowSystemInterface.m" if="isOSX"/> - <include name="${rootrel.generated.c.jogl}/X11/X11Lib_JNI.c" if="isX11"/> - <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/> - <include name="${rootrel.src.c.jogl}/ContextUpdater.m" if="isOSX"/> + <include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/> + <include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/> + <include name="${rootrel.src.c}/InternalBufferUtils.c"/> + <!-- FIXME: the Mixer should be moved to another library --> + <!--include name="${rootrel.src.c}/Mixer.cpp" if="isWindows"/--> + <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> + <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c" if="useOpenMAX"/> + <include name="${rootrel.generated.c.jogl}/gl2/GL2Impl_JNI.c"/> <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY --> <include name="${rootrel.generated.c.jogl}/gl2/GLUgl2_JNI.c"/> <include name="${rootrel.generated.c.jogl}/X11/GLX*.c" if="isX11"/> <include name="${rootrel.generated.c.jogl}/MacOSX/CGL*.c" if="isOSX"/> <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/> + </patternset> + + <patternset id="c.src.files.jogl.gl2es12"> + <include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/> + <include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/> + <include name="${rootrel.src.c}/InternalBufferUtils.c"/> <!-- FIXME: the Mixer should be moved to another library --> - <!--include name="${rootrel.src.c.jogl}/Mixer.cpp" if="isWindows"/--> + <!--include name="${rootrel.src.c}/Mixer.cpp" if="isWindows"/--> <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c" if="useOpenMAX"/> - </patternset> - <patternset id="c.src.files.jogl.gl2es12"> - <include name="${rootrel.src.c.jogl}/XineramaHelper.c" if="isX11"/> - <!-- Xinerama supporting functions for Linux only (for now) --> - <!-- Also supported on Solaris, but works differently --> - <include name="${rootrel.src.c.jogl}/Xinerama.c" if="isLinux"/> - <include name="${rootrel.src.c.jogl}/MacOSXWindowSystemInterface.m" if="isOSX"/> - <include name="${rootrel.generated.c.jogl}/X11/X11Lib_JNI.c" if="isX11"/> - <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/> - <include name="${rootrel.src.c.jogl}/ContextUpdater.m" if="isOSX"/> <include name="${rootrel.generated.c.jogl}/gl2es12/GL2ES12Impl_JNI.c"/> <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY --> <!--include name="${rootrel.generated.c.jogl}/gl2es12/GLUgl2es12_JNI.c"/ SKIPPED --> <include name="${rootrel.generated.c.jogl}/X11/GLX*.c" if="isX11"/> <include name="${rootrel.generated.c.jogl}/MacOSX/CGL*.c" if="isOSX"/> <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/> - <!-- FIXME: the Mixer should be moved to another library --> - <!--include name="${rootrel.src.c.jogl}/Mixer.cpp" if="isWindows"/--> - <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> - <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c" if="useOpenMAX"/> </patternset> <patternset id="c.src.files.jogl.es2"> - <include name="${rootrel.src.c.jogl}/XineramaHelper.c" if="isX11"/> - <!-- Xinerama supporting functions for Linux only (for now) --> - <!-- Also supported on Solaris, but works differently --> - <include name="${rootrel.src.c.jogl}/Xinerama.c" if="isLinux"/> - <include name="${rootrel.generated.c.jogl}/X11/X11Lib_JNI.c" if="isX11"/> + <include name="${rootrel.src.c}/InternalBufferUtils.c"/> + <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> + <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c" if="useOpenMAX"/> + <include name="${rootrel.generated.c.jogl}/egl/EGL_JNI.c"/> <include name="${rootrel.generated.c.jogl}/egl/EGLExtImpl_JNI.c"/> <include name="${rootrel.generated.c.jogl}/es2/GLES2Impl_JNI.c"/> - <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/> - <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> - <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c" if="useOpenMAX"/> </patternset> <patternset id="c.src.files.jogl.es1"> - <include name="${rootrel.src.c.jogl}/XineramaHelper.c" if="isX11"/> - <!-- Xinerama supporting functions for Linux only (for now) --> - <!-- Also supported on Solaris, but works differently --> - <include name="${rootrel.src.c.jogl}/Xinerama.c" if="isLinux"/> - <include name="${rootrel.generated.c.jogl}/X11/X11Lib_JNI.c" if="isX11"/> + <include name="${rootrel.src.c}/InternalBufferUtils.c"/> + <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> + <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c" if="useOpenMAX"/> + <include name="${rootrel.generated.c.jogl}/egl/EGL_JNI.c"/> <include name="${rootrel.generated.c.jogl}/egl/EGLExtImpl_JNI.c"/> <include name="${rootrel.generated.c.jogl}/es1/GLES1Impl_JNI.c"/> - <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/> <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY --> <!--include name="${rootrel.generated.c.jogl}/es1/GLUes1_JNI.c" EMPTY /--> - <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> - <include name="${rootrel.src.c.openmax}/com_sun_openmax_OMXInstance.c" if="useOpenMAX"/> </patternset> <patternset id="c.src.files.cg"> @@ -1571,17 +1475,12 @@ <includepath path="${src.generated.c}/X11" if="isX11"/> <includepath path="${src.generated.c}/MacOSX" if="isOSX"/> <includepath path="${src.generated.c}/Windows" if="isWindows"/> - <includepath path="${src.generated.c.newt}" /> - <includepath path="${src.generated.c.newt}/X11" if="isX11"/> - <includepath path="${src.generated.c.newt}/MacOSX" if="isOSX"/> - <includepath path="${src.generated.c.newt}/Windows" if="isWindows"/> - <includepath path="${src.generated.c.newt}/KD" if="useKD"/> <includepath path="${src.generated.c.openmax}" if="useOpenMAX"/> <!-- This must come last to not override real include paths --> <!-- includepath path="stub_includes/macosx" if="isOSX" / --> </compiler> - + <linker extends="@{linker.cfg.id}"> <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/> <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/> @@ -1604,75 +1503,35 @@ </sequential> </macrodef> - <target name="c.fixup.jawt.version.macosx" if="isOSX"> - <!-- Edit the link to the JAWT version in the resulting jnilib - file; this isn't strictly needed but seems to allow the - universal binaries to work on 10.3 machines as well, which - is desirable for some end users --> - <apply executable="install_name_tool"> - <arg value="-change" /> - <arg value="/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Libraries/libjawt.dylib" /> - <arg value="/System/Library/Frameworks/JavaVM.framework/Libraries/libjawt.dylib" /> - <srcfile /> - <fileset dir="${obj}" includes="libjogl_awt.jnilib, libjogl_gl2.jnilib, libjogl_gl2es12.jnilib, libjogl_es2.jnilib, libjogl_es1.jnilib, libjogl_cg.jnilib" /> - </apply> - </target> - - <target name="c.build.newt.prepare"> - <!-- FIXME: this is temporary until we move this to another workspace --> - <javah destdir="../${rootrel.build}/gensrc/native/newt/Windows" classpath="${jogl.all.jar}" class="com.sun.javafx.newt.windows.WindowsWindow" /> - <javah destdir="../${rootrel.build}/gensrc/native/newt/MacOSX" classpath="${jogl.all.jar}" class="com.sun.javafx.newt.macosx.MacWindow" /> - <javah destdir="../${rootrel.build}/gensrc/native/newt/X11" classpath="${jogl.all.jar}" class="com.sun.javafx.newt.x11.X11Window" /> - <javah destdir="../${rootrel.build}/gensrc/native/newt/KD" classpath="${jogl.all.jar}" class="com.sun.javafx.newt.kd.KDWindow" /> - </target> - - <target name="c.build.jogl.prepare" depends="c.build.newt.prepare"> - <!-- Generate the EGLDrawableFactory header --> - <!-- FIXME: this is temporary until we fully autogenerate the EGL interface --> - <javah destdir="../${rootrel.build}/gensrc/native/jogl" classpath="${jogl.all.jar}" class="com.sun.opengl.impl.egl.EGLDrawableFactory" /> + <target name="c.build.jogl.prepare"> <!-- Generate the waveout Mixer header --> <!-- FIXME: this is temporary until we move this to another workspace --> - <javah destdir="../${rootrel.build}/gensrc/native/jogl" classpath="${jogl.all.jar}" class="com.sun.javafx.audio.windows.waveout.Mixer" /> - <javah destdir="../${rootrel.build}/gensrc/native/openmax" classpath="${jogl.all.jar}" class="com.sun.openmax.OMXInstance" /> - </target> - - <target name="c.build.jogl.awt"> - <c.build c.compiler.src.files="c.src.files.jogl.awt" - c.compiler.use-jawt="true" - output.lib.name="jogl_awt" - compiler.cfg.id="${compiler.cfg.id}" - linker.cfg.id="${linker.cfg.id.oswin}"/> - </target> - - <target name="c.build.newt"> - <c.build c.compiler.src.files="c.src.files.newt" - output.lib.name="newt" - compiler.cfg.id="${compiler.cfg.id}" - linker.cfg.id="${linker.cfg.id.oswin}"/> + <javah destdir="../${rootrel.build.jogl}/gensrc/native/jogl" classpath="${jogl.all.jar}" class="com.sun.javafx.audio.windows.waveout.Mixer" /> + <javah destdir="../${rootrel.build.jogl}/gensrc/native/openmax" classpath="${jogl.all.jar}" class="com.sun.openmax.OMXInstance" /> </target> - <target name="c.build.jogl.gl2" unless="jogl.nogl2"> + <target name="c.build.jogl.gl2" unless="setup.nogl2"> <c.build c.compiler.src.files="c.src.files.jogl.gl2" output.lib.name="jogl_gl2" compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="${linker.cfg.id.gl2}"/> </target> - <target name="c.build.jogl.gl2es12" unless="jogl.nogl2"> + <target name="c.build.jogl.gl2es12" unless="setup.nogl2"> <c.build c.compiler.src.files="c.src.files.jogl.gl2es12" output.lib.name="jogl_gl2es12" compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="${linker.cfg.id.gl2}"/> </target> - <target name="c.build.jogl.es2" unless="jogl.noes1"> + <target name="c.build.jogl.es2" unless="setup.noes1"> <c.build c.compiler.src.files="c.src.files.jogl.es2" output.lib.name="jogl_es2" compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="${linker.cfg.id.base}"/> </target> - <target name="c.build.jogl.es1" unless="jogl.noes2"> + <target name="c.build.jogl.es1" unless="setup.noes2"> <c.build c.compiler.src.files="c.src.files.jogl.es1" output.lib.name="jogl_es1" compiler.cfg.id="${compiler.cfg.id}" @@ -1703,19 +1562,13 @@ </exec> <exec executable="mt"> <arg value="-manifest"/> - <arg value="${obj}/newt.dll.manifest"/> - <arg value="-outputresource:${obj}/newt.dll;#2"/> - </exec> - <exec executable="mt"> - <arg value="-manifest"/> <arg value="${obj}/jogl_awt.dll.manifest"/> <arg value="-outputresource:${obj}/jogl_awt.dll;#2"/> </exec> <antcall target="c.manifest.cg" inheritRefs="true" /> </target> - <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.awt,c.build.newt,c.build.jogl.gl2es12,c.build.jogl.gl2,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg"> - <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" /> + <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.gl2,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg"> <antcall target="c.manifest" inheritRefs="true" /> </target> @@ -1748,8 +1601,8 @@ <jar manifest="tempversion" destfile="${jogl.core.jar}"> <fileset dir="${classes}" - includes="javax/media/nwi/**, javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**" - excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.sdk}, ${java.part.glsl}, ${java.part.openmax}, ${java.part.glsl.fixed}, ${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glutess}, ${java.part.glumipmap}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.newt}, ${java.part.newt.awt}"/> + includes="javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**" + excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.sdk}, ${java.part.glsl}, ${java.part.openmax}, ${java.part.glsl.fixed}, ${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glutess}, ${java.part.glumipmap}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gles1.jar}"> <fileset dir="${classes}" @@ -1837,15 +1690,6 @@ <fileset dir="${classes}" includes="${java.part.awt}" /> </jar> - <!-- excludes="com/sun/opengl/impl/x11/**, com/sun/opengl/impl/windows/**, com/sun/opengl/impl/macosx/**" --> - <jar manifest="tempversion" destfile="${newt.jar}"> - <fileset dir="${classes}" - includes="${java.part.newt}"/> - </jar> - <jar manifest="tempversion" destfile="${newt.awt.jar}"> - <fileset dir="${classes}" - includes="${java.part.newt.awt}"/> - </jar> <jar manifest="tempversion" destfile="${jogl.util.jar}"> <fileset dir="${classes}" includes="${java.part.util}" @@ -1862,7 +1706,6 @@ </jar> <jar manifest="tempversion" destfile="${jogl.all.jar}"> <fileset dir="${classes}"> - <include name="javax/media/nwi/**" /> <include name="javax/media/opengl/**" /> <include name="com/sun/gluegen/runtime/**" /> <include name="com/sun/opengl/**" /> @@ -1889,7 +1732,6 @@ </copy> <jar manifest="tempversion" destfile="${jogl.jar}"> <fileset dir="${classes}"> - <include name="javax/media/nwi/**" /> <include name="javax/media/opengl/**" /> <include name="com/sun/gluegen/runtime/**" /> <include name="com/sun/opengl/**" /> @@ -1911,12 +1753,12 @@ <javadoc packagenames="${javadoc.packagenames}" excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" - classpath="${gluegen-rt.jar}" destdir="${javadoc}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" source="1.4" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > + <classpath refid="nwigluegen.classpath"/> <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" /> </javadoc> </target> @@ -1927,12 +1769,12 @@ <javadoc packagenames="${javadoc.packagenames},com.sun.opengl.cg" excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" - classpath="${gluegen-rt.jar}" destdir="${javadoc}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" source="1.4" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > + <classpath refid="nwigluegen.classpath"/> <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" /> </javadoc> </target> @@ -1944,12 +1786,12 @@ <javadoc packagenames="${javadoc.spec.packagenames}" excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" - classpath="${gluegen-rt.jar}" destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" source="1.4" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > + <classpath refid="nwigluegen.classpath"/> <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" /> </javadoc> </target> @@ -1960,12 +1802,12 @@ <javadoc packagenames="${javadoc.spec.packagenames}" excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" - classpath="${gluegen-rt.jar}" destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" source="1.4" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > + <classpath refid="nwigluegen.classpath"/> <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" /> </javadoc> </target> @@ -1977,12 +1819,12 @@ <javadoc packagenames="${javadoc.dev.packagenames}" excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" - classpath="${gluegen-rt.jar}" destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" source="1.4" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > + <classpath refid="nwigluegen.classpath"/> <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" /> </javadoc> </target> @@ -1993,18 +1835,20 @@ <javadoc packagenames="${javadoc.dev.packagenames},com.sun.opengl.cg" excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" - classpath="${gluegen-rt.jar}" destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" source="1.4" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > + <classpath refid="nwigluegen.classpath"/> <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" /> </javadoc> </target> <target name="javadoc.dev.all" depends="load.user.properties,init,javadoc.dev.nocg,javadoc.dev.cg" /> + <target name="all.doc" description="Build JOGL docs" depends="init,javadoc,javadoc.spec,javadoc.dev.all" /> + <!-- ================================================================== --> <!-- - Build the platform-independent distribution out of jars built for @@ -2371,15 +2215,15 @@ <!-- First copy the generated files out of the Linux build results into the appropriate --> <!-- directory of this source tree (so that they'll be blown away properly with an --> <!-- "ant clean") --> - <mkdir dir="../${rootrel.build}/gensrc/classes/javax/media/opengl/glu" /> - <copy file="${jogl.dist.dir}/jogl-linux/DebugGL2.java" todir="../${rootrel.build}/gensrc/classes/javax/media/opengl" /> - <copy file="${jogl.dist.dir}/jogl-linux/TraceGL2.java" todir="../${rootrel.build}/gensrc/classes/javax/media/opengl" /> - <copy file="${jogl.dist.dir}/jogl-linux/GL.java" todir="../${rootrel.build}/gensrc/classes/javax/media/opengl" /> - <copy file="${jogl.dist.dir}/jogl-linux/GLU.java" todir="../${rootrel.build}/gensrc/classes/javax/media/opengl/glu" /> - <copy file="${jogl.dist.dir}/jogl-linux/GLUquadric.java" todir="../${rootrel.build}/gensrc/classes/javax/media/opengl/glu" /> + <mkdir dir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/glu" /> + <copy file="${jogl.dist.dir}/jogl-linux/DebugGL2.java" todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl" /> + <copy file="${jogl.dist.dir}/jogl-linux/TraceGL2.java" todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl" /> + <copy file="${jogl.dist.dir}/jogl-linux/GL.java" todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl" /> + <copy file="${jogl.dist.dir}/jogl-linux/GLU.java" todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/glu" /> + <copy file="${jogl.dist.dir}/jogl-linux/GLUquadric.java" todir="../${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/glu" /> <zip destfile="${jogl.dist.dir}/jogl-${tmp.version}-src.zip" basedir="../.." - includes="gluegen/LICENSE.txt,gluegen/doc/**,gluegen/make/**,gluegen/src/**,jogl/*.txt,jogl/${rootrel.build}/gensrc/classes/javax/media/opengl/**,jogl/doc/**,jogl/make/**,jogl/src/**" + includes="gluegen/LICENSE.txt,gluegen/doc/**,gluegen/make/**,gluegen/src/**,jogl/*.txt,jogl/${rootrel.build.jogl}/gensrc/classes/javax/media/opengl/**,jogl/doc/**,jogl/make/**,jogl/src/jogl/**" excludes="**/*.class,**/*~" /> <!-- Create zip archives suitable for developers --> diff --git a/make/intptr.cfg b/make/config/intptr.cfg index c946e4851..c946e4851 100755 --- a/make/intptr.cfg +++ b/make/config/intptr.cfg diff --git a/make/cg-common-CustomJavaCode.java b/make/config/jogl/cg-common-CustomJavaCode.java index 1f109d9f6..1f109d9f6 100755 --- a/make/cg-common-CustomJavaCode.java +++ b/make/config/jogl/cg-common-CustomJavaCode.java diff --git a/make/cg-common.cfg b/make/config/jogl/cg-common.cfg index 9b8dba079..9b8dba079 100644 --- a/make/cg-common.cfg +++ b/make/config/jogl/cg-common.cfg diff --git a/make/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg index 780afcf5b..780afcf5b 100644 --- a/make/cgl-macosx.cfg +++ b/make/config/jogl/cgl-macosx.cfg diff --git a/make/cglext.cfg b/make/config/jogl/cglext.cfg index 534910bde..4000ecb2b 100755 --- a/make/cglext.cfg +++ b/make/config/jogl/cglext.cfg @@ -22,7 +22,7 @@ GetProcAddressTableExpr _context.getCGLExtProcAddressTable() IgnoreNot ^(cgl|CGL).+ Include gl-headers.cfg -Include intptr.cfg +Include ../intptr.cfg CustomJavaCode CGLExt public boolean isFunctionAvailable(String glFunctionName); CustomJavaCode CGLExt public boolean isExtensionAvailable(String glExtensionName); diff --git a/make/egl.cfg b/make/config/jogl/egl.cfg index 8ddafc1fd..6457ab21a 100755 --- a/make/egl.cfg +++ b/make/config/jogl/egl.cfg @@ -43,7 +43,7 @@ Opaque long EGLClientBuffer CustomCCode #include <EGL/egl.h> -Include intptr.cfg +Include ../intptr.cfg CustomJavaCode EGL private static EGLProcAddressTable _table = new EGLProcAddressTable(); CustomJavaCode EGL public static void resetProcAddressTable(DynamicLookupHelper lookup) { @@ -61,7 +61,7 @@ CustomJavaCode EGL CustomJavaCode EGL protected static long eglGetProcAddress(long eglGetProcAddressHandle, java.lang.String procname) CustomJavaCode EGL { CustomJavaCode EGL if (eglGetProcAddressHandle == 0) { -CustomJavaCode EGL throw new GLUnsupportedException("Passed null pointer for method \"eglGetProcAddress\""); +CustomJavaCode EGL throw new GLException("Passed null pointer for method \"eglGetProcAddress\""); CustomJavaCode EGL } CustomJavaCode EGL return dispatch_eglGetProcAddress0(procname, eglGetProcAddressHandle); CustomJavaCode EGL } diff --git a/make/eglext.cfg b/make/config/jogl/eglext.cfg index 54ac07a04..bdd9a3655 100755 --- a/make/eglext.cfg +++ b/make/config/jogl/eglext.cfg @@ -63,7 +63,7 @@ CustomCCode #define EGL_EGLEXT_PROTOTYPES CustomCCode CustomCCode #include <EGL/eglext.h> -Include intptr.cfg +Include ../intptr.cfg # There are some #defines in eglext.h that GlueGen and PCPP don't currently handle CustomJavaCode EGLExt public static final long EGL_NO_IMAGE = 0; diff --git a/make/gl-common-extensions.cfg b/make/config/jogl/gl-common-extensions.cfg index 5b1d57fb0..5b1d57fb0 100644 --- a/make/gl-common-extensions.cfg +++ b/make/config/jogl/gl-common-extensions.cfg diff --git a/make/gl-common-gl2.cfg b/make/config/jogl/gl-common-gl2.cfg index 4d86d74cd..4d86d74cd 100644 --- a/make/gl-common-gl2.cfg +++ b/make/config/jogl/gl-common-gl2.cfg diff --git a/make/gl-common.cfg b/make/config/jogl/gl-common.cfg index e76eaba35..608aafad3 100644 --- a/make/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -3,7 +3,7 @@ # Raise GLException instead of RuntimeException in glue code RuntimeExceptionType GLException -UnsupportedExceptionType GLUnsupportedException +UnsupportedExceptionType GLException # Imports needed by all glue code Import java.nio.* diff --git a/make/gl-desktop-tracker.cfg b/make/config/jogl/gl-desktop-tracker.cfg index 4b9a7edb7..4b9a7edb7 100644 --- a/make/gl-desktop-tracker.cfg +++ b/make/config/jogl/gl-desktop-tracker.cfg diff --git a/make/gl-desktop.cfg b/make/config/jogl/gl-desktop.cfg index d6a610c59..d6a610c59 100755 --- a/make/gl-desktop.cfg +++ b/make/config/jogl/gl-desktop.cfg diff --git a/make/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 89444619b..2b630ee70 100755 --- a/make/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -4,11 +4,10 @@ NativeOutputDir gensrc/native/jogl/es1 ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/GLObject.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLPointerIf.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLLightingIf.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLFixedFuncIf.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLLightingIf.java # There are a few routines we don't handle yet Ignore glGetBufferPointervOES @@ -21,7 +20,6 @@ Extends GLES1 GL2ES1 Extends GLES1 GLMatrixIf Extends GLES1 GLPointerIf Extends GLES1 GLLightingIf -Extends GLES1 GLFixedFuncIf ImplPackage com.sun.opengl.impl.es1 ImplJavaClass GLES1Impl Implements GLES1Impl GLObject @@ -30,7 +28,6 @@ Implements GLES1Impl GL2ES1 Implements GLES1Impl GLMatrixIf Implements GLES1Impl GLPointerIf Implements GLES1Impl GLLightingIf -Implements GLES1Impl GLFixedFuncIf HierarchicalNativeOutput false Include gl-common.cfg Include gl-common-extensions.cfg @@ -77,7 +74,7 @@ CustomCCode /* #define GL_APICALL __declspec(dllimport) */ CustomCCode #include <GLES/gl.h> CustomCCode #include <GLES/glext.h> CustomCCode #include <stdlib.h> -Include intptr.cfg +Include ../intptr.cfg IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-common.java IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-gles1.java diff --git a/make/gl-es2.cfg b/make/config/jogl/gl-es2.cfg index 513d5a099..669eabcf3 100755 --- a/make/gl-es2.cfg +++ b/make/config/jogl/gl-es2.cfg @@ -4,7 +4,7 @@ NativeOutputDir gensrc/native/jogl/es2 ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/GLObject.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java Package javax.media.opengl Style InterfaceAndImpl @@ -52,7 +52,7 @@ CustomCCode /* Include the OpenGL headers */ CustomCCode /* #define GL_APICALL __declspec(dllimport) */ CustomCCode #include <GLES2/gl2ext.h> CustomCCode #include <stdlib.h> -Include intptr.cfg +Include ../intptr.cfg IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-common.java IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-gles2.java diff --git a/make/gl-gl2.cfg b/make/config/jogl/gl-gl2.cfg index 14e7f6487..76cb0573a 100644 --- a/make/gl-gl2.cfg +++ b/make/config/jogl/gl-gl2.cfg @@ -5,11 +5,10 @@ NativeOutputDir gensrc/native/jogl/gl2 ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/GLObject.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLPointerIf.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLLightingIf.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLFixedFuncIf.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLLightingIf.java Package javax.media.opengl Style InterfaceAndImpl @@ -21,7 +20,6 @@ Extends GL2 GL2ES2 Extends GL2 GLMatrixIf Extends GL2 GLPointerIf Extends GL2 GLLightingIf -Extends GL2 GLFixedFuncIf ImplPackage com.sun.opengl.impl.gl2 ImplJavaClass GL2Impl Implements GL2Impl GLObject @@ -31,7 +29,6 @@ Implements GL2Impl GL2ES2 Implements GL2Impl GLMatrixIf Implements GL2Impl GLPointerIf Implements GL2Impl GLLightingIf -Implements GL2Impl GLFixedFuncIf Include gl-common-gl2.cfg Include gl-common-extensions.cfg Include gl-desktop.cfg @@ -67,7 +64,7 @@ CustomJavaCode GL2Impl public void glDepthRangef(float zNear, float zFar) { CustomJavaCode GL2Impl glDepthRange((double)zNear, (double)zFar); } Include gl-headers.cfg -Include intptr.cfg +Include ../intptr.cfg IncludeAs CustomJavaCode GL2Impl gl-impl-CustomJavaCode-common.java IncludeAs CustomJavaCode GL2Impl gl-impl-CustomJavaCode-gl2.java diff --git a/make/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg index 7dcf9462f..2d0704577 100644 --- a/make/gl-gl2es12.cfg +++ b/make/config/jogl/gl-gl2es12.cfg @@ -5,11 +5,10 @@ NativeOutputDir gensrc/native/jogl/gl2es12 ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL.java ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/GLObject.java -ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java -ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/fixed/GLPointerIf.java -ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/fixed/GLLightingIf.java -ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/fixed/GLFixedFuncIf.java +ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/GLObject.java +ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java +ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java +ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/fixed/GLLightingIf.java Package javax.media.opengl Style InterfaceAndImpl @@ -21,7 +20,6 @@ Extends GL2ES12 GLObject Extends GL2ES12 GLMatrixIf Extends GL2ES12 GLPointerIf Extends GL2ES12 GLLightingIf -Extends GL2ES12 GLFixedFuncIf ImplPackage com.sun.opengl.impl.gl2es12 ImplJavaClass GL2ES12Impl Implements GL2ES12Impl GL @@ -31,7 +29,6 @@ Implements GL2ES12Impl GLObject Implements GL2ES12Impl GLMatrixIf Implements GL2ES12Impl GLPointerIf Implements GL2ES12Impl GLLightingIf -Implements GL2ES12Impl GLFixedFuncIf Include gl-common-gl2.cfg Include gl-common-extensions.cfg @@ -61,7 +58,7 @@ CustomJavaCode GL2ES12Impl public void glDepthRangef(float zNear, float zFar) { CustomJavaCode GL2ES12Impl glDepthRange((double)zNear, (double)zFar); } Include gl-headers.cfg -Include intptr.cfg +Include ../intptr.cfg IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-common.java IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2es12.java diff --git a/make/gl-headers.cfg b/make/config/jogl/gl-headers.cfg index fc7dd440d..fc7dd440d 100755 --- a/make/gl-headers.cfg +++ b/make/config/jogl/gl-headers.cfg diff --git a/make/gl-if-CustomJavaCode-gl.java b/make/config/jogl/gl-if-CustomJavaCode-gl.java index 840c8f61f..840c8f61f 100644 --- a/make/gl-if-CustomJavaCode-gl.java +++ b/make/config/jogl/gl-if-CustomJavaCode-gl.java diff --git a/make/gl-if-CustomJavaCode-gles2.java b/make/config/jogl/gl-if-CustomJavaCode-gles2.java index ea40f6329..ea40f6329 100644 --- a/make/gl-if-CustomJavaCode-gles2.java +++ b/make/config/jogl/gl-if-CustomJavaCode-gles2.java diff --git a/make/gl-if-gl.cfg b/make/config/jogl/gl-if-gl.cfg index 201ef32bb..110a6ee43 100755 --- a/make/gl-if-gl.cfg +++ b/make/config/jogl/gl-if-gl.cfg @@ -4,7 +4,7 @@ Style InterfaceOnly JavaClass GL Extends GL GLObject -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/GLObject.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg index d793038fd..72e0dbcd3 100755 --- a/make/gl-if-gl2_es1.cfg +++ b/make/config/jogl/gl-if-gl2_es1.cfg @@ -7,14 +7,12 @@ Extends GL2ES1 GL Extends GL2ES1 GLMatrixIf Extends GL2ES1 GLPointerIf Extends GL2ES1 GLLightingIf -Extends GL2ES1 GLFixedFuncIf ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/GLObject.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLPointerIf.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLLightingIf.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/fixed/GLFixedFuncIf.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLLightingIf.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg index 31cadb56f..7e219a3fb 100755 --- a/make/gl-if-gl2_es2.cfg +++ b/make/config/jogl/gl-if-gl2_es2.cfg @@ -6,7 +6,7 @@ Extends GL2ES2 GLObject Extends GL2ES2 GL ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbols ../src/classes/javax/media/opengl/sub/GLObject.java +ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java HierarchicalNativeOutput false Include gl-common.cfg Include gl-common-extensions.cfg diff --git a/make/gl-ignore-gl2_es12-special.cfg b/make/config/jogl/gl-ignore-gl2_es12-special.cfg index 1fa439702..1fa439702 100644 --- a/make/gl-ignore-gl2_es12-special.cfg +++ b/make/config/jogl/gl-ignore-gl2_es12-special.cfg diff --git a/make/gl-impl-CustomCCode-gl2.c b/make/config/jogl/gl-impl-CustomCCode-gl2.c index d6a051b36..d6a051b36 100644 --- a/make/gl-impl-CustomCCode-gl2.c +++ b/make/config/jogl/gl-impl-CustomCCode-gl2.c diff --git a/make/gl-impl-CustomCCode-gl2es12.c b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c index e056672d3..e056672d3 100644 --- a/make/gl-impl-CustomCCode-gl2es12.c +++ b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c diff --git a/make/gl-impl-CustomCCode-gles1.c b/make/config/jogl/gl-impl-CustomCCode-gles1.c index ca5e0374c..ca5e0374c 100644 --- a/make/gl-impl-CustomCCode-gles1.c +++ b/make/config/jogl/gl-impl-CustomCCode-gles1.c diff --git a/make/gl-impl-CustomCCode-gles2.c b/make/config/jogl/gl-impl-CustomCCode-gles2.c index a138d88cc..a138d88cc 100644 --- a/make/gl-impl-CustomCCode-gles2.c +++ b/make/config/jogl/gl-impl-CustomCCode-gles2.c diff --git a/make/gl-impl-CustomJavaCode-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java index 70413a630..70413a630 100644 --- a/make/gl-impl-CustomJavaCode-common.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java diff --git a/make/gl-impl-CustomJavaCode-gl2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2.java index 0d2f6676a..79df64d9f 100644 --- a/make/gl-impl-CustomJavaCode-gl2.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2.java @@ -241,7 +241,7 @@ private boolean checkBufferObject(boolean extension1, if (!enabled) return true; if(throwException) { - throw new GLUnsupportedException("Required extensions not available to call this function"); + throw new GLException("Required extensions not available to call this function"); } return false; } @@ -383,7 +383,7 @@ private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap(); public java.nio.ByteBuffer glMapBuffer(int target, int access) { final long __addr_ = ((GL2ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer; if (__addr_ == 0) { - throw new GLUnsupportedException("Method \"glMapBuffer\" not available"); + throw new GLException("Method \"glMapBuffer\" not available"); } int sz = bufferSizeTracker.getBufferSize(bufferStateTracker, target, @@ -409,12 +409,12 @@ native private long dispatch_glMapBuffer(int target, int access, long glProcAddr /** Dummy implementation for the ES 2.0 function: <br> <code> void {@native glShaderBinary}(GLint n, const GLuint * shaders, GLenum binaryformat, const void * binary, GLint length); </code> <br> Always throws a GLException! */ public void glShaderBinary(int n, java.nio.IntBuffer shaders, int binaryformat, java.nio.Buffer binary, int length) { - throw new GLUnsupportedException("Method \"glShaderBinary\" not available"); + throw new GLException("Method \"glShaderBinary\" not available"); } /** Dummy implementation for the ES 2.0 function: <br> <code> void {@native glShaderBinary}(GLint n, const GLuint * shaders, GLenum binaryformat, const void * binary, GLint length); </code> <br> Always throws a GLException! */ public void glShaderBinary(int n, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) { - throw new GLUnsupportedException("Method \"glShaderBinary\" not available"); + throw new GLException("Method \"glShaderBinary\" not available"); } public void glReleaseShaderCompiler() { diff --git a/make/gl-impl-CustomJavaCode-gl2_es2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java index 9ddbf06fb..9ddbf06fb 100644 --- a/make/gl-impl-CustomJavaCode-gl2_es2.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java diff --git a/make/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java index 5ce76186e..7edd95aea 100644 --- a/make/gl-impl-CustomJavaCode-gl2es12.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java @@ -209,7 +209,7 @@ private boolean checkBufferObject(boolean extension1, if (!enabled) return true; if(throwException) { - throw new GLUnsupportedException("Required extensions not available to call this function"); + throw new GLException("Required extensions not available to call this function"); } return false; } @@ -323,7 +323,7 @@ private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap(); public java.nio.ByteBuffer glMapBuffer(int target, int access) { final long __addr_ = ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer; if (__addr_ == 0) { - throw new GLUnsupportedException("Method \"glMapBuffer\" not available"); + throw new GLException("Method \"glMapBuffer\" not available"); } int sz = bufferSizeTracker.getBufferSize(bufferStateTracker, target, @@ -349,12 +349,12 @@ native private long dispatch_glMapBuffer(int target, int access, long glProcAddr /** Dummy implementation for the ES 2.0 function: <br> <code> void {@native glShaderBinary}(GLint n, const GLuint * shaders, GLenum binaryformat, const void * binary, GLint length); </code> <br> Always throws a GLException! */ public void glShaderBinary(int n, java.nio.IntBuffer shaders, int binaryformat, java.nio.Buffer binary, int length) { - throw new GLUnsupportedException("Method \"glShaderBinary\" not available"); + throw new GLException("Method \"glShaderBinary\" not available"); } /** Dummy implementation for the ES 2.0 function: <br> <code> void {@native glShaderBinary}(GLint n, const GLuint * shaders, GLenum binaryformat, const void * binary, GLint length); </code> <br> Always throws a GLException! */ public void glShaderBinary(int n, int[] shaders, int shaders_offset, int binaryformat, java.nio.Buffer binary, int length) { - throw new GLUnsupportedException("Method \"glShaderBinary\" not available"); + throw new GLException("Method \"glShaderBinary\" not available"); } public void glReleaseShaderCompiler() { diff --git a/make/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java index 909fa7009..a10f8c5e0 100755 --- a/make/gl-impl-CustomJavaCode-gles1.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java @@ -172,7 +172,7 @@ private boolean checkBufferObject(boolean avail, if (!enabled) return true; if(throwException) { - throw new GLUnsupportedException("Required extensions not available to call this function"); + throw new GLException("Required extensions not available to call this function"); } return false; } @@ -278,7 +278,7 @@ private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap(); public java.nio.ByteBuffer glMapBuffer(int target, int access) { final long __addr_ = ((GLES1ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer; if (__addr_ == 0) { - throw new GLUnsupportedException("Method \"glMapBuffer\" not available"); + throw new GLException("Method \"glMapBuffer\" not available"); } int sz = bufferSizeTracker.getBufferSize(bufferStateTracker, target, diff --git a/make/gl-impl-CustomJavaCode-gles2.java b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java index a5923bd3b..face06292 100755 --- a/make/gl-impl-CustomJavaCode-gles2.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java @@ -182,7 +182,7 @@ private boolean checkBufferObject(boolean avail, if (!enabled) return true; if(throwException) { - throw new GLUnsupportedException("Required extensions not available to call this function"); + throw new GLException("Required extensions not available to call this function"); } return false; } @@ -288,7 +288,7 @@ private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap(); public java.nio.ByteBuffer glMapBuffer(int target, int access) { final long __addr_ = ((GLES2ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer; if (__addr_ == 0) { - throw new GLUnsupportedException("Method \"glMapBuffer\" not available"); + throw new GLException("Method \"glMapBuffer\" not available"); } int sz = bufferSizeTracker.getBufferSize(bufferStateTracker, target, diff --git a/make/gl-macosx-nsig.cfg b/make/config/jogl/gl-macosx-nsig.cfg index 6a4bc0a06..6a4bc0a06 100755 --- a/make/gl-macosx-nsig.cfg +++ b/make/config/jogl/gl-macosx-nsig.cfg diff --git a/make/gl-win32-nsig.cfg b/make/config/jogl/gl-win32-nsig.cfg index b7c4973d4..b7c4973d4 100755 --- a/make/gl-win32-nsig.cfg +++ b/make/config/jogl/gl-win32-nsig.cfg diff --git a/make/gl-x11-nsig.cfg b/make/config/jogl/gl-x11-nsig.cfg index bb8a76821..bb8a76821 100755 --- a/make/gl-x11-nsig.cfg +++ b/make/config/jogl/gl-x11-nsig.cfg diff --git a/make/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java index aca542eb7..b8c9685f6 100755 --- a/make/glu-CustomJavaCode-base.java +++ b/make/config/jogl/glu-CustomJavaCode-base.java @@ -86,24 +86,24 @@ public static final GLU createGLU() throws GLException { /** * Instantiates a GLU implementation object in respect to the given GL profile. */ -public static final GLU createGLU(String profile) throws GLUnsupportedException { +public static final GLU createGLU(String profile) throws GLException { try { if(GLProfile.GL2.equals(profile)) { - return (GLU) GLReflection.createInstance("javax.media.opengl.glu.gl2.GLUgl2"); + return (GLU) NWReflection.createInstance("javax.media.opengl.glu.gl2.GLUgl2"); } - } catch (GLUnsupportedException e) { e.printStackTrace(); } + } catch (GLException e) { e.printStackTrace(); } try { if(GLProfile.GL2ES12.equals(profile) || GLProfile.GL2.equals(profile) || GLProfile.GLES1.equals(profile)) { - return (GLU) GLReflection.createInstance("javax.media.opengl.glu.gl2es1.GLUgl2es1"); + return (GLU) NWReflection.createInstance("javax.media.opengl.glu.gl2es1.GLUgl2es1"); } - } catch (GLUnsupportedException e) { e.printStackTrace(); } + } catch (GLException e) { e.printStackTrace(); } // There is no specialized ES 2 GLU at this time /* try { if(GLProfile.GL2ES12.equals(profile) || GLProfile.GL2.equals(profile) || GLProfile.GLES2.equals(profile)) { - return (GLU) GLReflection.createInstance("javax.media.opengl.glu.gl2es2.GLUgl2es2"); + return (GLU) NWReflection.createInstance("javax.media.opengl.glu.gl2es2.GLUgl2es2"); } - } catch (GLUnsupportedException e) { e.printStackTrace(); } + } catch (GLException e) { e.printStackTrace(); } */ return new GLU(); } @@ -156,11 +156,11 @@ protected static boolean checkedGLUtessellatorImpl = false; protected static final void validateGLUtessellatorImpl() { if(!checkedGLUtessellatorImpl) { - availableGLUtessellatorImpl = GLReflection.isClassAvailable("com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl"); + availableGLUtessellatorImpl = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl"); checkedGLUtessellatorImpl = true; } if(!availableGLUtessellatorImpl) { - throw new GLUnsupportedException("GLUtessellator not available (GLUtessellatorImpl)"); + throw new GLException("GLUtessellator not available (GLUtessellatorImpl)"); } } @@ -170,7 +170,7 @@ protected static final void validateGLUtessellatorImpl() { * value of null means that there was not enough memeory to allocate the * object. * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * @return A new tessellation object. * @@ -187,7 +187,7 @@ public static final GLUtessellator gluNewTess() { * <b>gluDeleteTess</b> destroys the indicated tessellation object (which was * created with {@link #gluNewTess gluNewTess}). * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * @param tessellator * Specifies the tessellation object to destroy. @@ -208,7 +208,7 @@ public static final void gluDeleteTess(GLUtessellator tessellator) { * interpreted and rendered. The legal value for <i>which</i> are as * follows:<P> * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * <b>GLU_TESS_WINDING_RULE</b> * <UL> @@ -294,7 +294,7 @@ public static final void gluTessProperty(GLUtessellator tessellator, int which, * {@link #gluTessProperty gluTessProperty} reference * page for information about the properties and what they do. * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * @param tessellator * Specifies the tessellation object (created with @@ -337,7 +337,7 @@ public static final void gluGetTessProperty(GLUtessellator tessellator, int whic * The supplied normal persists until it is changed by another call to * <b>gluTessNormal</b>. * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * @param tessellator * Specifies the tessellation object (created by @@ -364,7 +364,7 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou * is replaced. If <i>aCallback</i> is null, then the existing callback * becomes undefined.<P> * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * These callbacks are used by the tessellation object to describe how a * polygon specified by the user is broken into triangles. Note that there are @@ -652,7 +652,7 @@ public static final void gluTessCallback(GLUtessellator tessellator, int which, * {@link #gluTessBeginContour gluTessBeginContour} and * {@link #gluTessBeginContour gluTessEndContour}.<P> * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * <b>data</b> normally references to a structure containing the vertex * location, as well as other per-vertex attributes such as color and normal. @@ -702,7 +702,7 @@ public static final void gluTessVertex(GLUtessellator tessellator, double[] coor * gluTessBeginContour}, and {@link #gluTessEndContour * gluTessEndContour} reference pages for more details.<P> * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * <b>data</b> is a reference to a user-defined data structure. If the * appropriate callback(s) are specified (see @@ -751,7 +751,7 @@ public static final void gluTessBeginPolygon(GLUtessellator tessellator, Object * {@link #gluTessBeginPolygon gluTessBeginPolygon} and * {@link #gluTessEndPolygon gluTessEndPolygon}. * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * @param tessellator * Specifies the tessellation object (created with @@ -786,7 +786,7 @@ public static final void gluTessBeginContour(GLUtessellator tessellator) { * gluTessBeginPolygon} and * {@link #gluTessEndPolygon gluTessEndPolygon}. * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * @param tessellator * Specifies the tessellation object (created with @@ -822,7 +822,7 @@ public static final void gluTessEndContour(GLUtessellator tessellator) { * gluTessBeginContour} and {@link #gluTessEndContour * gluTessEndContour} reference pages for more details.<P> * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * Once <b>gluTessEndPolygon</b> is called, the polygon is tessellated, and * the resulting triangles are described through callbacks. See @@ -860,7 +860,7 @@ public static final void gluTessEndPolygon(GLUtessellator tessellator) { * #gluNextContour gluNextContour} reference pages for more * details.<P> * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * Once {@link #gluEndPolygon gluEndPolygon} is called, * the polygon is tessellated, and the resulting triangles are described @@ -894,7 +894,7 @@ public static final void gluBeginPolygon(GLUtessellator tessellator) { * describe the new contour. Repeat this process until all contours have been * described.<P> * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * The type parameter defines what type of contour follows. The following * values are valid. <P> @@ -970,7 +970,7 @@ public static final void gluNextContour(GLUtessellator tessellator, int type) { * gluTessVertex} and {@link #gluNextContour * gluNextContour} reference pages for more details.<P> * - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile * * Once <b>gluEndPolygon</b> is called, the polygon is tessellated, and the * resulting triangles are described through callbacks. See @@ -1200,37 +1200,37 @@ protected static boolean availableGLUquadricImpl = false; protected static boolean checkedGLUquadricImpl = false; /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ protected static final void validateGLUquadricImpl() { if(!checkedGLUquadricImpl) { - availableGLUquadricImpl = GLReflection.isClassAvailable("com.sun.opengl.impl.glu.GLUquadricImpl"); + availableGLUquadricImpl = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.GLUquadricImpl"); checkedGLUquadricImpl = true; } if(!availableGLUquadricImpl) { - throw new GLUnsupportedException("GLUquadric not available (GLUquadricImpl)"); + throw new GLException("GLUquadric not available (GLUquadricImpl)"); } } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> void gluCylinder(GLUquadric * quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluCylinder(GLUquadric * quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks); </code> */ public final void gluCylinder(GLUquadric quad, double base, double top, double height, int slices, int stacks) { validateGLUquadricImpl(); ((GLUquadricImpl) quad).drawCylinder(getCurrentGL(), (float) base, (float) top, (float) height, slices, stacks); } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> void gluDeleteQuadric(GLUquadric * quad); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluDeleteQuadric(GLUquadric * quad); </code> */ public final void gluDeleteQuadric(GLUquadric quad) { validateGLUquadricImpl(); } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> void gluDisk(GLUquadric * quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluDisk(GLUquadric * quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops); </code> */ public final void gluDisk(GLUquadric quad, double inner, double outer, int slices, int loops) { validateGLUquadricImpl(); ((GLUquadricImpl) quad).drawDisk(getCurrentGL(), (float) inner, (float) outer, slices, loops); } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> GLUquadric * gluNewQuadric(void); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> GLUquadric * gluNewQuadric(void); </code> */ public final GLUquadric gluNewQuadric() { return gluNewQuadric(false); } @@ -1243,37 +1243,37 @@ public final GLUquadric gluNewQuadric(boolean useGLSL) { return new GLUquadricImpl(useGLSL); } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> void gluPartialDisk(GLUquadric * quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluPartialDisk(GLUquadric * quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep); </code> */ public final void gluPartialDisk(GLUquadric quad, double inner, double outer, int slices, int loops, double start, double sweep) { validateGLUquadricImpl(); ((GLUquadricImpl) quad).drawPartialDisk(getCurrentGL(), (float) inner, (float) outer, slices, loops, (float) start, (float) sweep); } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> void gluQuadricDrawStyle(GLUquadric * quad, GLenum draw); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluQuadricDrawStyle(GLUquadric * quad, GLenum draw); </code> */ public final void gluQuadricDrawStyle(GLUquadric quad, int draw) { validateGLUquadricImpl(); ((GLUquadricImpl) quad).setDrawStyle(draw); } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> void gluQuadricNormals(GLUquadric * quad, GLenum normal); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluQuadricNormals(GLUquadric * quad, GLenum normal); </code> */ public final void gluQuadricNormals(GLUquadric quad, int normal) { validateGLUquadricImpl(); ((GLUquadricImpl) quad).setNormals(normal); } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> void gluQuadricOrientation(GLUquadric * quad, GLenum orientation); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluQuadricOrientation(GLUquadric * quad, GLenum orientation); </code> */ public final void gluQuadricOrientation(GLUquadric quad, int orientation) { validateGLUquadricImpl(); ((GLUquadricImpl) quad).setOrientation(orientation); } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> void gluQuadricTexture(GLUquadric * quad, GLboolean texture); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluQuadricTexture(GLUquadric * quad, GLboolean texture); </code> */ public final void gluQuadricTexture(GLUquadric quad, boolean texture) { validateGLUquadricImpl(); ((GLUquadricImpl) quad).setTextureFlag(texture); } -/** Option (throws GLUnsupportedException if not available in profile). <br> Interface to C language function: <br> <code> void gluSphere(GLUquadric * quad, GLdouble radius, GLint slices, GLint stacks); </code> */ +/** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluSphere(GLUquadric * quad, GLdouble radius, GLint slices, GLint stacks); </code> */ public final void gluSphere(GLUquadric quad, double radius, int slices, int stacks) { validateGLUquadricImpl(); ((GLUquadricImpl) quad).drawSphere(getCurrentGL(), (float) radius, slices, stacks); @@ -1286,15 +1286,15 @@ public final void gluSphere(GLUquadric quad, double radius, int slices, int stac private ProjectFloat project; public void gluOrtho2D(float left, float right, float bottom, float top) { - project.gluOrtho2D(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), left, right, bottom, top); + project.gluOrtho2D(getCurrentGL().getGL2ES1(), left, right, bottom, top); } public void gluPerspective(float fovy, float aspect, float zNear, float zFar) { - project.gluPerspective(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), fovy, aspect, zNear, zFar); + project.gluPerspective(getCurrentGL().getGL2ES1(), fovy, aspect, zNear, zFar); } public void gluLookAt(float eyeX, float eyeY, float eyeZ, float centerX, float centerY, float centerZ, float upX, float upY, float upZ) { - project.gluLookAt(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ); + project.gluLookAt(getCurrentGL().getGL2ES1(), eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ); } /** Interface to C language function: <br> <code> GLint gluProject(GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble * model, const GLdouble * proj, const GLint * view, GLdouble * winX, GLdouble * winY, GLdouble * winZ); </code> @@ -1340,23 +1340,23 @@ public boolean gluUnProject4(float winX, float winY, float winZ, float clipW, ja } public void gluPickMatrix(float x, float y, float delX, float delY, int[] viewport, int viewport_offset) { - project.gluPickMatrix(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), x, y, delX, delY, viewport, viewport_offset); + project.gluPickMatrix(getCurrentGL().getGL2ES1(), x, y, delX, delY, viewport, viewport_offset); } public void gluPickMatrix(float x, float y, float delX, float delY, java.nio.IntBuffer viewport) { - project.gluPickMatrix(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), x, y, delX, delY, viewport); + project.gluPickMatrix(getCurrentGL().getGL2ES1(), x, y, delX, delY, viewport); } public void gluOrtho2D(double left, double right, double bottom, double top) { - project.gluOrtho2D(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), (float)left, (float)right, (float)bottom, (float)top); + project.gluOrtho2D(getCurrentGL().getGL2ES1(), (float)left, (float)right, (float)bottom, (float)top); } public void gluPerspective(double fovy, double aspect, double zNear, double zFar) { - project.gluPerspective(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), (float)fovy, (float)aspect, (float)zNear, (float)zFar); + project.gluPerspective(getCurrentGL().getGL2ES1(), (float)fovy, (float)aspect, (float)zNear, (float)zFar); } public void gluLookAt(double eyeX, double eyeY, double eyeZ, double centerX, double centerY, double centerZ, double upX, double upY, double upZ) { - project.gluLookAt(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), (float)eyeX, (float)eyeY, (float)eyeZ, (float)centerX, (float)centerY, (float)centerZ, (float)upX, (float)upY, (float)upZ); + project.gluLookAt(getCurrentGL().getGL2ES1(), (float)eyeX, (float)eyeY, (float)eyeZ, (float)centerX, (float)centerY, (float)centerZ, (float)upX, (float)upY, (float)upZ); } /** Interface to C language function: <br> <code> GLint gluProject(GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble * model, const GLdouble * proj, const GLint * view, GLdouble * winX, GLdouble * winY, GLdouble * winZ); </code> @@ -1381,69 +1381,69 @@ public boolean gluUnProject4(double winX, double winY, double winZ, double clipW } public void gluPickMatrix(double x, double y, double delX, double delY, int[] viewport, int viewport_offset) { - project.gluPickMatrix(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), (float)x, (float)y, (float)delX, (float)delY, viewport, viewport_offset); + project.gluPickMatrix(getCurrentGL().getGL2ES1(), (float)x, (float)y, (float)delX, (float)delY, viewport, viewport_offset); } public void gluPickMatrix(double x, double y, double delX, double delY, IntBuffer viewport) { - project.gluPickMatrix(GLFixedFuncUtil.getCurrentGLFixedFuncIf(), (float)x, (float)y, (float)delX, (float)delY, viewport); + project.gluPickMatrix(getCurrentGL().getGL2ES1(), (float)x, (float)y, (float)delX, (float)delY, viewport); } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public int gluScaleImage( int format, int widthin, int heightin, int typein, java.nio.Buffer datain, int widthout, int heightout, int typeout, java.nio.Buffer dataout ) { - throw new GLUnsupportedException("not implemented"); + throw new GLException("not implemented"); } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public int gluBuild1DMipmapLevels( int target, int internalFormat, int width, int format, int type, int userLevel, int baseLevel, int maxLevel, java.nio.Buffer data ) { - throw new GLUnsupportedException("not implemented"); + throw new GLException("not implemented"); } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public int gluBuild1DMipmaps( int target, int internalFormat, int width, int format, int type, java.nio.Buffer data ) { - throw new GLUnsupportedException("not implemented"); + throw new GLException("not implemented"); } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public int gluBuild2DMipmapLevels( int target, int internalFormat, int width, int height, int format, int type, int userLevel, int baseLevel, int maxLevel, java.nio.Buffer data ) { - throw new GLUnsupportedException("not implemented"); + throw new GLException("not implemented"); } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public int gluBuild2DMipmaps( int target, int internalFormat, int width, int height, int format, int type, java.nio.Buffer data ) { - throw new GLUnsupportedException("not implemented"); + throw new GLException("not implemented"); } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public int gluBuild3DMipmapLevels( int target, int internalFormat, int width, int height, int depth, int format, int type, int userLevel, int baseLevel, int maxLevel, java.nio.Buffer data) { - throw new GLUnsupportedException("not implemented"); + throw new GLException("not implemented"); } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public int gluBuild3DMipmaps( int target, int internalFormat, int width, int height, int depth, int format, int type, java.nio.Buffer data ) { - throw new GLUnsupportedException("not implemented"); + throw new GLException("not implemented"); } diff --git a/make/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java index aedacf3dd..aedacf3dd 100644 --- a/make/glu-CustomJavaCode-gl2.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2.java diff --git a/make/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java index 95e96c2e2..074ff99b4 100755 --- a/make/glu-CustomJavaCode-gl2es1.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java @@ -86,11 +86,11 @@ protected static boolean checkedMipmap = false; protected static final void validateMipmap() { if(!checkedMipmap) { - availableMipmap = GLReflection.isClassAvailable("com.sun.opengl.impl.glu.mipmap.Mipmap"); + availableMipmap = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.mipmap.Mipmap"); checkedMipmap = true; } if(!availableMipmap) { - throw new GLUnsupportedException("Mipmap not available"); + throw new GLException("Mipmap not available"); } } @@ -112,7 +112,7 @@ private final java.nio.ByteBuffer copyToByteBuffer(java.nio.Buffer buf) { } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public final int gluScaleImage( int format, int widthin, int heightin, int typein, java.nio.Buffer datain, int widthout, int heightout, @@ -153,7 +153,7 @@ public final int gluScaleImage( int format, int widthin, int heightin, /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public final int gluBuild1DMipmapLevels( int target, int internalFormat, int width, int format, int type, int userLevel, int baseLevel, int maxLevel, @@ -166,7 +166,7 @@ public final int gluBuild1DMipmapLevels( int target, int internalFormat, int wid /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public final int gluBuild1DMipmaps( int target, int internalFormat, int width, int format, int type, java.nio.Buffer data ) { @@ -178,7 +178,7 @@ public final int gluBuild1DMipmaps( int target, int internalFormat, int width, /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public final int gluBuild2DMipmapLevels( int target, int internalFormat, int width, int height, int format, int type, int userLevel, int baseLevel, @@ -191,7 +191,7 @@ public final int gluBuild2DMipmapLevels( int target, int internalFormat, int wid } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public final int gluBuild2DMipmaps( int target, int internalFormat, int width, int height, int format, int type, java.nio.Buffer data ) { @@ -203,7 +203,7 @@ public final int gluBuild2DMipmaps( int target, int internalFormat, int width, } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public final int gluBuild3DMipmapLevels( int target, int internalFormat, int width, int height, int depth, int format, int type, int userLevel, int baseLevel, @@ -215,7 +215,7 @@ public final int gluBuild3DMipmapLevels( int target, int internalFormat, int wid } /** - * Optional, throws GLUnsupportedException if not available in profile + * Optional, throws GLException if not available in profile */ public final int gluBuild3DMipmaps( int target, int internalFormat, int width, int height, int depth, int format, int type, java.nio.Buffer data ) { diff --git a/make/glu-base.cfg b/make/config/jogl/glu-base.cfg index f67673a78..f67673a78 100755 --- a/make/glu-base.cfg +++ b/make/config/jogl/glu-base.cfg diff --git a/make/glu-common.cfg b/make/config/jogl/glu-common.cfg index 775655294..06f80342e 100644 --- a/make/glu-common.cfg +++ b/make/config/jogl/glu-common.cfg @@ -16,10 +16,11 @@ Import javax.media.opengl.util.* Import com.sun.opengl.impl.* Import com.sun.opengl.impl.glu.* Import com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl +Import com.sun.nwi.impl.NWReflection # Raise GLException instead of RuntimeException in glue code RuntimeExceptionType GLException -UnsupportedExceptionType GLUnsupportedException +UnsupportedExceptionType GLException # # Opaques and other directives for platform-independent routines diff --git a/make/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg index 699352145..712f9a305 100755 --- a/make/glu-gl2.cfg +++ b/make/config/jogl/glu-gl2.cfg @@ -22,7 +22,7 @@ CustomCCode #elif defined(linux) || defined(__sun) || defined(__FreeBSD__) || de CustomCCode #include <inttypes.h> CustomCCode #endif -Include intptr.cfg +Include ../intptr.cfg EmitProcAddressTable true ProcAddressTablePackage com.sun.opengl.impl.glu.gl2 diff --git a/make/glu-gl2es1.cfg b/make/config/jogl/glu-gl2es1.cfg index 8927f96b9..8927f96b9 100755 --- a/make/glu-gl2es1.cfg +++ b/make/config/jogl/glu-gl2es1.cfg diff --git a/make/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c index 218a0ebe9..218a0ebe9 100755 --- a/make/glx-CustomCCode.c +++ b/make/config/jogl/glx-CustomCCode.c diff --git a/make/glx-x11.cfg b/make/config/jogl/glx-x11.cfg index c668282cc..e1d684ef7 100644 --- a/make/glx-x11.cfg +++ b/make/config/jogl/glx-x11.cfg @@ -16,7 +16,7 @@ GetProcAddressTableExpr glxProcAddressTable # This must be present for bootstrapping SkipProcAddressGen glXGetProcAddressARB -Import com.sun.opengl.impl.x11.* +Import com.sun.nwi.impl.x11.* CustomJavaCode GLX private static GLXProcAddressTable glxProcAddressTable = new GLXProcAddressTable(); CustomJavaCode GLX public static GLXProcAddressTable getGLXProcAddressTable() { return glxProcAddressTable; } diff --git a/make/glxext.cfg b/make/config/jogl/glxext.cfg index 1d46c569f..4f964865a 100755 --- a/make/glxext.cfg +++ b/make/config/jogl/glxext.cfg @@ -17,13 +17,13 @@ EmitProcAddressTable true ProcAddressTableClassName GLXExtProcAddressTable GetProcAddressTableExpr _context.getGLXExtProcAddressTable() -Import com.sun.opengl.impl.x11.* +Import com.sun.nwi.impl.x11.* # Ignore everything that doesn't start with glX or GLX IgnoreNot ^(glX|GLX).+ Include gl-headers.cfg -Include intptr.cfg +Include ../intptr.cfg CustomCCode /* Provide Windows typedefs */ CustomCCode typedef void* LPVOID; diff --git a/make/nsig.cfg b/make/config/jogl/nsig.cfg index 404746cc3..404746cc3 100755 --- a/make/nsig.cfg +++ b/make/config/jogl/nsig.cfg diff --git a/make/wgl-CustomCCode.c b/make/config/jogl/wgl-CustomCCode.c index 0fe9ee628..0fe9ee628 100755 --- a/make/wgl-CustomCCode.c +++ b/make/config/jogl/wgl-CustomCCode.c diff --git a/make/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg index d9035b3e6..f86f1adcc 100644 --- a/make/wgl-win32.cfg +++ b/make/config/jogl/wgl-win32.cfg @@ -23,7 +23,7 @@ CustomCCode #undef WIN32_LEAN_AND_MEAN CustomCCode #include <wingdi.h> CustomCCode #include <stddef.h> -Include intptr.cfg +Include ../intptr.cfg IncludeAs CustomCCode wgl-CustomCCode.c diff --git a/make/wglext.cfg b/make/config/jogl/wglext.cfg index 21ad0936d..af4430bbe 100644 --- a/make/wglext.cfg +++ b/make/config/jogl/wglext.cfg @@ -20,7 +20,7 @@ Ignore GL_.+ Ignore gl.+ Include gl-headers.cfg -Include intptr.cfg +Include ../intptr.cfg # FIXME: for the time being, ignore all extensions requiring the # presence of java.nio.LongBuffer because it doesn't exist on CDC/FP + diff --git a/make/jawt-CustomJavaCode.java b/make/config/nwi/jawt-CustomJavaCode.java index f1ef91075..f1ef91075 100755 --- a/make/jawt-CustomJavaCode.java +++ b/make/config/nwi/jawt-CustomJavaCode.java diff --git a/make/jawt-DrawingSurfaceInfo-CustomJavaCode.java b/make/config/nwi/jawt-DrawingSurfaceInfo-CustomJavaCode.java index 43ad16cbd..1cc13e7d8 100755 --- a/make/jawt-DrawingSurfaceInfo-CustomJavaCode.java +++ b/make/config/nwi/jawt-DrawingSurfaceInfo-CustomJavaCode.java @@ -16,12 +16,12 @@ private static JAWT_PlatformInfo newPlatformInfo(ByteBuffer buf) { try { Class factoryClass; if (osName.startsWith("wind")) { - factoryClass = Class.forName("com.sun.opengl.impl.jawt.windows.JAWT_Win32DrawingSurfaceInfo"); + factoryClass = Class.forName("com.sun.nwi.impl.jawt.windows.JAWT_Win32DrawingSurfaceInfo"); } else if (osName.startsWith("mac os x")) { - factoryClass = Class.forName("com.sun.opengl.impl.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo"); + factoryClass = Class.forName("com.sun.nwi.impl.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo"); } else { // Assume Linux, Solaris, etc. Should probably test for these explicitly. - factoryClass = Class.forName("com.sun.opengl.impl.jawt.x11.JAWT_X11DrawingSurfaceInfo"); + factoryClass = Class.forName("com.sun.nwi.impl.jawt.x11.JAWT_X11DrawingSurfaceInfo"); } platformInfoFactoryMethod = factoryClass.getMethod("create", new Class[] { ByteBuffer.class }); diff --git a/make/jawt-macosx.cfg b/make/config/nwi/jawt-macosx.cfg index a4495801c..57cceb6a1 100644 --- a/make/jawt-macosx.cfg +++ b/make/config/nwi/jawt-macosx.cfg @@ -1,10 +1,10 @@ # This .cfg file is used to generate the interface to the JAWT, which # is used by the MacOSXOnscreenGLContext. Style AllStatic -Package com.sun.opengl.impl.jawt +Package com.sun.nwi.impl.jawt JavaClass JAWTFactory JavaOutputDir gensrc/classes -NativeOutputDir gensrc/native/jogl/MacOSX +NativeOutputDir gensrc/native/MacOSX HierarchicalNativeOutput false @@ -22,8 +22,8 @@ CustomCCode #include <jawt.h> CustomCCode #include </usr/include/machine/types.h> import java.security.* -import com.sun.opengl.impl.jawt.* -StructPackage JAWT_MacOSXDrawingSurfaceInfo com.sun.opengl.impl.jawt.macosx +import com.sun.nwi.impl.jawt.* +StructPackage JAWT_MacOSXDrawingSurfaceInfo com.sun.nwi.impl.jawt.macosx EmitStruct JAWT_MacOSXDrawingSurfaceInfo Implements JAWT_MacOSXDrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/jawt-win32.cfg b/make/config/nwi/jawt-win32.cfg index 96b923a22..74aef8f75 100644 --- a/make/jawt-win32.cfg +++ b/make/config/nwi/jawt-win32.cfg @@ -1,10 +1,10 @@ # This .cfg file is used to generate the interface to the JAWT, which # is used by the WindowsOnscreenGLContext. Style AllStatic -Package com.sun.opengl.impl.jawt +Package com.sun.nwi.impl.jawt JavaClass JAWTFactory JavaOutputDir gensrc/classes -NativeOutputDir gensrc/native/jogl/Windows +NativeOutputDir gensrc/native/Windows HierarchicalNativeOutput false @@ -19,11 +19,11 @@ IgnoreField JAWT_Win32DrawingSurfaceInfo hpalette IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java CustomCCode #include <jawt.h> -Include intptr.cfg +Include ../intptr.cfg import java.security.* -import com.sun.opengl.impl.jawt.* -StructPackage JAWT_Win32DrawingSurfaceInfo com.sun.opengl.impl.jawt.windows +import com.sun.nwi.impl.jawt.* +StructPackage JAWT_Win32DrawingSurfaceInfo com.sun.nwi.impl.jawt.windows EmitStruct JAWT_Win32DrawingSurfaceInfo Implements JAWT_Win32DrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/jawt-x11.cfg b/make/config/nwi/jawt-x11.cfg index 7f8a9d282..fdcf16bdb 100644 --- a/make/jawt-x11.cfg +++ b/make/config/nwi/jawt-x11.cfg @@ -1,10 +1,10 @@ # This .cfg file is used to generate the interface to the JAWT, which # is used by the X11OnscreenGLContext. Style AllStatic -Package com.sun.opengl.impl.jawt +Package com.sun.nwi.impl.jawt JavaClass JAWTFactory JavaOutputDir gensrc/classes -NativeOutputDir gensrc/native/jogl/X11 +NativeOutputDir gensrc/native/X11 HierarchicalNativeOutput false @@ -22,8 +22,8 @@ CustomCCode #include <inttypes.h> CustomCCode #include <jawt.h> import java.security.* -import com.sun.opengl.impl.jawt.* -StructPackage JAWT_X11DrawingSurfaceInfo com.sun.opengl.impl.jawt.x11 +import com.sun.nwi.impl.jawt.* +StructPackage JAWT_X11DrawingSurfaceInfo com.sun.nwi.impl.jawt.x11 EmitStruct JAWT_X11DrawingSurfaceInfo Implements JAWT_X11DrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/x11-CustomCCode.c b/make/config/nwi/x11-CustomCCode.c index a2a19a782..793327c72 100755 --- a/make/x11-CustomCCode.c +++ b/make/config/nwi/x11-CustomCCode.c @@ -49,16 +49,16 @@ Bool XF86VidModeSetGammaRamp( /* Need to expose DefaultScreen and RootWindow macros to Java */ JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_x11_X11Lib_DefaultScreen(JNIEnv *env, jclass _unused, jlong display) { +Java_com_sun_nwi_impl_x11_X11Lib_DefaultScreen(JNIEnv *env, jclass _unused, jlong display) { return DefaultScreen((Display*) (intptr_t) display); } JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_x11_X11Lib_RootWindow(JNIEnv *env, jclass _unused, jlong display, jint screen) { +Java_com_sun_nwi_impl_x11_X11Lib_RootWindow(JNIEnv *env, jclass _unused, jlong display, jint screen) { return RootWindow((Display*) (intptr_t) display, screen); } JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring name) { +Java_com_sun_nwi_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring name) { const jbyte* chars; void* res; chars = (*env)->GetStringUTFChars(env, name, NULL); @@ -68,7 +68,7 @@ Java_com_sun_opengl_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring } JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_x11_X11Lib_dlsym(JNIEnv *env, jclass _unused, jstring name) { +Java_com_sun_nwi_impl_x11_X11Lib_dlsym(JNIEnv *env, jclass _unused, jstring name) { const jbyte* chars; void* res; chars = (*env)->GetStringUTFChars(env, name, NULL); diff --git a/make/x11-lib.cfg b/make/config/nwi/x11-lib.cfg index 8313051b3..1448e7783 100644 --- a/make/x11-lib.cfg +++ b/make/config/nwi/x11-lib.cfg @@ -1,13 +1,13 @@ # This .cfg file is used to generate the interface to the GLX routines # used internally by the X11GLContext implementation. -Package com.sun.opengl.impl.x11 +Package com.sun.nwi.impl.x11 JavaClass X11Lib Style allstatic HierarchicalNativeOutput false JavaOutputDir gensrc/classes -NativeOutputDir gensrc/native/jogl/X11 +NativeOutputDir gensrc/native/X11 # Imports needed by all glue code Import java.nio.* diff --git a/make/jogl.compiler.xml b/make/jogl.compiler.xml index 4b86a6cd7..1033a2851 100644 --- a/make/jogl.compiler.xml +++ b/make/jogl.compiler.xml @@ -13,4 +13,3 @@ </target> </project> - diff --git a/make/lstjars.sh b/make/lstjars.sh index 4d9a33f59..5e626e19d 100644 --- a/make/lstjars.sh +++ b/make/lstjars.sh @@ -1,6 +1,12 @@ #! /bin/sh THISDIR=$(pwd) +STATDIR=$THISDIR/../stats + +BUILDDIR=$1 +if [ -z "$BUILDDIR" ] ; then + BUILDDIR=$THISDIR/../build +fi function report() { #ls -1 -s --block-size=1024 $* @@ -8,77 +14,88 @@ function report() { du -ksc $* } -cd $THISDIR/../build/obj -mkdir -p tmp -cd tmp +rm -rf $STATDIR +mkdir -p $STATDIR +cp -a $BUILDDIR-nwi/obj/*.so $STATDIR +cp -a $BUILDDIR-jogl/obj/*.so $STATDIR +cp -a $BUILDDIR-newt/obj/*.so $STATDIR +cp -a $BUILDDIR-nwi/*.jar $STATDIR +cp -a $BUILDDIR-jogl/*.jar $STATDIR +cp -a $BUILDDIR-newt/*.jar $STATDIR + +cd $STATDIR -rm -f *.so *.so.gz -cp ../*.so . for i in *.so ; do gzip $i done + echo Native Libraries report *.gz echo -cd $THISDIR/../build - rm -f *.lst for i in *.jar ; do fname=$i bname=$(basename $fname .jar) + echo pack200 $bname.pack.gz $fname + pack200 $bname.pack.gz $fname echo list $fname to $bname.lst jar tf $fname | grep class | sort > $bname.lst done +rm -rf nope mkdir -p nope + +rm -f allparts.lst allall.lst + mv jogl.all.lst nope/ mv jogl.gl2es12.*.lst jogl.gl2.*.lst nope/ echo duplicates - w/o gl2es12.* gl2.* echo -sort *.lst | uniq -d +sort jogl*.lst | uniq -d mv nope/* . -mv jogl.all.lst nope/ -cat *.lst | sort -u > jogl.allparts.lst +mv *.all.lst nope/ +cat *.lst | sort -u > allparts.lst mv nope/* . +cat *.all.lst | sort -u > allall.lst -echo jogl.all bs jogl.allparts delta +echo all vs allparts delta echo -diff -Nur jogl.allparts.lst jogl.all.lst +diff -Nur allparts.lst allall.lst OSS=x11 echo JOGL ES1 NEWT CORE -report jogl.core.jar jogl.egl.jar jogl.gles1.jar newt.jar obj/tmp/libjogl_es1.so.gz obj/tmp/libnewt.so.gz +report nwi.core.pack.gz jogl.core.pack.gz jogl.egl.pack.gz jogl.gles1.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es1.so.gz libnewt.so.gz echo echo JOGL ES2 NEWT CORE -report jogl.core.jar jogl.egl.jar jogl.gles2.jar newt.jar obj/tmp/libjogl_es2.so.gz obj/tmp/libnewt.so.gz +report nwi.core.pack.gz jogl.core.pack.gz jogl.egl.pack.gz jogl.gles2.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es2.so.gz libnewt.so.gz echo echo JOGL ES2 NEWT CORE FIXED -report jogl.core.jar jogl.egl.jar jogl.gles2.jar jogl.fixed.jar newt.jar obj/tmp/libjogl_es2.so.gz obj/tmp/libnewt.so.gz +report nwi.core.pack.gz jogl.core.pack.gz jogl.egl.pack.gz jogl.gles2.pack.gz jogl.fixed.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es2.so.gz libnewt.so.gz echo echo JOGL GL2ES12 NEWT -report jogl.core.jar jogl.gl2es12.$OSS.jar newt.jar obj/tmp/libjogl_gl2es12.so.gz obj/tmp/libnewt.so.gz +report nwi.core.pack.gz jogl.core.pack.gz jogl.gl2es12.$OSS.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_gl2es12.so.gz libnewt.so.gz echo echo JOGL GL2 NEWT -report jogl.core.jar jogl.gl2.$OSS.jar newt.jar obj/tmp/libjogl_gl2.so.gz obj/tmp/libnewt.so.gz +report nwi.core.pack.gz jogl.core.pack.gz jogl.gl2.$OSS.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_gl2.so.gz libnewt.so.gz echo echo JOGL GL2 AWT -report jogl.core.jar jogl.gl2.$OSS.jar jogl.awt.jar obj/tmp/libjogl_gl2.so.gz obj/tmp/libjogl_awt.so.gz +report nwi.core.pack.gz nwi.$OSS.pack.gz nwi.awt.pack.gz jogl.core.pack.gz jogl.gl2.$OSS.pack.gz jogl.awt.pack.gz libjogl_gl2.so.gz libjogl_awt.so.gz libnwi_$OSS.so.gz libnwi_awt.so.gz echo echo JOGL GLU -report jogl.glu.*jar +report jogl.glu.*pack.gz echo echo JOGL EVERYTHING -report jogl.all.jar +report *.all.pack.gz echo diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh index a9e4e8d85..a14cc1c10 100644 --- a/make/make.jogl.all.linux-x86.sh +++ b/make/make.jogl.all.linux-x86.sh @@ -12,4 +12,5 @@ ant \ -DisLinuxX86=true \ -DisX11=true \ -DuseKD=true \ + -DuseOpenMAX=true \ $* 2>&1 | tee make.jogl.all.linux-x86.log diff --git a/make/make.jogl.all.macosx.sh b/make/make.jogl.all.macosx.sh new file mode 100644 index 000000000..e7a5ee37b --- /dev/null +++ b/make/make.jogl.all.macosx.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +. /devtools/etc/profile.ant + +# -Dc.compiler.debug=true + +ant -v \ + -Drootrel.build=build-macosx \ + $* 2>&1 | tee make.jogl.all.macosx.log diff --git a/make/newt.compiler.xml b/make/newt.compiler.xml new file mode 100644 index 000000000..973ef9654 --- /dev/null +++ b/make/newt.compiler.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="NEWT" basedir="." default="all"> +<target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler"> + <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux"> + <syslibset dir="/devtools/i686-unknown-linux-gnu/xfree86-4.3.0-linux-ix86-glibc23/lib" libs="X11"/> + <syslibset dir="/devtools/i686-unknown-linux-gnu/xfree86-4.3.0-linux-ix86-glibc23/lib" libs="Xxf86vm"/> + </linker> + + <linker id="linker.cfg.linux.newt.gl2" extends="linker.cfg.linux.newt.x11"> + <syslibset dir="/devtools/i686-unknown-linux-gnu/xfree86-4.3.0-linux-ix86-glibc23/lib" libs="GL"/> + <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/> + </linker> +</target> +</project> + diff --git a/make/newtRIversion b/make/newtRIversion new file mode 100644 index 000000000..7b8608290 --- /dev/null +++ b/make/newtRIversion @@ -0,0 +1,8 @@ +Specification-Title: NEWT API Specification +Specification-Version: @BASEVERSION@ +Specification-Vendor: Sun Microsystems, Inc. +Implementation-Title: NEWT Runtime Environment +Implementation-Version: @BASEVERSION@ +Implementation-Vendor: Sun Microsystems, Inc. +Extension-Name: com.sun.javafx.newt +Implementation-Vendor-Id: com.sun diff --git a/make/newtversion b/make/newtversion new file mode 100644 index 000000000..3c9335cf5 --- /dev/null +++ b/make/newtversion @@ -0,0 +1,8 @@ +Specification-Title: NEWT API Specification +Specification-Version: @BASEVERSION@ +Specification-Vendor: Sun Microsystems, Inc. +Implementation-Title: NEWT Runtime Environment +Implementation-Version: @VERSION@ +Implementation-Vendor: java.net JOGL community +Extension-Name: com.sun.javafx.newt +Implementation-Vendor-Id: com.sun diff --git a/make/nwi.compiler.xml b/make/nwi.compiler.xml new file mode 100644 index 000000000..b60f9c707 --- /dev/null +++ b/make/nwi.compiler.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="NWI" basedir="." default="all"> +<target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler"> + <linker id="linker.cfg.linux.nwi.x11" extends="linker.cfg.linux"> + <syslibset dir="/devtools/i686-unknown-linux-gnu/xfree86-4.3.0-linux-ix86-glibc23/lib" libs="X11"/> + <syslibset dir="/devtools/i686-unknown-linux-gnu/xfree86-4.3.0-linux-ix86-glibc23/lib" libs="Xxf86vm"/> + </linker> + + <linker id="linker.cfg.linux.nwi.gl2" extends="linker.cfg.linux.nwi.x11"> + <syslibset dir="/devtools/i686-unknown-linux-gnu/xfree86-4.3.0-linux-ix86-glibc23/lib" libs="GL"/> + <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/> + </linker> +</target> +</project> + diff --git a/make/nwiRIversion b/make/nwiRIversion new file mode 100644 index 000000000..20600ac28 --- /dev/null +++ b/make/nwiRIversion @@ -0,0 +1,8 @@ +Specification-Title: Native Window Interface API Specification +Specification-Version: @BASEVERSION@ +Specification-Vendor: Sun Microsystems, Inc. +Implementation-Title: Native Window Interface Runtime Environment +Implementation-Version: @BASEVERSION@ +Implementation-Vendor: Sun Microsystems, Inc. +Extension-Name: javax.media.nwi +Implementation-Vendor-Id: com.sun diff --git a/make/nwiversion b/make/nwiversion new file mode 100644 index 000000000..de3a10fda --- /dev/null +++ b/make/nwiversion @@ -0,0 +1,8 @@ +Specification-Title: Native Window Interface API Specification +Specification-Version: @BASEVERSION@ +Specification-Vendor: Sun Microsystems, Inc. +Implementation-Title: Native Window Interface Runtime Environment +Implementation-Version: @VERSION@ +Implementation-Vendor: java.net JOGL community +Extension-Name: javax.media.nwi +Implementation-Vendor-Id: com.sun diff --git a/make/stub_includes/common/cg.c b/make/stub_includes/opengl/cg.c index 98c824285..98c824285 100644 --- a/make/stub_includes/common/cg.c +++ b/make/stub_includes/opengl/cg.c diff --git a/make/stub_includes/common/gl.c b/make/stub_includes/opengl/gl.c index e91ee95f3..e91ee95f3 100644 --- a/make/stub_includes/common/gl.c +++ b/make/stub_includes/opengl/gl.c diff --git a/make/stub_includes/common/gles1.c b/make/stub_includes/opengl/gles1.c index 63df1c967..63df1c967 100755 --- a/make/stub_includes/common/gles1.c +++ b/make/stub_includes/opengl/gles1.c diff --git a/make/stub_includes/common/gles2.c b/make/stub_includes/opengl/gles2.c index f74b1686f..f74b1686f 100755 --- a/make/stub_includes/common/gles2.c +++ b/make/stub_includes/opengl/gles2.c diff --git a/make/stub_includes/common/glu-impl.c b/make/stub_includes/opengl/glu-impl.c index 2328639d8..2328639d8 100644 --- a/make/stub_includes/common/glu-impl.c +++ b/make/stub_includes/opengl/glu-impl.c diff --git a/make/stub_includes/common/glu.c b/make/stub_includes/opengl/glu.c index 91020e365..91020e365 100644 --- a/make/stub_includes/common/glu.c +++ b/make/stub_includes/opengl/glu.c |