diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 6 | ||||
| -rw-r--r-- | make/make.jogl.doc.all.sh | 5 | ||||
| -rw-r--r-- | make/make.jogl.doc.all.x86_64.sh | 7 | ||||
| -rw-r--r-- | make/make.jogl.doc.sh | 5 | ||||
| -rw-r--r-- | make/make.jogl.doc.x86_64.sh | 7 |
5 files changed, 18 insertions, 12 deletions
diff --git a/make/build.xml b/make/build.xml index 69155d61f..e1f5f8d38 100644 --- a/make/build.xml +++ b/make/build.xml @@ -1152,7 +1152,7 @@ <!-- Perform the first pass Java compile. --> <javac destdir="${classes}" classpath="${gluegen-rt.jar}" - includes="javax/media/opengl/sub/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java" + includes="javax/media/nwi/** javax/media/opengl/sub/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java" fork="yes" memoryMaximumSize="128m" source="1.4" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> @@ -1748,7 +1748,7 @@ <jar manifest="tempversion" destfile="${jogl.core.jar}"> <fileset dir="${classes}" - includes="javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**" + includes="javax/media/nwi/**, javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**" excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.sdk}, ${java.part.glsl}, ${java.part.openmax}, ${java.part.glsl.fixed}, ${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glutess}, ${java.part.glumipmap}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.newt}, ${java.part.newt.awt}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gles1.jar}"> @@ -1862,6 +1862,7 @@ </jar> <jar manifest="tempversion" destfile="${jogl.all.jar}"> <fileset dir="${classes}"> + <include name="javax/media/nwi/**" /> <include name="javax/media/opengl/**" /> <include name="com/sun/gluegen/runtime/**" /> <include name="com/sun/opengl/**" /> @@ -1888,6 +1889,7 @@ </copy> <jar manifest="tempversion" destfile="${jogl.jar}"> <fileset dir="${classes}"> + <include name="javax/media/nwi/**" /> <include name="javax/media/opengl/**" /> <include name="com/sun/gluegen/runtime/**" /> <include name="com/sun/opengl/**" /> diff --git a/make/make.jogl.doc.all.sh b/make/make.jogl.doc.all.sh deleted file mode 100644 index 5f6f90368..000000000 --- a/make/make.jogl.doc.all.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -. ../../setenv-build-jogl.sh - -ant -v javadoc.dev.all $* 2>&1 | tee make.jogl.doc.all.log diff --git a/make/make.jogl.doc.all.x86_64.sh b/make/make.jogl.doc.all.x86_64.sh new file mode 100644 index 000000000..d6f16c2d4 --- /dev/null +++ b/make/make.jogl.doc.all.x86_64.sh @@ -0,0 +1,7 @@ +#! /bin/sh + +. ../../setenv-build-jogl-x86_64.sh + +ant -v \ + -Drootrel.build=build-x86_64 \ + javadoc.dev.all $* 2>&1 | tee make.jogl.doc.all.x86_64.log diff --git a/make/make.jogl.doc.sh b/make/make.jogl.doc.sh deleted file mode 100644 index 92fd23674..000000000 --- a/make/make.jogl.doc.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -. ../../setenv-build-jogl.sh - -ant -v javadoc $* 2>&1 | tee make.jogl.doc.all.log diff --git a/make/make.jogl.doc.x86_64.sh b/make/make.jogl.doc.x86_64.sh new file mode 100644 index 000000000..2ed8e67ec --- /dev/null +++ b/make/make.jogl.doc.x86_64.sh @@ -0,0 +1,7 @@ +#! /bin/sh + +. ../../setenv-build-jogl-x86_64.sh + +ant -v \ + -Drootrel.build=build-x86_64 \ + javadoc $* 2>&1 | tee make.jogl.doc.x86_64.log |