diff options
| -rw-r--r-- | jnlp-files/jogl-all-noawt.jnlp | 66 | ||||
| -rw-r--r-- | jnlp-files/newt-all-noawt.jnlp | 64 | ||||
| -rw-r--r-- | make/build-jogl.xml | 15 | ||||
| -rw-r--r-- | make/build-newt.xml | 13 | ||||
| -rw-r--r-- | make/lstjars.sh | 40 | ||||
| -rw-r--r-- | make/make.jogl.all.linux-x86_64.sh | 3 |
6 files changed, 182 insertions, 19 deletions
diff --git a/jnlp-files/jogl-all-noawt.jnlp b/jnlp-files/jogl-all-noawt.jnlp new file mode 100644 index 000000000..7159ba8e7 --- /dev/null +++ b/jnlp-files/jogl-all-noawt.jnlp @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp codebase="JOGL_CODEBASE_TAG/" + href="jogl-all-noawt.jnlp"> + <information> + <title>Java(tm) Binding to the OpenGL(r) API (ALL.NO_AWT)</title> + <vendor>Sun Microsystems, Inc.</vendor> + <homepage href="http://jogl.dev.java.net/"/> + <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - ALL.NO_AWT</description> + <description kind="short">Java programming language binding for the OpenGL 3D graphics API - ALL.NO_AWT</description> + <offline-allowed/> + </information> + <security> + <all-permissions/> + </security> + <resources> + <jar href="jogl.all-noawt.jar" /> + + <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> + <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" /> + </resources> + + <resources os="Windows" arch="x86"> + <nativelib href = "jogl-natives-windows-i586.jar" /> + </resources> + <resources os="Windows" arch="amd64"> + <nativelib href = "jogl-natives-windows-amd64.jar" /> + </resources> + <resources os="Windows" arch="x86_64"> + <nativelib href = "jogl-natives-windows-amd64.jar" /> + </resources> + <resources os="SunOS" arch="sparc"> + <nativelib href = "jogl-natives-solaris-sparc.jar" /> + </resources> + <resources os="SunOS" arch="sparcv9"> + <nativelib href = "jogl-natives-solaris-sparcv9.jar" /> + </resources> + <resources os="SunOS" arch="x86"> + <nativelib href = "jogl-natives-solaris-i586.jar" /> + </resources> + <resources os="SunOS" arch="amd64"> + <nativelib href = "jogl-natives-solaris-amd64.jar" /> + </resources> + <resources os="SunOS" arch="x86_64"> + <nativelib href = "jogl-natives-solaris-amd64.jar" /> + </resources> + <resources os="Linux" arch="i386"> + <nativelib href = "jogl-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="x86"> + <nativelib href = "jogl-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="amd64"> + <nativelib href = "jogl-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="x86_64"> + <nativelib href = "jogl-natives-linux-amd64.jar" /> + </resources> + <resources os="Mac OS X" arch="i386"> + <nativelib href = "jogl-natives-macosx-universal.jar" /> + </resources> + <resources os="Mac OS X" arch="x86_64"> + <nativelib href = "jogl-natives-macosx-universal.jar" /> + </resources> + + <component-desc /> +</jnlp> diff --git a/jnlp-files/newt-all-noawt.jnlp b/jnlp-files/newt-all-noawt.jnlp new file mode 100644 index 000000000..752d96add --- /dev/null +++ b/jnlp-files/newt-all-noawt.jnlp @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp codebase="JOGL_CODEBASE_TAG/" + href="newt-all-noawt.jnlp"> + <information> + <title>NEWT - New Windowing Toolkit (ALL.NO_AWT)</title> + <vendor>Sun Microsystems, Inc.</vendor> + <homepage href="http://jogl.dev.java.net/"/> + <description>NEWT - A NativeWindow Interface implementation - ALL.NO_AWT</description> + <description kind="short">NEWT - A NativeWindow Interface implementation - ALL.NO_AWT</description> + <offline-allowed/> + </information> + <security> + <all-permissions/> + </security> + <resources> + <jar href="newt.all-noawt.jar" main="true"/> + <extension name="jogl-all-noawt" href="JOGL_CODEBASE_TAG/jogl-all-noawt.jnlp" /> + </resources> + + <resources os="Windows" arch="x86"> + <nativelib href = "newt-natives-windows-i586.jar" /> + </resources> + <resources os="Windows" arch="amd64"> + <nativelib href = "newt-natives-windows-amd64.jar" /> + </resources> + <resources os="Windows" arch="x86_64"> + <nativelib href = "newt-natives-windows-amd64.jar" /> + </resources> + <resources os="SunOS" arch="sparc"> + <nativelib href = "newt-natives-solaris-sparc.jar" /> + </resources> + <resources os="SunOS" arch="sparcv9"> + <nativelib href = "newt-natives-solaris-sparcv9.jar" /> + </resources> + <resources os="SunOS" arch="x86"> + <nativelib href = "newt-natives-solaris-i586.jar" /> + </resources> + <resources os="SunOS" arch="amd64"> + <nativelib href = "newt-natives-solaris-amd64.jar" /> + </resources> + <resources os="SunOS" arch="x86_64"> + <nativelib href = "newt-natives-solaris-amd64.jar" /> + </resources> + <resources os="Linux" arch="i386"> + <nativelib href = "newt-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="x86"> + <nativelib href = "newt-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="amd64"> + <nativelib href = "newt-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="x86_64"> + <nativelib href = "newt-natives-linux-amd64.jar" /> + </resources> + <resources os="Mac OS X" arch="i386"> + <nativelib href = "newt-natives-macosx-universal.jar" /> + </resources> + <resources os="Mac OS X" arch="x86_64"> + <nativelib href = "newt-natives-macosx-universal.jar" /> + </resources> + + <component-desc /> +</jnlp> diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 846779fed..c541748f8 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -413,6 +413,7 @@ <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" /> @@ -1765,7 +1766,7 @@ </jar> </target> - <target name="build-jars-all" depends="setup-manifestfile" unless="setup.noall"> + <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall"> <jar manifest="${build}/tempversion" destfile="${jogl.all.jar}" filesonly="true"> <fileset dir="${classes}"> <include name="javax/media/opengl/**" /> @@ -1779,6 +1780,16 @@ 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"> + <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}"> + </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"> <fileset dir="${classes-cdc}" @@ -1848,7 +1859,7 @@ </jar> </target> - <target name="build-jars-javase" depends="setup-manifestfile, build-jars-es, build-jars-awt, build-cg-jar, build-jars-all, build-jars-desktop-javase"> + <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"> <fileset dir="${classes}" includes="${java.part.core}" diff --git a/make/build-newt.xml b/make/build-newt.xml index 079d2e154..08ce00672 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -263,6 +263,7 @@ <property name="newt.broadcomegl.jar" value="${build}/newt.broadcomegl.jar" /> <property name="newt.awt.jar" value="${build}/newt.awt.jar" /> <property name="newt.all.jar" value="${build}/newt.all.jar" /> + <property name="newt.all-noawt.jar" value="${build}/newt.all-noawt.jar" /> <property name="newt.core.cdc.jar" value="${build}/newt.core.cdc.jar" /> <property name="newt.x11.cdc.jar" value="${build}/newt.x11.cdc.jar" /> @@ -744,13 +745,21 @@ </jar> </target> - <target name="build-jars-all" depends="setup-manifestfile" unless="setup.noall"> + <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall"> <jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true"> <fileset dir="${classes}" includes="com/sun/javafx/newt/**" /> </jar> </target> + <target name="build-jars-all-noawt" depends="setup-manifestfile"> + <jar manifest="tempversion" destfile="${newt.all-noawt.jar}" filesonly="true"> + <fileset dir="${classes}" + includes="com/sun/javafx/newt/**" + excludes="${java.part.awt}" /> + </jar> + </target> + <target name="build-jars-all-cdc" depends="setup-manifestfile-cdc"> <jar manifest="tempversion-cdc" destfile="${newt.all.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" @@ -759,7 +768,7 @@ </jar> </target> - <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-opengl,build-jars-all,build-jars-desktop"> + <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-opengl,build-jars-all-noawt,build-jars-all-awt,build-jars-desktop"> <jar manifest="tempversion" destfile="${newt.core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}"/> diff --git a/make/lstjars.sh b/make/lstjars.sh index 04bb17a90..5357cde11 100644 --- a/make/lstjars.sh +++ b/make/lstjars.sh @@ -5,8 +5,10 @@ STATDIR=$THISDIR/../stats BUILDDIR=$1 shift -if [ -z "$BUILDDIR" ] ; then - echo "usage $0 <BUILDDIR>" +BUILDDIR_GLUEGEN=$1 +shift +if [ -z "$BUILDDIR" -o -z "$BUILDDIR_GLUEGEN" ] ; then + echo "usage $0 <BUILDDIR-JOGL> <BUILDDIR-GLUEGEN>" exit 1 fi @@ -15,9 +17,6 @@ if [ "$1" = "-skippack200" ] ; then skippack200=1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl - - function report() { #ls -1 -s --block-size=1024 $* #ls -1 -s --block-size=1024 $* | awk ' BEGIN { sum=0 ; } { sum=sum+$1; } END { printf("%d Total\n", sum); }' @@ -32,6 +31,11 @@ cp -a $BUILDDIR/newt/obj/*.so $STATDIR cp -a $BUILDDIR/nativewindow/*.jar $STATDIR cp -a $BUILDDIR/jogl/*.jar $STATDIR cp -a $BUILDDIR/newt/*.jar $STATDIR +cp -a $BUILDDIR_GLUEGEN/gluegen-rt.jar $STATDIR +cp -a $BUILDDIR_GLUEGEN/gluegen-rt-cdc.jar $STATDIR +cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586.jar $STATDIR +cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586-cdc.jar $STATDIR +cp -a $BUILDDIR_GLUEGEN/obj/libgluegen-rt.so $STATDIR cd $STATDIR @@ -88,35 +92,43 @@ fi OSS=x11 echo JOGL ES1 NEWT CORE -report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_es1.so.gz libnewt.so.gz +report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es1.so.gz libnewt.so.gz echo echo JOGL ES2 NEWT CORE -report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_es2.so.gz libnewt.so.gz +report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz echo echo JOGL ES2 NEWT CORE FIXED -report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_es2.so.gz libnewt.so.gz +report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz echo echo JOGL GL2ES12 NEWT -report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2es12.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz +report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2es12.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz echo echo JOGL GL2 NEWT -report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_gl2.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz +report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz echo echo JOGL GL2 AWT -report nativewindow.core.$JAR_SUFFIX nativewindow.awt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz +report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX nativewindow.awt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz echo echo JOGL ALL -report nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX newt.all.$JAR_SUFFIX libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz libnewt.so.gz +report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX newt.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz libnewt.so.gz +echo + +echo JOGL CDCFP DESKTOP +report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz +echo + +echo JOGL CDCFP ES1 MOBILE +report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.core.cdc.$JAR_SUFFIX newt.broadcomegl.cdc.$JAR_SUFFIX newt.core.cdc.$JAR_SUFFIX newt.ogl.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnativewindow_jvm.so.gz libnewt.so.gz echo -echo JOGL CDCFP -report nativewindow.core.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz +echo JOGL CDCFP ES2 MOBILE +report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.core.cdc.$JAR_SUFFIX newt.broadcomegl.cdc.$JAR_SUFFIX newt.core.cdc.$JAR_SUFFIX newt.ogl.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnativewindow_jvm.so.gz libnewt.so.gz echo echo JOGL GLU diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh index 90883f97c..b5f860bd4 100644 --- a/make/make.jogl.all.linux-x86_64.sh +++ b/make/make.jogl.all.linux-x86_64.sh @@ -13,8 +13,9 @@ fi # -DisLinux=true \ # -DisLinuxAMD64=true \ # -DisX11=true \ +# -Dbuild.noarchives=true \ -ant \ +ant \ -Dbuild.noarchives=true \ -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 \ -Dc.compiler.debug=true \ |