aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--make/build-common.xml70
-rw-r--r--make/build-test.xml58
-rw-r--r--src/demos/com/jogamp/opengl/demos/av/MovieCube.java3
-rw-r--r--src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java4
-rw-r--r--src/demos/com/jogamp/opengl/demos/av/MovieSimple.java3
5 files changed, 116 insertions, 22 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index 4f7a709c6..99137e54b 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -512,8 +512,8 @@
<property name="gluegen-test-util.jar" value="${build.gluegen}/gluegen-test-util.jar" />
<property name="jogl-test.jar" value="${jar}/jogl-test.jar"/>
<property name="jogl-demos.jar" value="${jar}/jogl-demos.jar"/>
- <property name="jogl-demo-android.jar" value="${jar}/jogl-demo-android.jar"/>
- <property name="jogl-demo-android.apk" value="${jar}/jogl-demo-android.apk"/>
+ <property name="jogl-demos-android.jar" value="${jar}/jogl-demos-android.jar"/>
+ <property name="jogl-demos-android.apk" value="${jar}/jogl-demos-android.apk"/>
<!-- JavaSE combinations . AWT -->
<property name="jogl-all.jar" value="${jar}/jogl-all.jar" />
@@ -529,7 +529,15 @@
<condition property="joal-jars.available">
<available file="${joal.jar}"/>
</condition>
- <echo message="joal-jars.available: ${joal-jars.available} ${joal.jar}" />
+ <condition property="android-joal-jars.available">
+ <and>
+ <istrue value="${joal-jars.available}" />
+ <istrue value="${android-jars.available}" />
+ </and>
+ </condition>
+ <echo message="joal-jars.available: ${joal-jars.available}, ${joal.jar}" />
+ <echo message="android-jars.available: ${android-jars.available}, ${android.jar}" />
+ <echo message="android-joal-jars.available: ${android-joal-jars.available}" />
<!-- NativeWindow Compilation .. -->
<path id="swt_gluegen.classpath">
@@ -604,8 +612,61 @@
</path>
+ <!-- Demo Compilation .. -->
+ <path id="demo_joal_jogl_newt.compile.classpath">
+ <pathelement location="${gluegen-rt.jar}" />
+ <pathelement location="${gluegen-test-util.jar}" />
+ <pathelement location="${joal.jar}" />
+ <pathelement location="${swt.jar}" />
+ <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
+ <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
+ <path refid="nativewindow_all_atoms.classpath" />
+ <path refid="jogl_all_atoms.classpath" />
+ <path refid="newt_all_atoms.classpath" />
+ <pathelement location="${graphui.jar}" />
+ </path>
+ <path id="demo_jogl_newt.compile.classpath">
+ <pathelement location="${gluegen-rt.jar}" />
+ <pathelement location="${gluegen-test-util.jar}" />
+ <pathelement location="${swt.jar}" />
+ <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
+ <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
+ <path refid="nativewindow_all_atoms.classpath" />
+ <path refid="jogl_all_atoms.classpath" />
+ <path refid="newt_all_atoms.classpath" />
+ <pathelement location="${graphui.jar}" />
+ </path>
+
+ <path id="demo_joal_jogl_newt_android.compile.classpath">
+ <pathelement location="${android.jar}" />
+ <pathelement location="${gluegen-rt-android.jar}" />
+ <pathelement location="${gluegen-test-util.jar}" />
+ <pathelement location="${joal.jar}" />
+ <pathelement location="${swt.jar}" />
+ <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
+ <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
+ <path refid="nativewindow_all_atoms.classpath" />
+ <path refid="jogl_all_atoms.classpath" />
+ <path refid="newt_all_atoms.classpath" />
+ <pathelement location="${newt-driver-android.jar}" />
+ <pathelement location="${graphui.jar}" />
+ </path>
+ <path id="demo_jogl_newt_android.compile.classpath">
+ <pathelement location="${android.jar}" />
+ <pathelement location="${gluegen-rt-android.jar}" />
+ <pathelement location="${gluegen-test-util.jar}" />
+ <pathelement location="${swt.jar}" />
+ <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
+ <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
+ <path refid="nativewindow_all_atoms.classpath" />
+ <path refid="jogl_all_atoms.classpath" />
+ <path refid="newt_all_atoms.classpath" />
+ <pathelement location="${newt-driver-android.jar}" />
+ <pathelement location="${graphui.jar}" />
+ </path>
+
<!-- Test Compilation .. -->
- <path id="junit_joal_jogl_newt.compile.classpath">
+ <path id="junit_jogl_newt.compile.classpath">
<pathelement location="${junit.jar}" />
<pathelement location="${ant.jar}" />
<pathelement location="${ant-junit.jar}" />
@@ -613,7 +674,6 @@
<pathelement location="${semver.jar}" />
<pathelement location="${gluegen-rt.jar}" />
<pathelement location="${gluegen-test-util.jar}" />
- <pathelement location="${joal.jar}" />
<pathelement location="${swt.jar}" />
<pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
<pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
diff --git a/make/build-test.xml b/make/build-test.xml
index ae3daacfe..e36112687 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -30,6 +30,9 @@
<property name="java.part.demo" value="com/jogamp/opengl/demos/**"/>
<property name="java.part.demo.android" value="com/jogamp/opengl/demos/android/**"/>
+ <property name="java.part.demo.openal" value="com/jogamp/opengl/demos/graph/ui/UISceneDemo20*"/>
+ <property name="java.part.demo.android.openal" value="com/jogamp/opengl/demos/graph/ui/UISceneDemo20*, com/jogamp/opengl/demos/android/NEWTGraphUI1p*, com/jogamp/opengl/demos/android/NEWTGraphUI2p*"/>
+
<property name="java.part.test.all" value="com/jogamp/opengl/test/** jogamp/**"/>
<property name="java.part.test.oculusvr" value="com/jogamp/opengl/test/junit/jogl/stereo/ovr/**"/>
<property name="java.dir.test" value="com/jogamp/opengl/test"/>
@@ -92,9 +95,24 @@
- Build/run tests/junit.
-->
- <target name="make.demos">
+ <target name="make.demos.firstpass">
+ <javac destdir="${classes.demos}"
+ excludes="${java.part.demo.android} ${java.part.demo.oculusvr} ${java.part.demo.openal}"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+ bootclasspath="${target.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+ <classpath refid="demo_jogl_newt.compile.classpath"/>
+ <src path="${src.demos}" />
+ </javac>
+ </target>
+ <target name="make.demos.secondpass.openal" if="joal-jars.available">
<javac destdir="${classes.demos}"
- excludes="${java.part.demo.android} ${java.part.demo.oculusvr}"
+ includes="${java.part.demo.openal}"
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
@@ -103,9 +121,11 @@
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
- <classpath refid="junit_joal_jogl_newt.compile.classpath"/>
+ <classpath refid="demo_joal_jogl_newt.compile.classpath"/>
<src path="${src.demos}" />
</javac>
+ </target>
+ <target name="make.demos" depends="make.demos.firstpass, make.demos.secondpass.openal">
<copy file="joglversion-test"
tofile="${build.test}/manifest-demo.mf"
overwrite="true">
@@ -132,10 +152,9 @@
</jar>
</target>
- <target name="demo.compile.android" if="android-jars.available">
- <!-- Perform the junit pass Java Android compile -->
+ <target name="demos.cc.android.firstpass" if="android-jars.available">
<javac destdir="${classes.demos}"
- excludes="${java.part.demo.oculusvr}"
+ excludes="${java.part.demo.oculusvr} ${java.part.demo.android.openal}"
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
@@ -144,9 +163,26 @@
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
- <classpath refid="junit_jogl_newt_android.compile.classpath"/>
+ <classpath refid="demo_jogl_newt_android.compile.classpath"/>
<src path="${src.demos}" />
</javac>
+ </target>
+ <target name="demos.cc.android.secondpass.openal" if="android-joal-jars.available">
+ <javac destdir="${classes.demos}"
+ includes="${java.part.demo.android.openal}"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+ bootclasspath="${target.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+ <classpath refid="demo_joal_jogl_newt_android.compile.classpath"/>
+ <src path="${src.demos}" />
+ </javac>
+ </target>
+ <target name="demos.cc.android" depends="demos.cc.android.firstpass, demos.cc.android.secondpass.openal" if="android-jars.available">
<copy file="joglversion-demo-android"
tofile="${build.test}/manifest-demo-android.mf"
overwrite="true">
@@ -159,7 +195,7 @@
</filterset>
</copy>
- <jar manifest="${build.test}/manifest-demo-android.mf" destfile="${jogl-demo-android.jar}" filesonly="true">
+ <jar manifest="${build.test}/manifest-demo-android.mf" destfile="${jogl-demos-android.jar}" filesonly="true">
<!-- get all class files, but skip any resource files that external tools
might have copied into the class directory (otherwise, it's possible
to get the same resource file twice in the jar) -->
@@ -168,12 +204,12 @@
</jar>
</target>
- <target name="demo.package.android" depends="demo.compile.android" if="isAndroid">
+ <target name="demo.package.android" depends="demos.cc.android" if="isAndroid">
<aapt.signed
assetsdir="resources/assets-test"
jarsrcdir="${src}/demos"
jarbuilddir="${jar}"
- jarbasename="jogl-demo-android"
+ jarbasename="jogls-demo-android"
nativebuilddir="${lib}"
nativebasename="non-existing"
androidmanifest.path="resources/android/AndroidManifest-demo.xml"
@@ -208,7 +244,7 @@
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
- <classpath refid="junit_joal_jogl_newt.compile.classpath"/>
+ <classpath refid="junit_jogl_newt.compile.classpath"/>
<src path="${src.test}" />
</javac>
</target>
diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieCube.java b/src/demos/com/jogamp/opengl/demos/av/MovieCube.java
index 4cd6b09b6..a08423b62 100644
--- a/src/demos/com/jogamp/opengl/demos/av/MovieCube.java
+++ b/src/demos/com/jogamp/opengl/demos/av/MovieCube.java
@@ -47,7 +47,6 @@ import com.jogamp.graph.curve.opengl.GLRegion;
import com.jogamp.graph.curve.opengl.RegionRenderer;
import com.jogamp.graph.font.Font;
import com.jogamp.graph.font.FontScale;
-import com.jogamp.junit.util.JunitTracer;
import com.jogamp.newt.Window;
import com.jogamp.newt.event.KeyAdapter;
import com.jogamp.newt.event.KeyEvent;
@@ -392,7 +391,7 @@ public class MovieCube implements GLEventListener {
cube = new TextureSequenceCubeES2(mPlayer, false, zoom0, rotx, roty);
if(waitForKey) {
- JunitTracer.waitForKey("Init>");
+ MiscUtils.waitForKey("Init>");
}
try {
diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java b/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java
index 49a6b6fbb..0700ca5bc 100644
--- a/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java
+++ b/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java
@@ -48,7 +48,6 @@ import com.jogamp.graph.curve.opengl.GLRegion;
import com.jogamp.graph.curve.opengl.RegionRenderer;
import com.jogamp.graph.font.Font;
import com.jogamp.graph.font.FontScale;
-import com.jogamp.junit.util.JunitTracer;
import com.jogamp.newt.Window;
import com.jogamp.newt.event.KeyAdapter;
import com.jogamp.newt.event.KeyEvent;
@@ -61,6 +60,7 @@ import com.jogamp.opengl.GLExtensions;
import com.jogamp.opengl.GLProfile;
import com.jogamp.opengl.JoglVersion;
import com.jogamp.opengl.demos.graph.TextRendererGLELBase;
+import com.jogamp.opengl.demos.util.MiscUtils;
import com.jogamp.opengl.math.Matrix4f;
import com.jogamp.opengl.math.Quaternion;
import com.jogamp.opengl.math.Recti;
@@ -422,7 +422,7 @@ public class MovieSBSStereo implements StereoGLEventListener {
", "+drawable.getClass().getName()+", "+drawable);
if(waitForKey) {
- JunitTracer.waitForKey("Init>");
+ MiscUtils.waitForKey("Init>");
}
final Texture tex;
try {
diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java
index 643d4c49f..2bbb9de05 100644
--- a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java
+++ b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java
@@ -40,7 +40,6 @@ import com.jogamp.graph.curve.opengl.GLRegion;
import com.jogamp.graph.curve.opengl.RegionRenderer;
import com.jogamp.graph.font.Font;
import com.jogamp.graph.font.FontScale;
-import com.jogamp.junit.util.JunitTracer;
import com.jogamp.newt.Window;
import com.jogamp.newt.event.KeyAdapter;
import com.jogamp.newt.event.KeyEvent;
@@ -457,7 +456,7 @@ public class MovieSimple implements GLEventListener {
screen.setUseOriginalScale(useOriginalScale);
if(waitForKey) {
- JunitTracer.waitForKey("Init>");
+ MiscUtils.waitForKey("Init>");
}
try {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 17:47:34 +0000