diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 201 |
1 files changed, 87 insertions, 114 deletions
diff --git a/make/build.xml b/make/build.xml index ef72433f5..e9ad12c93 100644 --- a/make/build.xml +++ b/make/build.xml @@ -124,8 +124,8 @@ 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 "/". --> - <property name="rootrel.src" value="src" /> - <property name="rootrel.src.c.jogl" value="${rootrel.src}${sep}native${sep}jogl" /> + <property name="rootrel.src.java" value="src${sep}classes" /> + <property name="rootrel.src.c.jogl" value="src${sep}native${sep}jogl" /> <property name="rootrel.build" value="build" /> <property name="rootrel.src.generated" value="${rootrel.build}${sep}gensrc" /> <property name="rootrel.generated.java" value="${rootrel.src.generated}${sep}classes" /> @@ -136,19 +136,19 @@ <property name="rootrel.obj.cg" value="${rootrel.obj}${sep}jogl_cg" /> <!-- The source directories. --> - <property name="src" value="${project.root}/${rootrel.src}" /> - <property name="src.c" value="${project.root}/${rootrel.src.c}" /> - <property name="build" value="${project.root}/${rootrel.build}" /> + <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}" /> <!-- The generated source directories. --> <property name="src.generated" value="${build}/gensrc" /> <property name="src.generated.java" value="${src.generated}/classes" /> - <property name="src.generated.java.cg" value="${src.generated}/classes/net/java/games/cg" /> + <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.cg" value="${src.generated}/native/jogl_cg" /> <!-- The composable pipeline source files --> <property name="src.generated.java.pipeline" - value="net/java/games/jogl/DebugGL.java,net/java/games/jogl/TraceGL.java" /> + value="javax/media/opengl/DebugGL.java,javax/media/opengl/TraceGL.java" /> <!-- The compiler output directories. --> <property name="classes" value="${build}/classes" /> @@ -215,10 +215,10 @@ <property name="java.lib.dir.macosx" value="/System/Library/Frameworks/JavaVM.framework/Libraries" /> <property name="gl.headers" value="${stub.includes.dir}/opengl/**/*.h" /> <!-- NOTE: this MUST be relative for FileSet --> <!-- CHECK: this may need to be pruned for each platform --> - <!-- Java files to exclude based on platform (relative to "src") --> - <property name="java.excludes.win32" value="net/java/games/jogl/impl/x11/**, net/java/games/jogl/impl/macosx/**" /> - <property name="java.excludes.x11" value="net/java/games/jogl/impl/windows/**, net/java/games/jogl/impl/macosx/**" /> - <property name="java.excludes.macosx" value="net/java/games/jogl/impl/x11/**, net/java/games/jogl/impl/windows/**" /> + <!-- Java files to exclude based on platform (relative to "src.java") --> + <property name="java.excludes.win32" value="com/sun/opengl/impl/x11/**, com/sun/opengl/impl/macosx/**" /> + <property name="java.excludes.x11" value="com/sun/opengl/impl/windows/**, com/sun/opengl/impl/macosx/**" /> + <property name="java.excludes.macosx" value="com/sun/opengl/impl/x11/**, com/sun/opengl/impl/windows/**" /> <!-- Create the classpath for that includes ANTLR and any already - compiled classes. This requires the user-defined "antlr.jar" @@ -236,11 +236,12 @@ <property name="javadoc" value="${project.root}/javadoc_public" /> <property name="javadoc.dev" value="${project.root}/javadoc_jogl_dev" /> <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /> - <property name="javadoc.packagenames" value="net.java.games.jogl,net.java.games.gluegen.runtime,net.java.games.jogl.util" /> - <property name="javadoc.dev.packagenames.win32" value="net.java.games.jogl.impl.windows" /> - <property name="javadoc.dev.packagenames.x11" value="net.java.games.jogl.impl.x11" /> - <property name="javadoc.dev.packagenames.macosx" value="net.java.games.jogl.impl.macosx" /> - <property name="javadoc.dev.packagenames" value="net.java.games.jogl,net.java.games.jogl.impl,net.java.games.jogl.util,net.java.games.gluegen" /> + <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 Early Draft Review Specification" /> + <property name="javadoc.packagenames" value="javax.media.opengl,javax.media.opengl.glu,com.sun.opengl.utils" /> + <property name="javadoc.dev.packagenames.win32" value="com.sun.opengl.impl.windows" /> + <property name="javadoc.dev.packagenames.x11" value="com.sun.opengl.impl.x11" /> + <property name="javadoc.dev.packagenames.macosx" value="com.sun.opengl.impl.macosx" /> + <property name="javadoc.dev.packagenames" value="javax.media.opengl,javax.media.opengl.glu,com.sun.opengl.impl,com.sun.opengl.utils,com.sun.gluegen,com.sun.gluegen.runtime" /> </target> @@ -251,18 +252,20 @@ <target name="declare.win32" depends="init"> <!-- Set platform configuration files. --> <property name="gl.cfg" value="${config}/gl-win32.cfg" /> - <property name="gl.impl.cfg" value="${config}/gl-impl-win32.cfg" /> - <property name="glu.cfg" value="${config}/glu.cfg" /> - <property name="glu.impl.cfg" value="${config}/glu-impl-win32.cfg" /> + <property name="glext.platform.cfg" value="${config}/wglext.cfg" /> + <property name="glu.cfg" value="${config}/glu-win32.cfg" /> <property name="jawt.cfg" value="${config}/jawt-win32.cfg" /> <property name="window.cfg" value="${config}/wingdi-win32.cfg" /> + <!-- Set platform headers. --> + <property name="glext.platform.header" value="${stub.includes.dir}/win32/wglext.c" /> + <!-- Set platform directories. --> <property name="stub.includes.platform" value="${stub.includes}/win32" /> <property name="java.includes.dir.platform" value="${java.includes.dir.win32}" /> <property name="java.lib.dir.platform" value="${java.lib.dir.win32}" /> <property name="java.excludes.platform" value="${java.excludes.win32}" /> - <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/win32/** ${stub.includes.dir}/common/**" /> + <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/win32/** ${stub.includes.dir}/common/** ${stub.includes.dir}/opengl/**" /> <!-- Set Javadoc properties. --> <property name="javadoc.dev.packagenames.platform" value="${javadoc.dev.packagenames.win32}" /> @@ -292,12 +295,14 @@ <target name="declare.x11" depends="init"> <!-- Set platform configuration files. --> <property name="gl.cfg" value="${config}/gl-x11.cfg" /> - <property name="gl.impl.cfg" value="${config}/gl-impl-x11.cfg" /> - <property name="glu.cfg" value="${config}/glu.cfg" /> - <property name="glu.impl.cfg" value="${config}/glu-impl-x11.cfg" /> + <property name="glext.platform.cfg" value="${config}/glxext.cfg" /> + <property name="glu.cfg" value="${config}/glu-x11.cfg" /> <property name="jawt.cfg" value="${config}/jawt-x11.cfg" /> <property name="window.cfg" value="${config}/glx-x11.cfg" /> + <!-- Set platform headers. --> + <property name="glext.platform.header" value="${stub.includes.dir}/x11/glxext.c" /> + <!-- Set platform directories. --> <property name="stub.includes.platform" value="${stub.includes.x11}" /> <property name="java.excludes.platform" value="${java.excludes.x11}" /> @@ -353,18 +358,20 @@ <target name="declare.macosx" depends="init"> <!-- Set platform configuration files. --> <property name="gl.cfg" value="${config}/gl-macosx.cfg" /> - <property name="gl.impl.cfg" value="${config}/gl-impl-macosx.cfg" /> - <property name="glu.cfg" value="${config}/glu.cfg" /> - <property name="glu.impl.cfg" value="${config}/glu-impl-macosx.cfg" /> + <property name="glext.platform.cfg" value="${config}/cglext.cfg" /> + <property name="glu.cfg" value="${config}/glu-macosx.cfg" /> <property name="jawt.cfg" value="${config}/jawt-macosx.cfg" /> <property name="window.cfg" value="${config}/cgl-macosx.cfg" /> + <!-- Set platform headers. --> + <property name="glext.platform.header" value="${stub.includes.dir}/macosx/cglext.c" /> + <!-- Set platform directories. --> <property name="stub.includes.platform" value="${stub.includes}/macosx" /> <property name="java.includes.dir.platform" value="${java.includes.dir.macosx}" /> <property name="java.lib.dir.platform" value="${java.lib.dir.macosx}" /> <property name="java.excludes.platform" value="${java.excludes.macosx}" /> - <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/macosx/** ${stub.includes.dir}/common/**" /> + <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/macosx/** ${stub.includes.dir}/common/** ${stub.includes.dir}/opengl/**" /> <!-- Set Javadoc properties. --> <property name="javadoc.dev.packagenames.platform" value="${javadoc.dev.packagenames.macosx}" /> @@ -424,7 +431,7 @@ <dependset> <srcfileset refid="stub.includes.dependencies.fileset" /> <srcfileset dir="."> - <include name="${classes}/net/java/games/gluegen/**/*.class" /> + <include name="${classes}/com/sun/gluegen/**/*.class" /> </srcfileset> <targetfileset dir="."> <include name="${src.generated.java}/**/*.java" /> @@ -435,7 +442,7 @@ <!-- Now check for the presence of one well-known file --> <uptodate property="java.generate.skip"> <srcfiles refid="stub.includes.dependencies.fileset" /> - <mapper type="merge" to="${src.generated.java}/net/java/games/jogl/GL.java" /> + <mapper type="merge" to="${src.generated.java}/javax/media/opengl/GL.java" /> </uptodate> </target> @@ -455,56 +462,29 @@ </path> <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT --> - <taskdef name="gluegen" classname="net.java.games.gluegen.ant.GlueGenTask" + <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask" classpathref="gen.classpath" /> - <taskdef name="staticglgen" classname="net.java.games.gluegen.ant.StaticGLGenTask" + <taskdef name="staticglgen" classname="com.sun.gluegen.ant.StaticGLGenTask" classpathref="gen.classpath" /> <!-- Use the GlueGen and BuildStaticGLInfo tasks to generate the - Java files --> - <!-- Generate GL interface class --> - <echo message="Generating GL interface class" /> + <!-- Generate GL interface and implementation --> + <echo message="Generating GL interface and implementation" /> <gluegen src="${stub.includes.common}/gl.c" config="${gl.cfg}" includeRefid="stub.includes.fileset.all" - emitter="net.java.games.gluegen.opengl.GLEmitter"> - <classpath refid="gen.classpath" /> - </gluegen> - - <!-- Generate GL implementation class --> - <echo message="Generating GL implementation class" /> - <gluegen src="${stub.includes.common}/gl-impl.c" - config="${gl.impl.cfg}" - includeRefid="stub.includes.fileset.all" - emitter="net.java.games.gluegen.opengl.GLEmitter"> + emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gen.classpath" /> </gluegen> - <!-- Generate WGL interface class --> - <echo message="Generating WGL interface class" /> - <gluegen src="${stub.includes.common}/gl-impl.c" - config="${config}/gl-wgl-win32.cfg" + <!-- Generate platform-specific extension class (WGLExt, GLXExt, etc.) --> + <echo message="Generating platform-specific OpenGL extension class" /> + <gluegen src="${glext.platform.header}" + config="${glext.platform.cfg}" includeRefid="stub.includes.fileset.all" - emitter="net.java.games.gluegen.opengl.GLEmitter"> - <classpath refid="gen.classpath" /> - </gluegen> - - <!-- Generate GLX interface class --> - <echo message="Generating GLX interface class" /> - <gluegen src="${stub.includes.common}/gl-impl.c" - config="${config}/gl-glx-x11.cfg" - includeRefid="stub.includes.fileset.all" - emitter="net.java.games.gluegen.opengl.GLEmitter"> - <classpath refid="gen.classpath" /> - </gluegen> - - <!-- Generate CGL interface class --> - <echo message="Generating CGL interface class" /> - <gluegen src="${stub.includes.common}/gl-impl.c" - config="${config}/gl-cgl-macosx.cfg" - includeRefid="stub.includes.fileset.all" - emitter="net.java.games.gluegen.opengl.GLEmitter"> + emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gen.classpath" /> </gluegen> @@ -519,7 +499,7 @@ config="${jawt.cfg}" literalInclude="${java.includes.dir}" includeRefid="stub.includes.fileset.platform" - emitter="net.java.games.gluegen.JavaEmitter"> + emitter="com.sun.gluegen.JavaEmitter"> <classpath refid="gen.classpath" /> </gluegen> @@ -528,33 +508,24 @@ <gluegen src="${stub.includes.platform}/window-system.c" config="${window.cfg}" includeRefid="stub.includes.fileset.platform" - emitter="net.java.games.gluegen.opengl.GLEmitter"> + emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gen.classpath" /> </gluegen> <!-- Generate StaticGLInfo class --> <echo message="Generating StaticGLInfo class" /> - <staticglgen package="net.java.games.jogl.impl" + <staticglgen package="com.sun.opengl.impl" headers="${gl.headers}" - outputdir="${src.generated.java}/net/java/games/jogl/impl"> + outputdir="${src.generated.java}/com/sun/opengl/impl"> <classpath refid="gen.classpath" /> </staticglgen> - <!-- Generate GLU interface class --> - <echo message="Generating GLU interface class" /> + <!-- Generate GLU class --> + <echo message="Generating GLU class" /> <gluegen src="${stub.includes.common}/glu.c" config="${glu.cfg}" includeRefid="stub.includes.fileset.all" - emitter="net.java.games.gluegen.opengl.GLEmitter"> - <classpath refid="gen.classpath" /> - </gluegen> - - <!-- Generate GLU implementation class --> - <echo message="Generating GLU implementation class" /> - <gluegen src="${stub.includes.common}/glu-impl.c" - config="${glu.impl.cfg}" - includeRefid="stub.includes.fileset.all" - emitter="net.java.games.gluegen.opengl.GLEmitter"> + emitter="com.sun.gluegen.opengl.GLEmitter"> <classpath refid="gen.classpath" /> </gluegen> @@ -579,7 +550,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}/net/java/games/cg/CgGL.java" /> + <mapper type="merge" to="${src.generated.java}/com/sun/opengl/cg/CgGL.java" /> </uptodate> </target> @@ -599,16 +570,16 @@ </path> <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT --> - <taskdef name="gluegen" classname="net.java.games.gluegen.ant.GlueGenTask" + <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask" classpathref="gen.classpath" /> - <taskdef name="staticglgen" classname="net.java.games.gluegen.ant.StaticGLGenTask" + <taskdef name="staticglgen" classname="com.sun.gluegen.ant.StaticGLGenTask" classpathref="gen.classpath" /> <!-- Generate CgGL interface class --> <gluegen src="${stub.includes.common}/cg.c" config="cg-common.cfg" includeRefid="stub.includes.cg.fileset.all" - emitter="net.java.games.gluegen.JavaEmitter"> + emitter="com.sun.gluegen.JavaEmitter"> <classpath refid="gen.classpath" /> </gluegen> </target> @@ -621,28 +592,28 @@ <!-- 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}/net/java/games/jogl" files="GL.class" /> - <srcfilelist dir="${classes}/net/java/games/gluegen/opengl" files="BuildComposablePipeline.class" /> - <targetfileset dir="${src.generated.java}/net/java/games/jogl" + <srcfilelist dir="${classes}/javax/media/opengl" files="GL.class" /> + <srcfilelist dir="${classes}/com/sun/gluegen/opengl" files="BuildComposablePipeline.class" /> + <targetfileset dir="${src.generated.java}/javax/media/opengl" includes="DebugGL.java,TraceGL.java" /> </dependset> <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.compile.composable.pipeline.skip" - srcfile="${classes}/net/java/games/jogl/GL.class" - targetfile="${src.generated.java}/net/java/games/jogl/DebugGL.java" /> + srcfile="${classes}/javax/media/opengl/GL.class" + targetfile="${src.generated.java}/javax/media/opengl/DebugGL.java" /> </target> <target name="java.compile.composable.pipeline" depends="java.compile.composable.pipeline.check" unless="java.compile.composable.pipeline.skip"> - <java classname="net.java.games.gluegen.opengl.BuildComposablePipeline" fork="yes"> - <arg value="net.java.games.jogl.GL" /> - <arg value="${src.generated.java}/net/java/games/jogl" /> + <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes"> + <arg value="javax.media.opengl.GL" /> + <arg value="${src.generated.java}/javax/media/opengl" /> <classpath refid="antlr.classpath" /> </java> <!-- Perform the second pass Java compile which compiles the composable pipelines. --> <javac destdir="${classes}" includes="${src.generated.java.pipeline}" source="1.4" debug="true" debuglevel="source,lines"> - <src path="${src}" /> + <src path="${src.java}" /> <src path="${src.generated.java}" /> <classpath refid="antlr.classpath" /> </javac> @@ -657,8 +628,8 @@ <target name="java.compile" depends="java.generate,java.generate.cg"> <!-- Perform the first pass Java compile. --> <javac destdir="${classes}" - excludes="${java.excludes.platform},net/java/games/jogl/impl/nurbs/**" source="1.4" debug="true" debuglevel="source,lines"> - <src path="${src}" /> + excludes="${java.excludes.platform},com/sun/opengl/impl/nurbs/**" source="1.4" debug="true" debuglevel="source,lines"> + <src path="${src.java}" /> <src path="${src.generated.java}" /> <classpath refid="antlr.classpath" /> </javac> @@ -917,9 +888,11 @@ <!-- Build the jar excluding any build specific classes. --> <jar destfile="${jogl.jar}"> <fileset dir="${classes}"> - <include name="net/java/games/jogl/**" /> - <include name="net/java/games/gluegen/runtime/**" /> - <include name="net/java/games/cg/**" /> + <include name="javax/media/opengl/**" /> + <include name="com/sun/gluegen/runtime/**" /> + <include name="com/sun/opengl/impl/**" /> + <include name="com/sun/opengl/utils/**" /> + <include name="com/sun/opengl/cg/**" /> </fileset> </jar> @@ -935,20 +908,20 @@ <target name="javadoc.nocg" depends="setup.java.home.dir,init" unless="jogl.cg"> <!-- Build the general Javadoc --> <javadoc packagenames="${javadoc.packagenames}" - sourcepath="${src};${src.generated.java}" - destdir="${javadoc}" windowtitle="JOGL API" + sourcepath="${src.java};${src.generated.java}" + destdir="${javadoc}" windowtitle="${javadoc.windowtitle}" source="1.4" - link="${javadoc.link}" /> + linkoffline="${javadoc.link} 142-packages" /> </target> <!-- Same as above but with Cg directories added --> <target name="javadoc.cg" depends="setup.java.home.dir,init" if="jogl.cg"> <!-- Build the general Javadoc --> - <javadoc packagenames="${javadoc.packagenames},net.java.games.cg" - sourcepath="${src};${src.generated.java}" - destdir="${javadoc}" windowtitle="JOGL API" + <javadoc packagenames="${javadoc.packagenames},com.sun.opengl.cg" + sourcepath="${src.java};${src.generated.java}" + destdir="${javadoc}" windowtitle="${javadoc.windowtitle}" source="1.4" - link="${javadoc.link}" /> + linkoffline="${javadoc.link} 142-packages" /> </target> <target name="javadoc" depends="javadoc.nocg,javadoc.cg" /> @@ -956,20 +929,20 @@ <target name="javadoc.dev.nocg" depends="init" unless="jogl.cg"> <!-- Build the internal developer Javadoc --> <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform}" - sourcepath="${src};${src.generated.java}" - destdir="${javadoc.dev}" windowtitle="JOGL API" + sourcepath="${src.java};${src.generated.java}" + destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}" source="1.4" - link="${javadoc.link}" /> + linkoffline="${javadoc.link} 142-packages" /> </target> <!-- Same as above but with Cg directories added --> <target name="javadoc.dev.cg" depends="init" if="jogl.cg"> <!-- Build the internal developer Javadoc --> - <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform},net.java.games.cg" - sourcepath="${src};${src.generated.java}" - destdir="${javadoc.dev}" windowtitle="JOGL API" + <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform},com.sun.opengl.cg" + sourcepath="${src.java};${src.generated.java}" + destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}" source="1.4" - link="${javadoc.link}" /> + linkoffline="${javadoc.link} 142-packages" /> </target> <target name="javadoc.dev.win32" depends="setup.java.home.dir,declare.win32,javadoc.dev.nocg,javadoc.dev.cg" /> |