diff options
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 890 |
1 files changed, 373 insertions, 517 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 23ad51a9e..760200398 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -59,121 +59,92 @@ setup.noAWT setup.noCDC + - Skip gluegen: java.generate.skip --> <project name="JOGL" basedir="." default="all"> - <import file="versions.xml" /> - - <!-- Pull in GlueGen cpptasks build file --> - <property name="gluegen.root" value="../../gluegen" /> - <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> + <import file="build-common.xml"/> <!-- ================================================================== --> <!-- - Base initialization and detection of operating system. --> - <target name="base.init" depends="gluegen.cpptasks.detect.os"> - - <condition property="setup.nodesktop"> - <and> - <isfalse value="${isWindows}" /> - <isfalse value="${isOSX}" /> - <isfalse value="${isX11}" /> - </and> - </condition> - - <condition property="setup.noall"> - <isset property="setup.noAWT"/> - </condition> - - <echo message="setup.nodesktop: ${setup.nodesktop}" /> - <echo message="setup.noall: ${setup.noall}" /> - <echo message="setup.noAWT: ${setup.noAWT}" /> - <echo message="setup.noCDC: ${setup.noCDC}" /> - - <!-- partitioning --> - + <target name="partitioning.setup" depends="common.init"> <property name="java.part.core" - value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/sun/opengl/impl/* com/sun/opengl/impl/glu/* com/sun/opengl/impl/glu/error/*"/> + value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/opengl/impl/* com/jogamp/opengl/impl/glu/* com/jogamp/opengl/impl/glu/error/*"/> <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace*"/> <property name="java.part.nv-cg" - value="com/sun/opengl/cg com/sun/opengl/cg/*"/> + value="com/jogamp/opengl/cg com/jogamp/opengl/cg/*"/> <property name="java.part.egl" - value="com/sun/opengl/impl/egl/*"/> + value="com/jogamp/opengl/impl/egl/*"/> <property name="java.part.glutess" - value="com/sun/opengl/impl/glu/tessellator/**"/> + value="com/jogamp/opengl/impl/glu/tessellator/**"/> <property name="java.part.glumipmap" - value="com/sun/opengl/impl/glu/mipmap/**"/> + value="com/jogamp/opengl/impl/glu/mipmap/**"/> - <property name="java.part.glugl2" - value="com/sun/opengl/impl/glu/gl2/** com/sun/opengl/impl/glu/nurbs/** com/sun/opengl/impl/glu/registry/** javax/media/opengl/glu/gl2/**"/> + <property name="java.part.glugldesktop" + value="com/jogamp/opengl/impl/glu/gl2/** com/jogamp/opengl/impl/glu/nurbs/** com/jogamp/opengl/impl/glu/registry/** javax/media/opengl/glu/gl2/**"/> <property name="java.part.openmax" - value="com/sun/openmax/**"/> + value="com/jogamp/openmax/**"/> <property name="java.part.sdk" - value="com/sun/opengl/util/glsl/sdk/**"/> + value="com/jogamp/opengl/util/glsl/sdk/**"/> <property name="java.part.glx" - value="com/sun/opengl/impl/x11/glx/*"/> + value="com/jogamp/opengl/impl/x11/glx/*"/> <property name="java.part.wgl" - value="com/sun/opengl/impl/windows/wgl/*"/> + value="com/jogamp/opengl/impl/windows/wgl/*"/> <property name="java.part.cgl" - value="com/sun/opengl/impl/macosx/cgl/*"/> + value="com/jogamp/opengl/impl/macosx/cgl/*"/> <property name="java.part.gl2es12" - value="com/sun/opengl/impl/gl2es12/**"/> + value="com/jogamp/opengl/impl/gl2es12/**"/> - <property name="java.part.gl3" - value="com/sun/opengl/impl/**/gl3/**"/> + <property name="java.part.gldesktop" + value="com/jogamp/opengl/impl/**/gl2/** com/jogamp/opengl/impl/**/gl3/** com/jogamp/opengl/impl/**/gl4/**"/> - <property name="java.part.gl3.dbg" - value="javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.*"/> - - <property name="java.part.gl2" - value="com/sun/opengl/impl/**/gl2/**"/> - - <property name="java.part.gl2.dbg" - value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.*"/> + <property name="java.part.gldesktop.dbg" + value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.* javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.* javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/> <property name="java.part.es1" - value="javax/media/opengl/**/es1/** com/sun/opengl/**/es1/**"/> + value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/**"/> <property name="java.part.es1.dbg" value="javax/media/opengl/TraceGLES1.* javax/media/opengl/DebugGLES1.* javax/media/opengl/TraceGL2ES1.* javax/media/opengl/DebugGL2ES1.*"/> <property name="java.part.es2" - value="javax/media/opengl/**/es2/** com/sun/opengl/**/es2/**"/> + value="javax/media/opengl/**/es2/** com/jogamp/opengl/**/es2/**"/> <property name="java.part.es2.dbg" value="javax/media/opengl/TraceGLES2.* javax/media/opengl/DebugGLES2.* javax/media/opengl/TraceGL2ES2.* javax/media/opengl/DebugGL2ES2.*"/> <property name="java.part.awt" - value="javax/media/opengl/awt/** com/sun/opengl/impl/**/awt/**"/> + value="javax/media/opengl/awt/** com/jogamp/opengl/impl/**/awt/**"/> <property name="java.part.util" - value="com/sun/opengl/util/* com/sun/opengl/util/texture/** com/sun/opengl/util/packrect/**"/> + value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/**"/> <property name="java.part.util.awt" - value="com/sun/opengl/util/**/awt/** com/sun/opengl/util/AWTAnimatorImpl*"/> + value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/> - <property name="java.part.util.gl2" - value="com/sun/opengl/util/**/gl2/**"/> + <property name="java.part.util.gldesktop" + value="com/jogamp/opengl/util/**/gl2/**"/> <property name="java.part.util.glsl" - value="com/sun/opengl/util/glsl/* com/sun/opengl/util/glsl/fixedfunc/*"/> + value="com/jogamp/opengl/util/glsl/* com/jogamp/opengl/util/glsl/fixedfunc/*"/> <property name="java.part.util.fixedfuncemu" - value="com/sun/opengl/util/glsl/fixedfunc/impl/**"/> + value="com/jogamp/opengl/util/glsl/fixedfunc/impl/**"/> <property name="java.part.util.fixedfuncemu.shadercode" - value="com/sun/opengl/util/glsl/fixedfunc/impl/shaders/* com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/**"/> + value="com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/* com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/**"/> <!-- condition excludes --> @@ -190,13 +161,13 @@ </condition> <property name="java.excludes.javadoc.packagenames" - value="com.sun.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/> + value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/> <property name="java.excludes.fixme" - value="com/sun/opengl/impl/gl2/fixme/** com/sun/javafx/audio/windows/waveout/TestSpatialization.java" /> + value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" /> <property name="java.excludes.cdcfp" - value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/sun/opengl/util/TGAWriter.java"/> + value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gldesktop} ${java.part.gldesktop.dbg} ${java.part.awt} ${java.part.glugldesktop} ${java.part.util.awt} ${java.part.util.gldesktop} com/jogamp/opengl/util/TGAWriter.java"/> <condition property="java.excludes.desktop" value="${java.part.glx} ${java.excludes.cdcfp}"> @@ -205,129 +176,55 @@ <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.nv-cg} ${java.excludes.awt} ${java.excludes.desktop}" /> <echo message="java.excludes.all: ${java.excludes.all}" /> - - <!-- Set the project root directory to be up one directory. --> - <property name="project.root" value=".." /> - - <!-- Set the configuration and build files to this directory. --> - <property name="make" value="." /> - </target> - - <target name="base.init.sourcelevel.1"> - <property name="jogl.sourcelevel" value="1.4" /> - </target> - - <!--target name="base.init.sourcelevel.2" if="gluegen.nsig"> - <property name="jogl.sourcelevel" value="1.5" /> - </target--> - - <!-- ================================================================== --> - <!-- - - Load user properties which override build defaults. - --> - <target name="load.user.properties" depends="base.init,base.init.sourcelevel.1" unless="user.properties.file"> - <!-- Load the user specified properties file that defines various host - - specific paths. The user will be notified if this is does not - - exist. --> - <property name="user.properties.file" value="${user.home}/jogl.properties" /> - <property file="${user.properties.file}" /> - <echo message="Loaded ${user.properties.file}." /> - <property file="${user.home}/gluegen.properties" /> - <echo message="Loaded ${user.home}/gluegen.properties." /> - <fail message="antlr.jar was not specified in jogl.properties or gluegen.properties. Please see README.txt for instructions" unless="antlr.jar"/> - <echo message="antlr.jar=${antlr.jar}" /> </target> <!-- ================================================================== --> <!-- - Declare all paths and user defined variables. --> - <target name="declare.common" description="Declare properties" depends="load.user.properties"> - <!-- The location and name of the configuration ANT file that will - - validate to ensure that all user-define variables are set. --> - <property name="validate.user.properties" value="${make}/validate-properties.xml" /> - - <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally --> - <property name="javacdebug" value="true" /> - <property name="javacdebuglevel" value="source,lines" /> - <!-- property name="javac.memorymax" value="128m" /--> <!-- I ran out of memory with these .. linux x86_64 6u14 --> - <property name="javac.memorymax" value="512m" /> - - <!-- Names of directories relative to the project root. - Some of these are used in FileMappers later for dependence information - and need exact string matching, which is why they use file.separator - instead of "/". --> - <condition property="rootrel.build" value="build"> - <not> - <isset property="rootrel.build"/> - </not> - </condition> - <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" /> + <target name="declare.common" description="Declare properties" depends="partitioning.setup"> + <property name="config.jogl" value="${config}/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.jogl}/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.jogl}/obj" /> - <property name="rootrel.obj.jogl" value="${rootrel.obj}/jogl" /> - <property name="rootrel.obj.cg" value="${rootrel.obj}/jogl_cg" /> - - <property name="javac.bootclasspath-cdc.jar" value="../../gluegen/make/lib/cdc_fp.jar"/> - - <!-- GlueGen properties. --> - <!-- NOTE that these require a checked-out GlueGen workspace as a --> - <!-- sibling of the JOGL workspace. --> - <property name="gluegen.make.dir" value="../../gluegen/make" /> - <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="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" /> - <property name="nativewindow.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.jar" /> - <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" /> - - <property name="gluegen-rt-cdc.jar" value="../../gluegen/${rootrel.build}/gluegen-rt-cdc.jar" /> - <property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" /> - <property name="nativewindow.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.cdc.jar" /> - + <property name="rootrel.generated.c.cg" value="${rootrel.src.generated}/native/jogl_cg" /> + <!-- 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.jogl}" /> <property name="tempdir" value="${project.root}/build-temp" /> <!-- The generated source directories. --> - <property name="src.generated" value="${build}/gensrc" /> + <property name="src.generated" value="${build.jogl}/gensrc" /> <property name="src.generated.java" value="${src.generated}/classes" /> <property name="src.generated.java-cdc" value="${src.generated}/classes-cdc" /> - <property name="src.generated.java.cg" value="${src.generated.java}/com/sun/opengl/cg" /> + <property name="src.generated.java.cg" value="${src.generated.java}/com/jogamp/opengl/cg" /> <property name="src.generated.c" value="${src.generated}/native/jogl" /> <property name="src.generated.c.openmax" value="${src.generated}/native/openmax" /> <property name="src.generated.c.cg" value="${src.generated}/native/jogl_cg" /> <!-- The compiler output directories. --> - <property name="classes" value="${build}/classes" /> - <property name="classes-cdc" value="${build}/classes-cdc" /> - <property name="obj" value="${project.root}/${rootrel.obj}" /> - <property name="obj.jogl" value="${project.root}/${rootrel.obj.jogl}" /> - <property name="obj.cg" value="${project.root}/${rootrel.obj.cg}" /> + <property name="classes" value="${build.jogl}/classes" /> + <property name="classes-cdc" value="${build.jogl}/classes-cdc" /> + <property name="obj.joglsub" value="${obj.jogl}/jogl" /> + <property name="obj.cgsub" value="${obj.jogl}/cg" /> <!-- The GL headers from which Java files are generated --> - <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" /> - <dirset id="stub.includes.fileset.all.gl2" dir="."> - <include name="${stub.includes.dir}/opengl/**" /> - <include name="${stub.includes.dir}/macosx/**" /> - <include name="${stub.includes.dir}/win32/**" /> - <include name="${stub.includes.dir}/x11/**" /> - <include name="${stub.includes.dir}/common/**" /> - <include name="${stub.includes.dir}/jni/**" /> + <property name="stub.includes.opengl" value="${stub.includes}/opengl" /> + + <dirset id="stub.includes.fileset.all.gldesktop" dir="."> + <include name="${stub.includes}/opengl/**" /> + <include name="${stub.includes}/macosx/**" /> + <include name="${stub.includes}/win32/**" /> + <include name="${stub.includes}/x11/**" /> + <include name="${stub.includes}/common/**" /> + <include name="${stub.includes}/jni/**" /> </dirset> - <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes.dir}"> + <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}"> <include name="opengl/**" /> <include name="macosx/**" /> <include name="win32/**" /> @@ -336,48 +233,27 @@ <include name="jni/**" /> </fileset> <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" /> - <fileset id="stub.includes.dependencies.fileset.3" dir="${config}"> + <fileset id="stub.includes.dependencies.fileset.3" dir="${config.jogl}"> <include name="*.cfg" /> <include name="gl*.java" /> <include name="*.c" /> <exclude name="cg-common.cfg" /> </fileset> <dirset id="stub.includes.cg.fileset.all" dir="."> - <include name="${stub.includes.dir}/opengl/**" /> - <include name="${stub.includes.dir}/cg/**" /> - <include name="${stub.includes.dir}/macosx/**" /> - <include name="${stub.includes.dir}/win32/**" /> - <include name="${stub.includes.dir}/x11/**" /> - <include name="${stub.includes.dir}/common/**" /> + <include name="${stub.includes}/opengl/**" /> + <include name="${stub.includes}/cg/**" /> + <include name="${stub.includes}/macosx/**" /> + <include name="${stub.includes}/win32/**" /> + <include name="${stub.includes}/x11/**" /> + <include name="${stub.includes}/common/**" /> </dirset> <fileset id="stub.includes.cg.dependencies.fileset" dir="."> - <include name="${stub.includes.dir}/cg/**" /> - <include name="${config}/cg-common.cfg" /> - <include name="${config}/cg-common-CustomJavaCode.java" /> + <include name="${stub.includes}/cg/**" /> + <include name="${config.jogl}/cg-common.cfg" /> + <include name="${config.jogl}/cg-common-CustomJavaCode.java" /> </fileset> <!-- Create the classpath that includes GlueGen and - - ANTLR. This requires the user-defined "antlr.jar" - - property. --> - <path id="gluegen.classpath"> - <pathelement location="${gluegen.jar}" /> - <pathelement location="${antlr.jar}" /> - </path> - - <path id="nativewindow_gluegen.classpath"> - <pathelement location="${gluegen-rt.jar}" /> - <pathelement location="${nativewindow.core.jar}" /> - <pathelement location="${nativewindow.x11.jar}" /> - <pathelement location="${nativewindow.awt.jar}" /> - </path> - - <path id="nativewindow_gluegen.classpath-cdc"> - <pathelement location="${gluegen-rt-cdc.jar}" /> - <pathelement location="${nativewindow.core.cdc.jar}" /> - <pathelement location="${nativewindow.x11.cdc.jar}" /> - </path> - - <!-- Create the classpath that includes GlueGen and - the current classes for building the composable pipelines. --> <path id="pipeline.classpath"> @@ -385,49 +261,6 @@ <pathelement location="${classes}" /> </path> - <!-- The resulting J2SE jogl.jar. --> - <property name="jogl.core.jar" value="${build}/jogl.core.jar" /> - <property name="jogl.cg.jar" value="${build}/jogl.cg.jar" /> - <property name="jogl.gles1.jar" value="${build}/jogl.gles1.jar" /> - <property name="jogl.gles1.dbg.jar" value="${build}/jogl.gles1.dbg.jar" /> - <property name="jogl.gles2.jar" value="${build}/jogl.gles2.jar" /> - <property name="jogl.gles2.dbg.jar" value="${build}/jogl.gles2.dbg.jar" /> - <property name="jogl.egl.jar" value="${build}/jogl.egl.jar" /> - <property name="jogl.glutess.jar" value="${build}/jogl.glu.tess.jar" /> - <property name="jogl.glumipmap.jar" value="${build}/jogl.glu.mipmap.jar" /> - <property name="jogl.glugl2.jar" value="${build}/jogl.glu.gl2.jar" /> - <property name="jogl.gl2es12.x11.jar" value="${build}/jogl.gl2es12.x11.jar" /> - <property name="jogl.gl2es12.win.jar" value="${build}/jogl.gl2es12.win.jar" /> - <property name="jogl.gl2es12.osx.jar" value="${build}/jogl.gl2es12.osx.jar" /> - <property name="jogl.gl2.x11.jar" value="${build}/jogl.gl2.x11.jar" /> - <property name="jogl.gl2.win.jar" value="${build}/jogl.gl2.win.jar" /> - <property name="jogl.gl2.osx.jar" value="${build}/jogl.gl2.osx.jar" /> - <property name="jogl.gl2.dbg.jar" value="${build}/jogl.gl2.dbg.jar" /> - <property name="jogl.awt.jar" value="${build}/jogl.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" /> - <property name="jogl.util.fixedfuncemu.jar" value="${build}/jogl.util.fixedfuncemu.jar" /> - <property name="jogl.sdk.jar" value="${build}/jogl.sdk.jar" /> - <property name="jogl.all.jar" value="${build}/jogl.all.jar"/> - <property name="jogl.all-noawt.jar" value="${build}/jogl.all-noawt.jar"/> - - <!-- The resulting CDC jogl.jar. --> - <property name="jogl.core.cdc.jar" value="${build}/jogl.core.cdc.jar" /> - <property name="jogl.gles1.cdc.jar" value="${build}/jogl.gles1.cdc.jar" /> - <property name="jogl.gles1.dbg.cdc.jar" value="${build}/jogl.gles1.dbg.cdc.jar" /> - <property name="jogl.gles2.cdc.jar" value="${build}/jogl.gles2.cdc.jar" /> - <property name="jogl.gles2.dbg.cdc.jar" value="${build}/jogl.gles2.dbg.cdc.jar" /> - <property name="jogl.egl.cdc.jar" value="${build}/jogl.egl.cdc.jar" /> - <property name="jogl.glutess.cdc.jar" value="${build}/jogl.glu.tess.cdc.jar" /> - <property name="jogl.glumipmap.cdc.jar" value="${build}/jogl.glu.mipmap.cdc.jar" /> - <property name="jogl.gl2es12.x11.cdc.jar" value="${build}/jogl.gl2es12.x11.cdc.jar" /> - <property name="jogl.gl2es12.win.cdc.jar" value="${build}/jogl.gl2es12.win.cdc.jar" /> - <property name="jogl.gl2es12.osx.cdc.jar" value="${build}/jogl.gl2es12.osx.cdc.jar" /> - <property name="jogl.util.cdc.jar" value="${build}/jogl.util.cdc.jar" /> - <property name="jogl.util.fixedfuncemu.cdc.jar" value="${build}/jogl.util.fixedfuncemu.cdc.jar" /> - <property name="jogl.all.cdc.jar" value="${build}/jogl.all.cdc.jar"/> - <!-- The javadoc dirs. --> <property name="javadoc" value="${project.root}/javadoc_jogl_public" /> <property name="javadoc.spec" value="${project.root}/javadoc_jogl_spec" /> @@ -437,51 +270,45 @@ <property name="javadoc.overview" value="doc/jogl/spec-overview.html" /> <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> - <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.sun.opengl.util.*" /> + <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.jogamp.opengl.util.*" /> - <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.gluegen,com.sun.gluegen.runtime" /> + <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" /> <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"> - <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 --> + <property name="gles1.headers" value="${stub.includes}/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"> - <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 --> + <property name="gles2.headers" value="${stub.includes}/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" 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.cfg" value="${config.jogl}/egl.cfg" /> + <property name="window.es.ext.cfg" value="${config.jogl}/eglext.cfg" /> <property name="window.es.system" value="egl"/> </target> <target name="declare.gl.gl2"> - <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> - - <!-- Declarations that have to come after both the common setup and the GLES tests --> - <target name="declare.common.2"> + <property name="gl2.headers" value="${stub.includes}/opengl/GL/*.h" /> <!-- NOTE: this MUST be relative for FileSet --> <!-- CHECK: this may need to be pruned for each platform --> </target> <target name="setup.javacdc"> - <copy file="../src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/impl/SystemUtil.java" /> - <copy file="../src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/BufferUtil.java" /> - <copy file="../src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/impl/InternalBufferUtil.java" /> - <copy file="../src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/texture/TextureIO.java" /> - <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/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="${src.generated.java-cdc}/com/sun/opengl/util/texture/spi/TGAImage.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/SystemUtil.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/InternalBufferUtil.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/TextureIO.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/DDSImage.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/TGAImage.java" /> </target> <target name="setup.javase"> - <copy file="../src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase" tofile="${src.generated.java}/com/sun/opengl/impl/SystemUtil.java" /> - <copy file="../src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/BufferUtil.java" /> - <copy file="../src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase" tofile="${src.generated.java}/com/sun/opengl/impl/InternalBufferUtil.java" /> - <copy file="../src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/texture/TextureIO.java" /> - <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/texture/spi/DDSImage.java" /> - <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/texture/spi/TGAImage.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/SystemUtil.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/InternalBufferUtil.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/TextureIO.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/DDSImage.java" /> + <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/TGAImage.java" /> </target> <!-- ================================================================== --> @@ -489,10 +316,7 @@ - Initialize all parameters required for the build and create any - required directories. --> - <target name="init" depends="declare.common, declare.gl.gles, declare.gl.gl2, declare.common.2"> - <!-- Call the external config validator script to make sure the config is ok and consistent --> - <ant antfile="${validate.user.properties}" inheritall="true"/> - + <target name="init" depends="declare.common, declare.gl.gles, declare.gl.gl2"> <!-- Create the required output directories. --> <mkdir dir="${src.generated.java}" /> <mkdir dir="${src.generated.java-cdc}" /> @@ -503,33 +327,15 @@ <mkdir dir="${src.generated.c.openmax}" /> <mkdir dir="${classes}" /> <mkdir dir="${classes-cdc}" /> - <mkdir dir="${obj}" /> <mkdir dir="${obj.jogl}" /> - <mkdir dir="${obj.cg}" /> + <mkdir dir="${obj.joglsub}" /> + <mkdir dir="${obj.cgsub}" /> <!-- Set up Java SE and Java CDC files --> <antcall target="setup.javase" inheritRefs="true" /> <antcall target="setup.javacdc" inheritRefs="true" /> </target> - <!-- ================================================================== --> - <!-- GlueGen and BuildStaticGLInfo creation, task setup and Java file generation --> - <!-- - - Build GlueGen - --> - <target name="build.gluegen" depends="init"> - <!-- Run the GlueGen build to ensure that the GlueGen ANT task - - has been built. --> - <!-- FIXME: remove passing down of antlr.jar when gluegen.properties is on all - nightly build machines --> - <ant antfile="${gluegen.build.xml}" dir="${gluegen.make.dir}" target="all" inheritAll="false"> - <propertyset> - <propertyref name="antlr.jar" /> - <!--propertyref name="gluegen.nsig" /--> - </propertyset> - </ant> - </target> - <!-- - Check to see whether we need to rebuild the generated sources. --> @@ -578,7 +384,7 @@ <and> <isset property="java.generate.skip.es1"/> <isset property="java.generate.skip.es2"/> - <!--isset property="java.generate.skip.gl2"/--> + <isset property="java.generate.skip.gl2"/> <isset property="java.generate.skip.glu"/> </and> </condition> @@ -594,7 +400,7 @@ <target name="java.generate.copy2temp"> <copy todir="${tempdir}"> - <fileset dir="${build}" + <fileset dir="${build.jogl}" includes="gensrc/classes/**" /> </copy> </target> @@ -603,9 +409,9 @@ <echo message="Generating GL interface" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gles2.c" - outputRootDir="${build}" - config="${config}/gl-if-gl.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-if-gl.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -615,9 +421,9 @@ <echo message="Generating GL2_ES1 interface" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gles1.c" - outputRootDir="${build}" - config="${config}/gl-if-gl2_es1.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-if-gl2_es1.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -627,9 +433,9 @@ <echo message="Generating GL2_ES2 interface" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gles2.c" - outputRootDir="${build}" - config="${config}/gl-if-gl2_es2.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-if-gl2_es2.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -639,16 +445,16 @@ <echo message="Generating GL2_GL3 interface" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gl3.c" - outputRootDir="${build}" - config="${config}/gl-gl3-set.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-gl3-set.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> <gluegen src="${stub.includes.opengl}/gl2.c" - outputRootDir="${build}" - config="${config}/gl-if-gl2_gl3.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-if-gl2_gl3.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -658,9 +464,9 @@ <echo message="Generating GL2 interface and implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gl2.c" - outputRootDir="${build}" - config="${config}/gl-gl2.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-gl2.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -670,9 +476,9 @@ <echo message="Generating GL3 interface and implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gl3.c" - outputRootDir="${build}" - config="${config}/gl-gl3.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-gl3.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -682,9 +488,33 @@ <echo message="Generating GL3bc implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gl3bc.c" - outputRootDir="${build}" - config="${config}/gl-gl3bc.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-gl3bc.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" + emitter="com.sun.gluegen.opengl.GLEmitter"> + <classpath refid="gluegen.classpath" /> + </gluegen> + </target> + + <target name="java.generate.gl4"> + <echo message="Generating GL4 interface and implementation" /> + <antcall target="java.generate.copy2temp" inheritRefs="true" /> + <gluegen src="${stub.includes.opengl}/gl4.c" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-gl4.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" + emitter="com.sun.gluegen.opengl.GLEmitter"> + <classpath refid="gluegen.classpath" /> + </gluegen> + </target> + + <target name="java.generate.gl4bc"> + <echo message="Generating GL4bc implementation" /> + <antcall target="java.generate.copy2temp" inheritRefs="true" /> + <gluegen src="${stub.includes.opengl}/gl4bc.c" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-gl4bc.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -694,21 +524,21 @@ <echo message="Generating GL2ES12 implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gl2es12.c" - outputRootDir="${build}" - config="${config}/gl-gl2es12.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-gl2es12.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> - </target> + </target> <target name="java.generate.gles1"> <echo message="Generating GLES1 interface and implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gles1.c" - outputRootDir="${build}" - config="${config}/gl-es1.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-es1.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -718,21 +548,21 @@ <echo message="Generating GLES2 interface and implementation" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/gles2.c" - outputRootDir="${build}" - config="${config}/gl-es2.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/gl-es2.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> </target> - <target name="java.generate.gl.all" depends="java.generate.gl_if, java.generate.gl2_es1_if, java.generate.gl2_es2_if, java.generate.gl2_gl3_if, java.generate.gl2, java.generate.gl3, java.generate.gl3bc, java.generate.gl2es12, java.generate.gles1, java.generate.gles2"/> + <target name="java.generate.gl.all" depends="java.generate.gl_if, java.generate.gl2_es1_if, java.generate.gl2_es2_if, java.generate.gl2_gl3_if, java.generate.gl2, java.generate.gl3, java.generate.gl3bc, java.generate.gl4, java.generate.gl4bc, java.generate.gl2es12, java.generate.gles1, java.generate.gles2"/> <!-- target name="java.generate.gl.nsig" if="gluegen.nsig"> <echo message="Generating GL interface and implementation" /> <gluegen src="${gl.c}" config="${gl.cfg.nsig}" - includeRefid="stub.includes.fileset.all.gl2" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.nativesig.NativeSignatureEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -742,9 +572,9 @@ <echo message="Generating GLU class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/glu.c" - outputRootDir="${build}" - config="${config}/glu-base.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/glu-base.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -754,9 +584,9 @@ <echo message="Generating GLU class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/glu.c" - outputRootDir="${build}" - config="${config}/glu-gl2es1.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/glu-gl2es1.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -766,9 +596,9 @@ <echo message="Generating GLU class" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes.opengl}/glu.c" - outputRootDir="${build}" - config="${config}/glu-gl2.cfg" - includeRefid="stub.includes.fileset.all.gl2" + outputRootDir="${build.jogl}" + config="${config.jogl}/glu-gl2.cfg" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -778,9 +608,9 @@ <echo message="Generating platform-specific OpenGL extension class: ${window.os.system}" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${glext.platform.header}" - outputRootDir="${build}" + outputRootDir="${build.jogl}" config="${glext.platform.cfg}" - includeRefid="stub.includes.fileset.all.gl2" + includeRefid="stub.includes.fileset.all.gldesktop" emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -789,9 +619,9 @@ <target name="java.generate.window.system.es" if="window.es.cfg"> <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="${build}" + <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/common/**" /> + <gluegen src="${stub.includes}/${window.es.system}/window-system.c" + outputRootDir="${build.jogl}" config="${window.es.cfg}" includeRefid="stub.includes.fileset.platform" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -802,9 +632,9 @@ <target name="java.generate.window.system.es.ext" if="window.es.ext.cfg"> <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="${build}" + <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/common/**" /> + <gluegen src="${stub.includes}/${window.es.system}/window-system-ext.c" + outputRootDir="${build.jogl}" config="${window.es.ext.cfg}" includeRefid="stub.includes.fileset.platform" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -815,8 +645,8 @@ <target name="java.generate.window.system.os" if="window.os.cfg"> <echo message="Generating window system glue impl: ${window.os.system}" /> <antcall target="java.generate.copy2temp" inheritRefs="true" /> - <gluegen src="${stub.includes.dir}/${window.os.system}/window-system.c" - outputRootDir="${build}" + <gluegen src="${stub.includes}/${window.os.system}/window-system.c" + outputRootDir="${build.jogl}" config="${window.os.cfg}" includeRefid="stub.includes.fileset.platform" emitter="com.sun.gluegen.opengl.GLEmitter"> @@ -825,7 +655,7 @@ </target> <target name="java.generate.gl.platforms" > - <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/**" /> + <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/${window.es.system}/** ${stub.includes}/common/** ${stub.includes}/opengl/**" /> <antcall target="java.generate.window.system.os" inheritRefs="true" /> <antcall target="java.generate.platform.glext" inheritRefs="true" /> @@ -836,7 +666,7 @@ - from the C GL headers. This involves setting the taskdef and creating - the classpath reference id then running the task on each header. --> - <target name="java.generate" depends="build.gluegen, java.generate.check" unless="java.generate.skip"> + <target name="java.generate" depends="common.gluegen.build, java.generate.check" unless="java.generate.skip"> <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT --> <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask" @@ -856,23 +686,23 @@ <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="glext.platform.cfg" value="${config}/glxext.cfg" /> - <param name="glext.platform.header" value="${stub.includes.dir}/x11/glxext.c" /> + <param name="window.os.cfg" value="${config.jogl}/glx-x11.cfg" /> + <param name="glext.platform.cfg" value="${config.jogl}/glxext.cfg" /> + <param name="glext.platform.header" value="${stub.includes}/x11/glxext.c" /> </antcall> <antcall target="java.generate.gl.platforms" inheritRefs="true"> <param name="window.os.system" value="win32"/> - <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="window.os.cfg" value="${config.jogl}/wgl-win32.cfg" /> + <param name="glext.platform.cfg" value="${config.jogl}/wglext.cfg" /> + <param name="glext.platform.header" value="${stub.includes}/win32/wglext.c" /> </antcall> <antcall target="java.generate.gl.platforms" inheritRefs="true"> <param name="window.os.system" value="macosx"/> - <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="window.os.cfg" value="${config.jogl}/cgl-macosx.cfg" /> + <param name="glext.platform.cfg" value="${config.jogl}/cglext.cfg" /> + <param name="glext.platform.header" value="${stub.includes}/macosx/cglext.c" /> </antcall> <!-- Generate GLU class --> @@ -901,7 +731,7 @@ <!-- Now check for the presence of one well-known file --> <uptodate property="java.generate.cg.skip"> <srcfiles refid="stub.includes.cg.dependencies.fileset" /> - <mapper type="merge" to="${src.generated.java}/com/sun/opengl/cg/CgGL.java" /> + <mapper type="merge" to="${src.generated.java}/com/jogamp/opengl/cg/CgGL.java" /> </uptodate> </target> @@ -919,8 +749,8 @@ <!-- Generate CgGL interface class --> <gluegen src="${stub.includes.opengl}/cg.c" - outputRootDir="${build}" - config="${config}/cg-common.cfg" + outputRootDir="${build.jogl}" + config="${config.jogl}/cg-common.cfg" includeRefid="stub.includes.cg.fileset.all" emitter="com.sun.gluegen.JavaEmitter"> <classpath refid="gluegen.classpath" /> @@ -976,7 +806,7 @@ <uptodate property="java.generate.composable.pipeline.skip.gl2es12" srcfile="${classes}/javax/media/opengl/GL2ES12.class" targetfile="${src.generated.java}/javax/media/opengl/DebugGL2ES12.java" /> - </target> + </target> <target name="java.generate.composable.pipeline.check.gl2"> <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed @@ -986,7 +816,7 @@ <targetfileset dir="${src.generated.java}/javax/media/opengl" includes="DebugGL2.java,TraceGL2.java" /> </dependset> - + <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.generate.composable.pipeline.skip.gl2" srcfile="${classes}/javax/media/opengl/GL2.class" @@ -1008,6 +838,21 @@ targetfile="${src.generated.java}/javax/media/opengl/DebugGL3.java" /> </target> + <target name="java.generate.composable.pipeline.check.gl4"> + <!-- 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" files="GL4.class" /> + <targetfileset dir="${src.generated.java}/javax/media/opengl" + includes="DebugGL4.java,TraceGL4.java,DebugGL4bc.java,TraceGL4bc.java" /> + </dependset> + + <!-- Now choose one of the two to test to see if we have to regenerate --> + <uptodate property="java.generate.composable.pipeline.skip.gl4" + srcfile="${classes}/javax/media/opengl/GL4.class" + targetfile="${src.generated.java}/javax/media/opengl/DebugGL4.java" /> + </target> + <target name="java.generate.composable.pipeline.es1" depends="java.generate.composable.pipeline.check.es1" unless="java.generate.composable.pipeline.skip.es1"> <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true"> <arg value="javax.media.opengl.GLES1" /> @@ -1081,41 +926,63 @@ </copy> </target> - <target name="java.generate.composable.pipeline" depends="java.generate.composable.pipeline.es1, java.generate.composable.pipeline.es2, java.generate.composable.pipeline.gl2, java.generate.composable.pipeline.gl3"> + <target name="java.generate.composable.pipeline.gl4" depends="java.generate.composable.pipeline.check.gl4" unless="java.generate.composable.pipeline.skip.gl4"> + <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true"> + <arg value="javax.media.opengl.GL4" /> + <arg value="${src.generated.java}/javax/media/opengl" /> + <classpath refid="pipeline.classpath" /> + </java> + <copy todir="${src.generated.java-cdc}"> + <fileset dir="${src.generated.java}" + includes="javax/media/opengl/DebugGL4.java javax/media/opengl/TraceGL4.java" /> + </copy> + + <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true"> + <arg value="javax.media.opengl.GL4bc" /> + <arg value="${src.generated.java}/javax/media/opengl" /> + <classpath refid="pipeline.classpath" /> + </java> + <copy todir="${src.generated.java-cdc}"> + <fileset dir="${src.generated.java}" + includes="javax/media/opengl/DebugGL4bc.java javax/media/opengl/TraceGL4bc.java" /> + </copy> + </target> + + <target name="java.generate.composable.pipeline" depends="java.generate.composable.pipeline.es1, java.generate.composable.pipeline.es2, java.generate.composable.pipeline.gl2, java.generate.composable.pipeline.gl3, java.generate.composable.pipeline.gl4"> </target> <target name="java.generate.composable.pipeline.custom.check.glfixfunc"> <!-- 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}/com/sun/opengl/util/glsl/fixedfunc" files="FixedFuncHook.class" /> + <srcfilelist dir="${classes}/com/jogamp/opengl/util/glsl/fixedfunc" 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/util/glsl/fixedfunc/impl" + <targetfileset dir="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl" includes="FixedFuncImpl.java" /> </dependset> <!-- 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/GL2ES1.class" - targetfile="${src.generated.java}/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" /> + targetfile="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl/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.GL2ES1" /> - <arg value="${src.generated.java}/com/sun/opengl/util/glsl/fixedfunc/impl" /> - <arg value="com.sun.opengl.util.glsl.fixedfunc.impl.FixedFuncImpl" /> - <arg value="com.sun.opengl.util.glsl.fixedfunc.impl.FixedFuncHook" /> + <arg value="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl" /> + <arg value="com.jogamp.opengl.util.glsl.fixedfunc.impl.FixedFuncImpl" /> + <arg value="com.jogamp.opengl.util.glsl.fixedfunc.impl.FixedFuncHook" /> <arg value="javax.media.opengl.GL2ES2" /> <arg value="prolog_xor_downstream" /> <classpath refid="pipeline.classpath" /> </java> <copy todir="${src.generated.java-cdc}"> <fileset dir="${src.generated.java}" - includes="com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" /> + includes="com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" /> </copy> </target> - <target name="java.generate.composable.pipeline.custom" depends="init, build.gluegen, java.generate.composable.pipeline.custom.glfixfunc"> + <target name="java.generate.composable.pipeline.custom" depends="init, common.gluegen.build, java.generate.composable.pipeline.custom.glfixfunc"> </target> <!-- ================================================================== --> @@ -1128,9 +995,10 @@ <!-- Perform the first pass Java compile. --> <javac destdir="${classes}" - includes="javax/media/opengl/fixedfunc/** 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/GL2GL3.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java javax/media/opengl/GL3.java javax/media/opengl/GL3bc.java" + includes="javax/media/opengl/fixedfunc/** 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/GL2GL3.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java javax/media/opengl/GL3.java javax/media/opengl/GL3bc.java javax/media/opengl/GL4.java javax/media/opengl/GL4bc.java" fork="yes" memoryMaximumSize="${javac.memorymax}" + includeAntRuntime="false" source="1.4" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath"/> <src path="${src.java}" /> @@ -1140,7 +1008,7 @@ <copy todir="${src.generated.java-cdc}"> <fileset dir="${src.generated.java}" includes="**" - excludes="com/sun/opengl/cg/** com/sun/opengl/impl/gl2/** com/sun/opengl/impl/gl3/** com/sun/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/> + excludes="com/jogamp/opengl/cg/** com/jogamp/opengl/impl/gl2/** com/jogamp/opengl/impl/gl3/** com/jogamp/opengl/impl/gl4/** com/jogamp/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/> </copy> <copy todir="${classes-cdc}"> <fileset dir="${classes}" @@ -1151,10 +1019,11 @@ <target name="java.compile.secondpass.javase"> <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. --> <javac destdir="${classes}" - excludes="com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}" - source="${jogl.sourcelevel}" + excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}" + source="${target.sourcelevel}" fork="yes" memoryMaximumSize="${javac.memorymax}" + includeAntRuntime="false" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath"/> <src path="${src.java}" /> @@ -1162,14 +1031,15 @@ </javac> </target> + <!-- bootclasspath="${javac.bootclasspath-cdc.jar}" --> <target name="java.compile.secondpass.javacdc" unless="setup.noCDC"> <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. --> <javac destdir="${classes-cdc}" - excludes="com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.excludes.cdcfp}" - source="${jogl.sourcelevel}" - bootclasspath="${javac.bootclasspath-cdc.jar}" + excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.excludes.cdcfp}" + source="${target.sourcelevel}" fork="yes" memoryMaximumSize="${javac.memorymax}" + includeAntRuntime="false" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath-cdc"/> <src path="${src.java}" /> @@ -1183,9 +1053,10 @@ <!-- Perform the third pass Java compile; everything including fixed function emulation. --> <javac destdir="${classes}" excludes="${java.excludes.all}" - source="${jogl.sourcelevel}" + source="${target.sourcelevel}" fork="yes" memoryMaximumSize="${javac.memorymax}" + includeAntRuntime="false" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath"/> <src path="${src.java}" /> @@ -1197,10 +1068,11 @@ <!-- Perform the third pass Java compile; everything including fixed function emulation. --> <javac destdir="${classes-cdc}" excludes="${java.excludes.all},${java.excludes.cdcfp}" - source="${jogl.sourcelevel}" + source="${target.sourcelevel}" bootclasspath="${javac.bootclasspath-cdc.jar}" fork="yes" memoryMaximumSize="${javac.memorymax}" + includeAntRuntime="false" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath-cdc"/> <src path="${src.java}" /> @@ -1426,7 +1298,7 @@ <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition> - <patternset id="c.src.files.jogl.gl2"> + <patternset id="c.src.files.jogl.desktop"> <include name="${rootrel.src.c}/macosx/MacOSXCustomCGLCode.c" if="isOSX"/> <include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/> <include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/> @@ -1434,10 +1306,9 @@ <!-- 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.src.c.openmax}/com_jogamp_openmax_OMXInstance.c" if="useOpenMAX"/> - <include name="${rootrel.generated.c.jogl}/gl2/GL2Impl_JNI.c"/> - <include name="${rootrel.generated.c.jogl}/gl3/GL3Impl_JNI.c"/> + <include name="${rootrel.generated.c.jogl}/gl4/GL4bcImpl_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"/> @@ -1450,10 +1321,8 @@ <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}/GLXGetProcAddressARB.c" if="isX11"/> - <!-- 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.src.c.openmax}/com_jogamp_openmax_OMXInstance.c" if="useOpenMAX"/> <include name="${rootrel.generated.c.jogl}/gl2es12/GL2ES12Impl_JNI.c"/> <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY --> @@ -1466,7 +1335,7 @@ <patternset id="c.src.files.jogl.es2"> <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/> <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.src.c.openmax}/com_jogamp_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"/> @@ -1476,7 +1345,7 @@ <patternset id="c.src.files.jogl.es1"> <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/> <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.src.c.openmax}/com_jogamp_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"/> @@ -1492,8 +1361,8 @@ <echo message="Compiling @{output.lib.name}" /> <cc outtype="shared" - objdir="${obj.jogl}" - outfile="${obj}/@{output.lib.name}" + objdir="${obj.joglsub}" + outfile="${obj.jogl}/@{output.lib.name}" optimize="${c.compiler.optimise}" debug="${c.compiler.debug}" multithreaded="true" @@ -1530,41 +1399,41 @@ </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"/> + <syslibset dir="${java.lib.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/> + <syslibset dir="${java.lib.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/> </linker> </cc> <!-- FIXME: this is a hack; the cpptask should have an option to change the suffix or at least understand the override from dylib to jnilib --> <antcall target="rename.dylib" inheritRefs="true"> - <param name="src" value="${build}/obj/lib@{output.lib.name}.dylib" /> - <param name="dest" value="${build}/obj/lib@{output.lib.name}.jnilib" /> - <param name="dest-cdc" value="${build}/obj/lib@{output.lib.name}.so" /> + <param name="src" value="${build.jogl}/obj/lib@{output.lib.name}.dylib" /> + <param name="dest" value="${build.jogl}/obj/lib@{output.lib.name}.jnilib" /> + <param name="dest-cdc" value="${build.jogl}/obj/lib@{output.lib.name}.so" /> </antcall> <!-- FIXME: this is a hack; the cpptask should have an option to change the suffix or at least understand the override from dylib to jnilib --> <antcall target="rename.mingw.dll" inheritRefs="true"> - <param name="src" value="${build}/obj/lib@{output.lib.name}.so" /> - <param name="dest" value="${build}/obj/@{output.lib.name}.dll" /> + <param name="src" value="${build.jogl}/obj/lib@{output.lib.name}.so" /> + <param name="dest" value="${build.jogl}/obj/@{output.lib.name}.dll" /> </antcall> </sequential> </macrodef> <target name="c.build.jogl.prepare.openMAX" if="useOpenMAX"> - <javah destdir="${src.generated.c.openmax}" classpath="${classes-cdc}" class="com.sun.openmax.OMXInstance" /> + <javah destdir="${src.generated.c.openmax}" classpath="${classes-cdc}" class="com.jogamp.openmax.OMXInstance" /> </target> <target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX"> <!-- Generate the waveout Mixer header --> <!-- FIXME: this is temporary until we move this to another workspace --> - <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.sun.javafx.audio.windows.waveout.Mixer" /--> + <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /--> </target> - <target name="c.build.jogl.gl2" unless="setup.nodesktop"> - <c.build c.compiler.src.files="c.src.files.jogl.gl2" - output.lib.name="jogl_gl2" + <target name="c.build.jogl.desktop" unless="setup.nodesktop"> + <c.build c.compiler.src.files="c.src.files.jogl.desktop" + output.lib.name="jogl_desktop" compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="${linker.cfg.id.gl2}"/> </target> @@ -1598,28 +1467,32 @@ </target> <target name="c.manifest.cg" if="jogl.cg"> - <msvc.manifest objdir="${obj}" dllname="jogl_cg" /> + <msvc.manifest objdir="${obj.jogl}" dllname="jogl_cg" /> </target> <target name="c.manifest" if="isVC8Family"> <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll --> - <msvc.manifest objdir="${obj}" dllname="jogl_es1" /> - <msvc.manifest objdir="${obj}" dllname="jogl_es2" /> - <msvc.manifest objdir="${obj}" dllname="jogl_gl2" /> - <msvc.manifest objdir="${obj}" dllname="jogl_gl2es12" /> + <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es1" /> + <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es2" /> + <msvc.manifest objdir="${obj.jogl}" dllname="jogl_gl2es12" /> + <msvc.manifest objdir="${obj.jogl}" dllname="jogl_desktop" /> <antcall target="c.manifest.cg" inheritRefs="true" /> </target> - <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"> + <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.desktop,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg"> + <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true"> + <param name="libdir" value="${obj.jogl}"/> + </antcall> + <antcall target="c.manifest" inheritRefs="true" /> <!-- Create the Java Web Start jar file for the built native code --> - <jar destfile="${build}/jogl-natives-${os.and.arch}.jar" filesonly="true"> - <fileset dir="${obj}"> + <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true"> + <fileset dir="${obj.jogl}"> <include name="*.${native.library.suffix}" /> </fileset> </jar> - <jar destfile="${build}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true"> - <fileset dir="${obj}"> + <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true"> + <fileset dir="${obj.jogl}"> <include name="*_es1.${native.library.suffix-cdc}" /> <include name="*_es2.${native.library.suffix-cdc}" /> <include name="*_gl2es12.${native.library.suffix-cdc}" /> @@ -1646,7 +1519,7 @@ <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/> </tstamp> <copy file="${manifestfile}" - tofile="${build}/tempversion" + tofile="${build.jogl}/tempversion" overwrite="true"> <filterset> <!-- This token only exists in the non-RI version of the manifest --> @@ -1670,7 +1543,7 @@ <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/> </tstamp> <copy file="${manifestfile}" - tofile="${build}/tempversion-cdc" + tofile="${build.jogl}/tempversion-cdc" overwrite="true"> <filterset> <!-- This token only exists in the non-RI version of the manifest --> @@ -1681,140 +1554,137 @@ </copy> </target> - <target name="build-cg-jar" depends="setup-manifestfile" if="jogl.cg"> - <jar manifest="${build}/tempversion" destfile="${jogl.cg.jar}" filesonly="true"> + <target name="build-cg-jar-javase" depends="setup-manifestfile" if="jogl.cg"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.cg.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.nv-cg}"/> </jar> </target> - <target name="build-jars-es-desktop" depends="setup-manifestfile" unless="setup.nodesktop"> - <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.x11.jar}" filesonly="true"> - <fileset dir="${classes}" - includes="${java.part.glx}, ${java.part.gl2es12}, ${java.part.openmax}" - excludes="${java.part.glugl2}"/> + <target name="build-jars-os-desktop-javase" depends="setup-manifestfile" unless="setup.nodesktop"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.x11.jar}" filesonly="true"> + <fileset dir="${classes}" includes="${java.part.glx}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.win.jar}" filesonly="true"> - <fileset dir="${classes}" - includes="${java.part.wgl}, ${java.part.gl2es12}, ${java.part.openmax}" - excludes="${java.part.glugl2}"/> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.win.jar}" filesonly="true"> + <fileset dir="${classes}" includes="${java.part.wgl}" /> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.osx.jar}" filesonly="true"> - <fileset dir="${classes}" - includes="${java.part.cgl}, ${java.part.gl2es12}, ${java.part.openmax}" - excludes="${java.part.glugl2}"/> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.osx.jar}" filesonly="true"> + <fileset dir="${classes}" includes="${java.part.cgl}"/> </jar> </target> - <target name="build-jars-es" depends="setup-manifestfile,build-jars-es-desktop"> - <jar manifest="${build}/tempversion" destfile="${jogl.egl.jar}" filesonly="true"> + <target name="build-jars-es-javase" depends="setup-manifestfile"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.egl.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.egl}" excludes="${java.part.awt}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.gles1.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gles1.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.es1}" excludes="${java.part.es1.dbg}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.gles1.dbg.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gles1.dbg.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.es1.dbg}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.gles2.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gles2.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.es2}, ${java.part.openmax}" excludes="${java.part.es2.dbg}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.gles2.dbg.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gles2.dbg.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.es2.dbg}"/> </jar> </target> - <target name="build-jars-es-desktop-cdc" depends="setup-manifestfile-cdc" unless="setup.nodesktop"> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.x11.cdc.jar}" filesonly="true"> - <fileset dir="${classes-cdc}" - includes="${java.part.glx}, ${java.part.gl2es12}, ${java.part.openmax}" - excludes="${java.part.glugl2}"/> + <target name="build-jars-os-desktop-cdc" depends="setup-manifestfile" unless="setup.nodesktop"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.x11.cdc.jar}" filesonly="true"> + <fileset dir="${classes-cdc}" includes="${java.part.glx}"/> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.win.cdc.jar}" filesonly="true"> - <fileset dir="${classes-cdc}" - includes="${java.part.wgl}, ${java.part.gl2es12}, ${java.part.openmax}" - excludes="${java.part.glugl2}"/> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.win.cdc.jar}" filesonly="true"> + <fileset dir="${classes-cdc}" includes="${java.part.wgl}" /> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.osx.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.osx.cdc.jar}" filesonly="true"> + <fileset dir="${classes-cdc}" includes="${java.part.cgl}"/> + </jar> + </target> + + <target name="build-jars-es-desktop-cdc" depends="setup-manifestfile-cdc,build-jars-os-desktop-cdc" unless="setup.nodesktop"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gl2es12.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" - includes="${java.part.cgl}, ${java.part.gl2es12}, ${java.part.openmax}" - excludes="${java.part.glugl2}"/> + includes="${java.part.gl2es12}, ${java.part.openmax}" + excludes="${java.part.glugldesktop}"/> </jar> </target> - <target name="build-jars-es-cdc" depends="setup-manifestfile-cdc,build-jars-es-desktop-cdc" unless="setup.noCDC"> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.egl.cdc.jar}" filesonly="true"> + <target name="build-jars-es-cdc" depends="setup-manifestfile-cdc, build-jars-es-desktop-cdc" unless="setup.noCDC"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.egl.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.egl}" excludes="${java.part.awt}"/> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gles1.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles1.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.es1}" excludes="${java.part.es1.dbg}"/> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gles1.dbg.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles1.dbg.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.es1.dbg}"/> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gles2.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles2.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.es2}, ${java.part.openmax}" excludes="${java.part.es2.dbg}"/> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gles2.dbg.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles2.dbg.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.es2.dbg}"/> </jar> </target> - <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT"> - <jar manifest="${build}/tempversion" destfile="${jogl.awt.jar}" filesonly="true"> + <target name="build-jars-awt-javase" depends="setup-manifestfile" unless="setup.noAWT"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.awt}" /> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.util.awt.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.awt}"/> </jar> </target> - <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall"> - <jar manifest="${build}/tempversion" destfile="${jogl.all.jar}" filesonly="true"> + <target name="build-jars-all-awt-javase" depends="setup-manifestfile" unless="setup.noAWT"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.all.jar}" filesonly="true"> <fileset dir="${classes}"> <include name="javax/media/opengl/**" /> - <include name="com/sun/gluegen/runtime/**" /> - <include name="com/sun/opengl/**" /> + <include name="com/jogamp/gluegen/runtime/**" /> + <include name="com/jogamp/opengl/**" /> <include name="${java.part.openmax}" /> <!-- FIXME: this is temporary until we move these classes to another workspace --> - <include name="com/sun/javafx/**" /> + <include name="com/jogamp/**" /> + <exclude name="${java.part.gl2es12}"/> </fileset> <fileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode}"/> </jar> </target> - <target name="build-jars-all-noawt" depends="setup-manifestfile"> - <jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true"> + <target name="build-jars-all-noawt-javase" depends="setup-manifestfile"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true"> <fileset dir="${classes}" - includes="javax/media/opengl/** com/sun/gluegen/runtime/** com/sun/opengl/** ${java.part.openmax} com/sun/javafx/**" - excludes="${java.part.awt} ${java.part.util.awt}"> + includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/**" + excludes="${java.part.awt} ${java.part.util.awt} ${java.part.gl2es12}"> </fileset> <fileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode}"/> </jar> </target> <target name="build-jars-all-cdc" depends="setup-manifestfile"> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.all.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.all.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" - includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.gl2es12} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}" + includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.gl2es12} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}" excludes="${java.excludes.cdcfp}"/> <fileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode}"/> @@ -1823,25 +1693,25 @@ <target name="build-jars-cdc" depends="setup-manifestfile-cdc, build-jars-es-cdc, build-jars-all-cdc" unless="setup.noCDC"> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.core.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.core.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.core}" excludes="${java.part.core.exclude}"/> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.glutess.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.glutess.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.glutess}"/> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.glumipmap.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.glumipmap.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.glumipmap}"/> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.util.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.util} ${java.part.util.glsl}" - excludes="${java.part.util.awt} ${java.part.util.gl2} ${java.part.util.fixedfuncemu}"/> + excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/> </jar> - <jar manifest="${build}/tempversion-cdc" destfile="${jogl.util.fixedfuncemu.cdc.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.fixedfuncemu.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.util.fixedfuncemu}"/> <fileset dir="${src.java}" @@ -1849,61 +1719,58 @@ </jar> </target> - <target name="build-jars-desktop-javase" depends="setup-manifestfile" unless="setup.nodesktop"> - <jar manifest="${build}/tempversion" destfile="${jogl.gl2.x11.jar}" filesonly="true"> + <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop"> + <!--os specific gldesktop--> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gldesktop.jar}" filesonly="true"> <fileset dir="${classes}" - includes="${java.part.glx}, ${java.part.gl2}, ${java.part.gl3}, ${java.part.openmax}" - excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/> + includes="${java.part.gldesktop}, ${java.part.openmax}" + excludes="${java.part.gldesktop.dbg}, ${java.part.glugldesktop}, ${java.part.gl2es12}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.gl2.win.jar}" filesonly="true"> - <fileset dir="${classes}" - includes="${java.part.wgl}, ${java.part.gl2}, $${java.part.gl3}, {java.part.openmax}" - excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2es12.jar}" filesonly="true"> + <fileset dir="${classes}" includes="${java.part.gl2es12}, ${java.part.openmax}" + excludes="${java.part.glugldesktop}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.gl2.osx.jar}" filesonly="true"> - <fileset dir="${classes}" - includes="${java.part.cgl}, ${java.part.gl2}, $${java.part.gl3}, {java.part.openmax}" - excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/> - </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.gl2.dbg.jar}" filesonly="true"> + + <!-- misc --> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gldesktop.dbg.jar}" filesonly="true"> <fileset dir="${classes}" - includes="${java.part.gl2.dbg} ${java.part.gl3.dbg}"/> + includes="${java.part.gldesktop.dbg}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.glugl2.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glugldesktop.jar}" filesonly="true"> <fileset dir="${classes}" - includes="${java.part.glugl2}"/> + includes="${java.part.glugldesktop}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.util.gl2.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.gldesktop.jar}" filesonly="true"> <fileset dir="${classes}" - includes="${java.part.util.gl2}" - excludes="com/sun/opengl/**/awt/**"/> + includes="${java.part.util.gldesktop}" + excludes="com/jogamp/opengl/**/awt/**"/> </jar> </target> - <target name="build-jars-javase" depends="setup-manifestfile, build-jars-es, build-jars-awt, build-cg-jar, build-jars-all-awt, build-jars-all-noawt, build-jars-desktop-javase"> - <jar manifest="${build}/tempversion" destfile="${jogl.core.jar}" filesonly="true"> + <target name="build-jars-javase" depends="setup-manifestfile, build-jars-es-javase, build-jars-awt-javase, build-cg-jar-javase, build-jars-all-awt-javase, build-jars-all-noawt-javase, build-jars-desktop-javase"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}" excludes="${java.part.core.exclude}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.sdk.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.sdk.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.sdk}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.glutess.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glutess.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glutess}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.glumipmap.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glumipmap.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glumipmap}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.util.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util} ${java.part.util.glsl}" - excludes="${java.part.util.awt} ${java.part.util.gl2} ${java.part.util.fixedfuncemu}"/> + excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/> </jar> - <jar manifest="${build}/tempversion" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true"> + <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.fixedfuncemu}"/> <fileset dir="${src.java}" @@ -1918,7 +1785,7 @@ - on the platform specific build targets. To circumvent any - errors, ensure that the source is built first. --> - <target name="javadoc.nocg" depends="load.user.properties,init" unless="jogl.cg"> + <target name="javadoc.nocg" depends="init" unless="jogl.cg"> <!-- Build the general public Javadoc --> <javadoc packagenames="${javadoc.packagenames}" excludepackagenames="${java.excludes.javadoc.packagenames}" @@ -1935,9 +1802,9 @@ </target> <!-- Same as above but with Cg directories added --> - <target name="javadoc.cg" depends="load.user.properties,init" if="jogl.cg"> + <target name="javadoc.cg" depends="init" if="jogl.cg"> <!-- Build the general public Javadoc with CG --> - <javadoc packagenames="${javadoc.packagenames},com.sun.opengl.cg" + <javadoc packagenames="${javadoc.packagenames},com.jogamp.opengl.cg" excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" destdir="${javadoc}" windowtitle="${javadoc.windowtitle}" @@ -1953,7 +1820,7 @@ <target name="javadoc" depends="javadoc.nocg,javadoc.cg" /> - <target name="javadoc.spec.nocg" depends="load.user.properties,init" unless="jogl.cg"> + <target name="javadoc.spec.nocg" depends="init" unless="jogl.cg"> <!-- Build the specification Javadoc --> <javadoc packagenames="${javadoc.spec.packagenames}" excludepackagenames="${java.excludes.javadoc.packagenames}" @@ -1970,7 +1837,7 @@ </target> <!-- Same as above since Cg directories are not part of spec --> - <target name="javadoc.spec.cg" depends="load.user.properties,init" if="jogl.cg"> + <target name="javadoc.spec.cg" depends="init" if="jogl.cg"> <!-- Build the specification Javadoc with CG --> <javadoc packagenames="${javadoc.spec.packagenames}" excludepackagenames="${java.excludes.javadoc.packagenames}" @@ -2007,7 +1874,7 @@ <!-- Same as above but with Cg directories added --> <target name="javadoc.dev.cg" if="jogl.cg"> <!-- Build the internal developer Javadoc --> - <javadoc packagenames="${javadoc.dev.packagenames},com.sun.opengl.cg" + <javadoc packagenames="${javadoc.dev.packagenames},com.jogamp.opengl.cg" excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}" @@ -2021,7 +1888,7 @@ </javadoc> </target> - <target name="javadoc.dev.all" depends="load.user.properties,init,javadoc.dev.nocg,javadoc.dev.cg" /> + <target name="javadoc.dev.all" depends="init,javadoc.dev.nocg,javadoc.dev.cg" /> <target name="all.doc" description="Build JOGL docs" depends="init,javadoc,javadoc.spec,javadoc.dev.all" /> @@ -2032,7 +1899,7 @@ <target name="clean" description="Remove all build products" depends="declare.common"> <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${tempdir}" /> - <fileset dir="${build}" /> + <fileset dir="${build.jogl}" /> <fileset dir="${javadoc}" /> <fileset dir="${javadoc.spec}" /> <fileset dir="${javadoc.dev}" /> @@ -2043,22 +1910,11 @@ <!-- - Build everything. --> - <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.jogl,generate.version.txt" /> - - <target name="setup-version-RI" if="jogl.ri"> - <property name="tmp.version" value="${jogl_base_version}" /> - </target> - - <target name="setup-version-non-RI" unless="jogl.ri"> - <tstamp> - <format property="version.timestamp" pattern="yyyyMMdd"/> - </tstamp> - <property name="tmp.version" value="${jogl_base_version}-pre-${version.timestamp}" /> - </target> + <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,jar,c.build.jogl,generate.version.txt" /> - <target name="generate.version.txt" depends="setup-version-RI,setup-version-non-RI"> + <target name="generate.version.txt" depends="init"> <!-- Create a version.txt file indicating which version we just built --> - <echo message="${tmp.version}" file="${build}/version.txt" /> + <echo message="${jogl.version}" file="${build.jogl}/version.txt" /> </target> <!-- ================================================================== --> |