Permalink
Browse files

adapt to jogl's jnlp/jar reduction

  • Loading branch information...
1 parent 4882763 commit 8dbb09541973d33168430eac5eae092b99b1c106 @sgothel committed Aug 5, 2011
View
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-CVM=$1
-shift
-
-BUILD_SUBDIR=$1
-shift
-
-if [ ! -x "$CVM" -o -z "$BUILD_SUBDIR" ] ; then
- echo "Usage $0 CVM-Binary BUILD_SUB_PATH [-cpu <arch>] Main-Class"
- echo "e.g. $0 ../CVM/bin/cvm build-x86 -cpu x86 test"
- exit 1
-fi
-
-X_FLAGS=
-if [ "$1" = "-cpu" ] ; then
- shift
- X_FLAGS="-Dos.arch=$1"
- shift
-fi
-
-# D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
-D_ARGS="-Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
-
-$CVM $X_FLAGS -Djava.awt.headless=true $D_ARGS -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.jogamp.newt.util.MainThread $* 2>&1 | tee cvm-dbg-newt.log
-
View
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-CVM=$1
-shift
-
-BUILD_SUBDIR=$1
-shift
-
-if [ ! -x "$CVM" -o -z "$BUILD_SUBDIR" ] ; then
- echo "Usage $0 CVM-Binary BUILD_SUB_PATH [-cpu <arch>] Main-Class"
- echo "e.g. $0 ../CVM/bin/cvm build-x86 -cpu x86 test"
- exit 1
-fi
-
-X_FLAGS=
-if [ "$1" = "-cpu" ] ; then
- shift
- X_FLAGS="-Dos.arch=$1"
- shift
-fi
-
-$CVM $X_FLAGS -Djava.awt.headless=true -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.jogamp.newt.util.MainThread $* 2>&1 | tee cvm-run-newt.log
@@ -1,8 +0,0 @@
-
-set CVM_HOME=c:\cvm
-
-set JAR_DIR=jogl\lib
-set LIB_DIR=jogl\lib
-
-%CVM_HOME%\bin\cvm "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all" "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:%JAR_DIR%\gluegen-rt-cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\nativewindow.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\jogl.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\newt.all.cdc.jar" "-Xbootclasspath/a:jogl-demos.jar" %1 %2 %3 %4 > cvm-win32-newt-dbg.log 2>&1
-
View
@@ -1,8 +0,0 @@
-
-set CVM_HOME=c:\cvm
-
-set JAR_DIR=jogl\lib
-set LIB_DIR=jogl\lib
-
-%CVM_HOME%\bin\cvm "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:%JAR_DIR%\gluegen-rt-cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\nativewindow.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\jogl.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\newt.all.cdc.jar" "-Xbootclasspath/a:jogl-demos.jar" %1 %2 %3 %4 > cvm-win32-newt.log 2>&1
-
View
@@ -5,7 +5,7 @@ set JAVA_HOME=c:\jdk1.6.0_22_x32
set JAR_DIR=..\jogl\build-win32\jar
set LIB_DIR=..\jogl\build-win32\lib
-set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;build-win32\jogl-demos.jar;build-win32\jogl-demos-util.jar;build-win32\jogl-demos-data.jar
+set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\gluegen-rt.jar;build-win32\jogl-demos.jar;build-win32\jogl-demos-util.jar;build-win32\jogl-demos-data.jar
echo CP_ALL %CP_ALL%
@@ -7,19 +7,11 @@ set LIB_DIR=jogl\lib
set CP_GLUE=%JAR_DIR%\gluegen-rt.jar
-REM set CP_JOGL=%JAR_DIR%\jogl.core.jar;%JAR_DIR%\jogl.util.jar;%JAR_DIR%\jogl.gl2es12.win.jar;%JAR_DIR%\jogl.util.fixedfuncemu.jar;%JAR_DIR%\jogl.gl2es12.dbg.jar;%JAR_DIR%\jogl.glu.tess.jar;%JAR_DIR%\jogl.glu.mipmap.jar;%JAR_DIR%\jogl.awt.jar;%JAR_DIR%\jogl.util.awt.jar
-set CP_JOGL=%JAR_DIR%\jogl.core.jar;%JAR_DIR%\jogl.gl2es12.win.jar;%JAR_DIR%\jogl.util.jar;%JAR_DIR%\jogl.gles2.dbg.jar;%JAR_DIR%\jogl.util.fixedfuncemu.jar
-REM set CP_JOGL=%JAR_DIR%\jogl.core.jar;%JAR_DIR%\jogl.gl2.win.jar;%JAR_DIR%\jogl.util.jar;%JAR_DIR%\jogl.gles2.dbg.jar
-
-REM set CP_NEWT=%JAR_DIR%\newt.all.jar
-set CP_NEWT=%JAR_DIR%\newt.core.jar;%JAR_DIR%\newt.win.jar;%JAR_DIR%\newt.ogl.jar
-
-REM set CP_NWI=%JAR_DIR%\nativewindow.all.jar
-set CP_NWI=%JAR_DIR%\nativewindow.core.jar
+set CP_JOGL=%JAR_DIR%\jogl.all-mobile.jar;%JAR_DIR%\jogl.util.jar;%JAR_DIR%\jogl.gles2.dbg.jar;%JAR_DIR%\jogl.util.fixedfuncemu.jar
set CP_DEMO=jogl-demos.jar;jogl-demos-util.jar;jogl-demos-data.jar
-set CP_ALL=%CP_GLUE%;%CP_NWI%;%CP_JOGL%;%CP_NEWT%;%CP_DEMO%
+set CP_ALL=%CP_GLUE%;%CP_JOGL%;%CP_DEMO%
echo CP_ALL %CP_ALL%
View
@@ -5,7 +5,7 @@ set JAVA_HOME=c:\jdk1.6.0_22_x32
set JAR_DIR=..\jogl\build-win32\jar
set LIB_DIR=..\jogl\build-win32\lib
-set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;build-win32\jogl-demos.jar;build-win32\jogl-demos-util.jar;build-win32\jogl-demos-data.jar
+set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\gluegen-rt.jar;build-win32\jogl-demos.jar;build-win32\jogl-demos-util.jar;build-win32\jogl-demos-data.jar
echo CP_ALL %CP_ALL%
View
@@ -5,7 +5,7 @@ set JAVA_HOME=c:\jdk1.6.0_22_x64
set JAR_DIR=..\jogl\build-win64\jar
set LIB_DIR=..\jogl\build-win64\lib
-set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;build-win64\jogl-demos.jar;build-win64\jogl-demos-util.jar;build-win64\jogl-demos-data.jar
+set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\gluegen-rt.jar;build-win64\jogl-demos.jar;build-win64\jogl-demos-util.jar;build-win64\jogl-demos-data.jar
echo CP_ALL %CP_ALL%
View
@@ -5,7 +5,7 @@ set JAVA_HOME=c:\jdk1.6.0_22_x64
set JAR_DIR=..\jogl\build-win64\jar
set LIB_DIR=..\jogl\build-win64\lib
-set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;build-win64\jogl-demos.jar;build-win64\jogl-demos-util.jar;build-win64\jogl-demos-data.jar
+set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\gluegen-rt.jar;build-win64\jogl-demos.jar;build-win64\jogl-demos-util.jar;build-win64\jogl-demos-data.jar
echo CP_ALL %CP_ALL%
@@ -16,7 +16,7 @@
<property name="sun.java2d.noddraw" value="true"/>
<jar href="jogl-demos.jar" main="true"/>
<jar href="jogl-demos-util.jar" />
- <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
</resources>
<application-desc main-class="demos.gears.Gears">
@@ -21,7 +21,7 @@
<jar href="jogl-demos.jar" main="true"/>
<jar href="jogl-demos-util.jar" />
<jar href="jogl-demos-data.jar" />
- <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
</resources>
<application-desc main-class="demos.jrefract.JRefract">
@@ -17,7 +17,7 @@
<jar href="jogl-demos.jar" main="true"/>
<jar href="jogl-demos-util.jar" />
<jar href="jogl-demos-data.jar" />
- <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
</resources>
<application-desc main-class="demos.jrefract.JRefract">
@@ -16,7 +16,7 @@
<property name="sun.java2d.noddraw" value="true"/>
<jar href="jogl-demos.jar" main="true"/>
<jar href="jogl-demos-util.jar" />
- <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
</resources>
<application-desc main-class="demos.j2d.TestTextRenderer">
@@ -15,7 +15,7 @@
<property name="sun.java2d.noddraw" value="true"/>
<jar href="jogl-demos.jar" main="true"/>
<jar href="jogl-demos-util.jar"/>
- <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
</resources>
<applet-desc
@@ -16,7 +16,7 @@
<jar href="jogl-demos.jar" main="true"/>
<jar href="jogl-demos-data.jar"/>
<jar href="jogl-demos-util.jar"/>
- <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
<extension name="joal" href="JOAL_CODEBASE_TAG/joal.jnlp" />
</resources>
@@ -14,7 +14,7 @@
<property name="sun.java2d.noddraw" value="true"/>
<jar href="jogl-demos.jar" main="true"/>
<jar href="jogl-demos-util.jar"/>
- <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
</resources>
<applet-desc
@@ -20,8 +20,7 @@
max-heap-size="512m"/>
<property name="sun.java2d.noddraw" value="true"/>
<jar href="worldwind.jar" main="true"/>
- <extension name="jogl-all-awt"
- href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" version="JOGAMP_VERSION"/>
+ <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" version="JOGAMP_VERSION"/>
</resources>
<application-desc main-class="worldwinddemo.BasicDemo">
<argument>NotFirstUIActionOnProcess</argument>
View
@@ -94,31 +94,8 @@
</target>
<target name="init" depends="jogamp.env.init,gluegen.cpptasks.detect.os,java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt">
- <property name="jogl.core.jar" value="${jogl.build}/jogl/jogl.core.jar" />
- <condition property="jogl.cg.jar" value="${jogl.build}/jogl/jogl.cg.jar">
- <isset property="jogl.cg"/>
- </condition>
<property name="gluegen-rt.jar" value="${gluegen.build}/gluegen-rt.jar" />
- <property name="jogl.gles12.jar" value="${jogl.build}/jogl/jogl.gles12.jar" />
- <property name="jogl.gles12.dbg.jar" value="${jogl.build}/jogl/jogl.gles12.dbg.jar" />
- <property name="jogl.gles1.jar" value="${jogl.build}/jogl/jogl.gles1.jar" />
- <property name="jogl.gles1.dbg.jar" value="${jogl.build}/jogl/jogl.gles1.dbg.jar" />
- <property name="jogl.gles2.jar" value="${jogl.build}/jogl/jogl.gles2.jar" />
- <property name="jogl.gles2.dbg.jar" value="${jogl.build}/jogl/jogl.gles2.dbg.jar" />
- <property name="jogl.egl.jar" value="${jogl.build}/jogl/jogl.egl.jar" />
- <property name="jogl.gldesktop.jar" value="${jogl.build}/jogl/jogl.gldesktop.jar" />
- <property name="jogl.gldesktop.dbg.jar" value="${jogl.build}/jogl/jogl.gldesktop.dbg.jar" />
- <property name="jogl.awt.jar" value="${jogl.build}/jogl/jogl.awt.jar" />
- <property name="jogl.util.jar" value="${jogl.build}/jogl/jogl.util.jar" />
- <property name="jogl.util.awt.jar" value="${jogl.build}/jogl/jogl.util.awt.jar" />
- <property name="jogl.util.fixedfuncemu.jar" value="${jogl.build}/jogl/jogl.util.fixedfuncemu.jar" />
- <property name="jogl.util.gldesktop.jar" value="${jogl.build}/jogl/jogl.util.gldesktop.jar" />
- <property name="nativewindow.core.jar" value="${jogl.build}/nativewindow/nativewindow.core.jar" />
- <property name="nativewindow.x11.jar" value="${jogl.build}/nativewindow/nativewindow.x11.jar" />
- <property name="nativewindow.awt.jar" value="${jogl.build}/nativewindow/nativewindow.awt.jar" />
- <property name="newt.core.jar" value="${jogl.build}/newt/newt.core.jar" />
- <property name="newt.ogl.jar" value="${jogl.build}/newt/newt.ogl.jar" />
- <property name="newt.awt.jar" value="${jogl.build}/newt/newt.awt.jar" />
+ <property name="jogl.all.jar" value="${jogl.build}/jar/jogl.all.jar" />
<property name="joal.jar" value="${joal.build}/joal.jar" />
<property name="simple-xml.jar" value="${project.root}/lib/simple-xml-1.1.1.jar" />
<property name="classes" value="${build}/classes" />
@@ -167,26 +144,7 @@
<target name="all-desktop" unless="isGLES">
<mkdir dir="${classes}" />
<path id="jogl-demos.classpath">
- <pathelement location="${nativewindow.core.jar}" />
- <pathelement location="${nativewindow.x11.jar}" />
- <pathelement location="${nativewindow.awt.jar}" />
- <pathelement location="${jogl.core.jar}" />
- <pathelement location="${jogl.cg.jar}" />
- <pathelement location="${jogl.gles1.jar}" />
- <pathelement location="${jogl.gles1.dbg.jar}" />
- <pathelement location="${jogl.gles2.jar}" />
- <pathelement location="${jogl.gles2.dbg.jar}" />
- <pathelement location="${jogl.egl.jar}" />
- <pathelement location="${jogl.gldesktop.jar}" />
- <pathelement location="${jogl.gldesktop.dbg.jar}" />
- <pathelement location="${jogl.awt.jar}" />
- <pathelement location="${jogl.util.jar}" />
- <pathelement location="${jogl.util.fixedfuncemu.jar}" />
- <pathelement location="${jogl.util.awt.jar}" />
- <pathelement location="${jogl.util.gldesktop.jar}" />
- <pathelement location="${newt.core.jar}" />
- <pathelement location="${newt.ogl.jar}" />
- <pathelement location="${newt.awt.jar}" />
+ <pathelement location="${jogl.all.jar}" />
<pathelement location="${joal.jar}" />
<pathelement location="${gluegen-rt.jar}" />
<pathelement location="${simple-xml.jar}" />
@@ -240,19 +198,8 @@
<echo message="classes destdir ${classes}" />
<mkdir dir="${classes}" />
<path id="jogl-demos.classpath">
- <pathelement location="${nativewindow.core.jar}" />
- <pathelement location="${nativewindow.x11.jar}" />
- <pathelement location="${jogl.core.jar}" />
- <pathelement location="${jogl.gles1.jar}" />
- <pathelement location="${jogl.gles1.dbg.jar}" />
- <pathelement location="${jogl.gles2.jar}" />
- <pathelement location="${jogl.gles2.dbg.jar}" />
- <pathelement location="${jogl.egl.jar}" />
- <pathelement location="${jogl.util.jar}" />
- <pathelement location="${jogl.util.fixedfuncemu.jar}" />
+ <pathelement location="${jogl.all.jar}" />
<pathelement location="${gluegen-rt.jar}" />
- <pathelement location="${newt.core.jar}" />
- <pathelement location="${newt.ogl.jar}" />
</path>
<javac destdir="${classes}" includes="demos/GLInfo*,demos/es1/**,demos/es2/**" source="1.5" debug="true" debuglevel="source,lines"
includeantruntime="false">
View
@@ -1,7 +1,7 @@
#! /bin/sh
function print_usage() {
- echo "Usage: $0 {JOGL_ALL|JOGL_ALL_NOAWT|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GL2ES12_MIN|JOGL_GL2ES12_MAX|JOGL_GL2_MIN|JOGL_GL2_MAX} [jogl-build-dir]"
+ echo "Usage: $0 {JOGL_ALL|JOGL_ALL_NOAWT|JOGL_ALL_MOBILE} [jogl-build-dir]"
}
if [ -z "$1" ] ; then
@@ -14,7 +14,7 @@
<property name="sun.java2d.noddraw" value="true"/>
<jar href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos.jar" main="true"/>
<jar href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos-util.jar"/>
- <extension name="newt-all-awt" href="http://jogamp.org/deployment/webstart-next/newt-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="http://jogamp.org/deployment/webstart-next/jogl-all-awt.jnlp" />
</resources>
<applet-desc
@@ -14,7 +14,7 @@
<property name="sun.java2d.noddraw" value="true"/>
<jar href="http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos.jar" main="true"/>
<jar href="http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos-util.jar"/>
- <extension name="newt-all-awt" href="http://jogamp.org/deployment/webstart/newt-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="http://jogamp.org/deployment/webstart/jogl-all-awt.jnlp" />
</resources>
<applet-desc

0 comments on commit 8dbb095

Please sign in to comment.