aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-common.xml6
-rw-r--r--make/build-test.xml152
-rw-r--r--make/joglversion-demo-android (renamed from make/joglversion-test-android)0
-rw-r--r--make/resources/android/AndroidManifest-demo.xml (renamed from make/resources/android/AndroidManifest-test.xml)64
-rw-r--r--make/resources/android/res-demo/drawable-hdpi/icon.png (renamed from make/resources/android/res-test/drawable-hdpi/icon.png)bin2516 -> 2516 bytes
-rw-r--r--make/resources/android/res-demo/drawable-ldpi/icon.png (renamed from make/resources/android/res-test/drawable-ldpi/icon.png)bin1172 -> 1172 bytes
-rw-r--r--make/resources/android/res-demo/drawable-mdpi/icon.png (renamed from make/resources/android/res-test/drawable-mdpi/icon.png)bin1570 -> 1570 bytes
-rw-r--r--make/resources/android/res-demo/drawable-xhdpi/icon.png (renamed from make/resources/android/res-test/drawable-xhdpi/icon.png)bin5742 -> 5742 bytes
-rw-r--r--make/resources/android/res-demo/layout/main.xml (renamed from make/resources/android/res-test/layout/main.xml)0
-rw-r--r--make/resources/android/res-demo/values/strings.xml (renamed from make/resources/android/res-test/values/strings.xml)0
-rw-r--r--make/scripts/tests.sh53
11 files changed, 125 insertions, 150 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index 7f7d0ea1d..03372ccf5 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -501,9 +501,9 @@
<property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" />
<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-test-android.jar" value="${jar}/jogl-test-android.jar"/>
- <property name="jogl-test-android.apk" value="${jar}/jogl-test-android.apk"/>
- <property name="jogl-demos-mobile.jar" value="${jar}/jogl-demos-mobile.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"/>
<!-- JavaSE combinations . AWT -->
<property name="jogl-all.jar" value="${jar}/jogl-all.jar" />
diff --git a/make/build-test.xml b/make/build-test.xml
index a5b74a752..e93c100e1 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -28,9 +28,9 @@
<property name="classes.path" location="${classes}"/> <!-- absolute path -->
<property name="classes.demos" value="${build.demos}/classes" />
- <property name="java.part.demo.mobile" value="com/jogamp/opengl/demos/**"/>
- <property name="java.part.test.all" value="com/jogamp/opengl/test/** jogamp/**"/>
- <property name="java.part.test.android" value="com/jogamp/opengl/test/android/**"/>
+ <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.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"/>
<property name="java.dir.junit" value="${java.dir.test}/junit"/>
@@ -83,7 +83,7 @@
<fileset dir="." includes="*.tga" />
<fileset dir="." includes="hs_err_pid*.log" />
<fileset file="${jogl-test.jar}" />
- <fileset file="${jogl-demos-mobile.jar}" />
+ <fileset file="${jogl-demos.jar}" />
</delete>
</target>
@@ -92,8 +92,9 @@
- Build/run tests/junit.
-->
- <target name="make.demos.mobile">
+ <target name="make.demos">
<javac destdir="${classes.demos}"
+ excludes="${java.part.demo.android} ${java.part.demo.oculusvr}"
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
@@ -106,7 +107,7 @@
<src path="${src.demos}" />
</javac>
<copy file="joglversion-test"
- tofile="${build.test}/manifest-demo-mobile.mf"
+ tofile="${build.test}/manifest-demo.mf"
overwrite="true">
<filterset>
<filter token="VERSION" value="${jogamp.version}"/>
@@ -123,46 +124,31 @@
<exclude name="**/*.java"/>
</fileset>
</copy>
- <jar manifest="${build.test}/manifest-demo-mobile.mf" destfile="${jogl-demos-mobile.jar}" filesonly="true">
+ <jar manifest="${build.test}/manifest-demo.mf" destfile="${jogl-demos.jar}" filesonly="true">
<fileset dir="${classes.demos}"
+ excludes="${java.part.demo.android}"
includes="**"/>
<fileset dir="resources/assets-test" includes="**" />
</jar>
</target>
- <target name="test.compile.javase.generic" unless="setup.noAWT">
- <javac destdir="${classes}"
- excludes="${java.part.test.android} ${java.part.test.oculusvr}"
- 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="junit_jogl_newt.compile.classpath"/>
- <src path="${src.test}" />
- </javac>
- </target>
- <target name="test.compile.javase.oculusvr" if="oculusvr.sdk.available">
- <javac destdir="${classes}"
- includes="${java.part.test.oculusvr}"
- excludes="${java.part.test.android}"
+
+ <target name="demo.compile.android" if="android-jars.available">
+ <!-- Perform the junit pass Java Android compile -->
+ <javac destdir="${classes.demos}"
+ excludes="${java.part.demo.oculusvr}"
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
encoding="UTF-8"
source="${target.sourcelevel}"
- target="${target.targetlevel}"
+ target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
- <classpath refid="junit_jogl_newt_oculusvr.compile.classpath"/>
- <src path="${src.test}" />
+ <classpath refid="junit_jogl_newt_android.compile.classpath"/>
+ <src path="${src.demos}" />
</javac>
- </target>
- <target name="test.compile.javase" depends="test.compile.javase.generic, test.compile.javase.oculusvr" unless="setup.noAWT">
- <copy file="joglversion-test"
- tofile="${build.test}/manifest-test.mf"
+ <copy file="joglversion-demo-android"
+ tofile="${build.test}/manifest-demo-android.mf"
overwrite="true">
<filterset>
<filter token="VERSION" value="${jogamp.version}"/>
@@ -170,23 +156,48 @@
<filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
<filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
- <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
</copy>
- <jar manifest="${build.test}/manifest-test.mf" destfile="${jogl-test.jar}" filesonly="true">
+ <jar manifest="${build.test}/manifest-demo-android.mf" destfile="${jogl-demo-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) -->
- <fileset dir="${classes}"
- includes="${java.part.test.all}"
- excludes="${java.part.test.android}"/>
+ <fileset dir="${classes.demos}"/>
<fileset dir="resources/assets-test" includes="**" />
</jar>
</target>
- <target name="test.compile.android" if="android-jars.available" unless="setup.noAWT">
- <!-- Perform the junit pass Java Android compile -->
+ <target name="demo.package.android" depends="demo.compile.android" if="isAndroid">
+ <aapt.signed
+ assetsdir="resources/assets-test"
+ jarsrcdir="${src}/demos"
+ jarbuilddir="${jar}"
+ jarbasename="jogl-demo-android"
+ nativebuilddir="${lib}"
+ nativebasename="non-existing"
+ androidmanifest.path="resources/android/AndroidManifest-demo.xml"
+ androidresources.path="resources/android/res-demo"
+ jarmanifest.path="${build.test}/manifest-demo-android.mf"
+ version.code="${jogamp.version.int}"
+ version.name="${jogamp.version}">
+ <d8-classpaths>
+ <arg line="--classpath ${gluegen-rt-android.jar}"/>
+ <arg line="--classpath ${joal.jar}"/>
+ <arg line="--classpath ${jogl-all-android.jar}"/>
+ <arg line="--classpath ${gluegen-test-util.jar}"/>
+ <arg line="--classpath ${junit.jar}"/>
+ <arg line="--classpath ${ant.jar}"/>
+ <arg line="--classpath ${ant-junit.jar}"/>
+ <arg line="--classpath ${ant-junit4.jar}"/>
+ <arg line="--classpath ${semver.jar}"/>
+ <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-base-11.jar"/>
+ <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar"/>
+ </d8-classpaths>
+ </aapt.signed>
+ </target>
+
+ <target name="test.compile.javase.generic" unless="setup.noAWT">
<javac destdir="${classes}"
excludes="${java.part.test.oculusvr}"
fork="yes"
@@ -194,14 +205,31 @@
memoryMaximumSize="${javac.memorymax}"
encoding="UTF-8"
source="${target.sourcelevel}"
- target="${target.targetlevel}"
+ target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
- <classpath refid="junit_jogl_newt_android.compile.classpath"/>
+ <classpath refid="junit_jogl_newt.compile.classpath"/>
<src path="${src.test}" />
</javac>
- <copy file="joglversion-test-android"
- tofile="${build.test}/manifest-test-android.mf"
+ </target>
+ <target name="test.compile.javase.oculusvr" if="oculusvr.sdk.available">
+ <javac destdir="${classes}"
+ includes="${java.part.test.oculusvr}"
+ 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="junit_jogl_newt_oculusvr.compile.classpath"/>
+ <src path="${src.test}" />
+ </javac>
+ </target>
+ <target name="test.compile.javase" depends="test.compile.javase.generic, test.compile.javase.oculusvr" unless="setup.noAWT">
+ <copy file="joglversion-test"
+ tofile="${build.test}/manifest-test.mf"
overwrite="true">
<filterset>
<filter token="VERSION" value="${jogamp.version}"/>
@@ -209,10 +237,11 @@
<filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
<filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
+ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
</copy>
- <jar manifest="${build.test}/manifest-test-android.mf" destfile="${jogl-test-android.jar}" filesonly="true">
+ <jar manifest="${build.test}/manifest-test.mf" destfile="${jogl-test.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) -->
@@ -222,35 +251,6 @@
</jar>
</target>
- <target name="test.package.android" depends="test.compile.android" if="isAndroid" unless="setup.noAWT">
- <aapt.signed
- assetsdir="resources/assets-test"
- jarsrcdir="${src}/test"
- jarbuilddir="${jar}"
- jarbasename="jogl-test-android"
- nativebuilddir="${lib}"
- nativebasename="non-existing"
- androidmanifest.path="resources/android/AndroidManifest-test.xml"
- androidresources.path="resources/android/res-test"
- jarmanifest.path="${build.test}/manifest-test-android.mf"
- version.code="${jogamp.version.int}"
- version.name="${jogamp.version}">
- <d8-classpaths>
- <arg line="--classpath ${gluegen-rt-android.jar}"/>
- <arg line="--classpath ${joal.jar}"/>
- <arg line="--classpath ${jogl-all-android.jar}"/>
- <arg line="--classpath ${gluegen-test-util.jar}"/>
- <arg line="--classpath ${junit.jar}"/>
- <arg line="--classpath ${ant.jar}"/>
- <arg line="--classpath ${ant-junit.jar}"/>
- <arg line="--classpath ${ant-junit4.jar}"/>
- <arg line="--classpath ${semver.jar}"/>
- <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-base-11.jar"/>
- <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar"/>
- </d8-classpaths>
- </aapt.signed>
- </target>
-
<target name="test.compile.check" depends="declare.common">
<!-- Create the required output directories. -->
<mkdir dir="${obj.test}" />
@@ -278,9 +278,9 @@
<exclude name="**/*.java"/>
</fileset>
</copy>
- <antcall target="make.demos.mobile" inheritRefs="true" inheritAll="true"/>
+ <antcall target="make.demos" inheritRefs="true" inheritAll="true"/>
+ <antcall target="demo.package.android" inheritRefs="true" inheritAll="true"/>
<antcall target="test.compile.javase" inheritRefs="true" inheritAll="true"/>
- <antcall target="test.package.android" inheritRefs="true" inheritAll="true"/>
</target>
<target name="test.manual.run" depends="test.compile, junit.run.settings">
diff --git a/make/joglversion-test-android b/make/joglversion-demo-android
index 18568fb45..18568fb45 100644
--- a/make/joglversion-test-android
+++ b/make/joglversion-demo-android
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-demo.xml
index dc500e794..8757b7cc3 100644
--- a/make/resources/android/AndroidManifest-test.xml
+++ b/make/resources/android/AndroidManifest-demo.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
sharedUserId="com.jogamp.Community"
- package="com.jogamp.opengl.test">
+ package="com.jogamp.opengl.demos">
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<uses-feature android:name="android.hardware.camera" android:required="false" />
@@ -19,7 +19,7 @@
android:persistent="false"
>
- <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2ActivityLauncher"
+ <activity android:name="com.jogamp.opengl.demos.android.NEWTGearsES2ActivityLauncher"
android:label="@string/activity_gearses2_name"
android:description="@string/activity_gearses2_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -29,7 +29,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2RGB565ActivityLauncher"
+ <activity android:name="com.jogamp.opengl.demos.android.NEWTGearsES2RGB565ActivityLauncher"
android:label="@string/activity_gearses2rgb565_name"
android:description="@string/activity_gearses2rgb565_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -39,7 +39,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2ECTActivityLauncher"
+ <activity android:name="com.jogamp.opengl.demos.android.NEWTGearsES2ECTActivityLauncher"
android:label="@string/activity_gearses2ect_name"
android:description="@string/activity_gearses2ect_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -49,18 +49,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES1ActivityLauncher"
- android:label="@string/activity_gearses1_name"
- android:description="@string/activity_gearses1_descr"
- android:theme="@android:style/Theme.NoDisplay"
- >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- <activity android:name="com.jogamp.opengl.test.android.NEWTRedSquareES2ActivityLauncher"
+ <activity android:name="com.jogamp.opengl.demos.android.NEWTRedSquareES2ActivityLauncher"
android:label="@string/activity_redsquarees2_name"
android:description="@string/activity_redsquarees2_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -70,18 +60,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.NEWTRedSquareES1ActivityLauncher"
- android:label="@string/activity_redsquarees1_name"
- android:description="@string/activity_redsquarees1_descr"
- android:theme="@android:style/Theme.NoDisplay"
- >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2TransActivityLauncher"
+ <activity android:name="com.jogamp.opengl.demos.android.NEWTGearsES2TransActivityLauncher"
android:label="@string/activity_gearses2t_name"
android:description="@string/activity_gearses2t_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -91,7 +71,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.NEWTGraphUI1pActivityLauncher"
+ <activity android:name="com.jogamp.opengl.demos.android.NEWTGraphUI1pActivityLauncher"
android:label="@string/activity_graphui1p_name"
android:description="@string/activity_graphui1p_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -101,7 +81,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.NEWTGraphUI2pActivityLauncher"
+ <activity android:name="com.jogamp.opengl.demos.android.NEWTGraphUI2pActivityLauncher"
android:label="@string/activity_graphui2p_name"
android:description="@string/activity_graphui2p_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -111,17 +91,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.NEWTElektronActivityLauncher"
- android:label="@string/activity_elektro_name"
- android:description="@string/activity_elektro_descr"
- android:theme="@android:style/Theme.NoDisplay"
- >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00b"
+ <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher00b"
android:label="@string/activity_moviesimple0b_name"
android:description="@string/activity_moviesimple_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -131,7 +101,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00c"
+ <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher00c"
android:label="@string/activity_moviesimple0c_name"
android:description="@string/activity_moviesimple_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -141,7 +111,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher01a"
+ <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher01a"
android:label="@string/activity_moviesimple1a_name"
android:description="@string/activity_moviesimple_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -151,7 +121,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher01b"
+ <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher01b"
android:label="@string/activity_moviesimple1b_name"
android:description="@string/activity_moviesimple_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -161,7 +131,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher02"
+ <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher02"
android:label="@string/activity_moviesimple2_name"
android:description="@string/activity_moviesimple_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -171,7 +141,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0a"
+ <activity android:name="com.jogamp.opengl.demos.android.MovieCubeActivityLauncher0a"
android:label="@string/activity_moviecube0a_name"
android:description="@string/activity_moviecube_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -181,7 +151,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0b"
+ <activity android:name="com.jogamp.opengl.demos.android.MovieCubeActivityLauncher0b"
android:label="@string/activity_moviecube0b_name"
android:description="@string/activity_moviecube_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -191,7 +161,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher1a"
+ <activity android:name="com.jogamp.opengl.demos.android.MovieCubeActivityLauncher1a"
android:label="@string/activity_moviecube1a_name"
android:description="@string/activity_moviecube_descr"
android:theme="@android:style/Theme.NoDisplay"
@@ -201,7 +171,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher1b"
+ <activity android:name="com.jogamp.opengl.demos.android.MovieCubeActivityLauncher1b"
android:label="@string/activity_moviecube1b_name"
android:description="@string/activity_moviecube_descr"
android:theme="@android:style/Theme.NoDisplay"
diff --git a/make/resources/android/res-test/drawable-hdpi/icon.png b/make/resources/android/res-demo/drawable-hdpi/icon.png
index 2148232c9..2148232c9 100644
--- a/make/resources/android/res-test/drawable-hdpi/icon.png
+++ b/make/resources/android/res-demo/drawable-hdpi/icon.png
Binary files differ
diff --git a/make/resources/android/res-test/drawable-ldpi/icon.png b/make/resources/android/res-demo/drawable-ldpi/icon.png
index c16211f36..c16211f36 100644
--- a/make/resources/android/res-test/drawable-ldpi/icon.png
+++ b/make/resources/android/res-demo/drawable-ldpi/icon.png
Binary files differ
diff --git a/make/resources/android/res-test/drawable-mdpi/icon.png b/make/resources/android/res-demo/drawable-mdpi/icon.png
index 1c26e3f83..1c26e3f83 100644
--- a/make/resources/android/res-test/drawable-mdpi/icon.png
+++ b/make/resources/android/res-demo/drawable-mdpi/icon.png
Binary files differ
diff --git a/make/resources/android/res-test/drawable-xhdpi/icon.png b/make/resources/android/res-demo/drawable-xhdpi/icon.png
index 7e9d5ba83..7e9d5ba83 100644
--- a/make/resources/android/res-test/drawable-xhdpi/icon.png
+++ b/make/resources/android/res-demo/drawable-xhdpi/icon.png
Binary files differ
diff --git a/make/resources/android/res-test/layout/main.xml b/make/resources/android/res-demo/layout/main.xml
index 3a5f117d3..3a5f117d3 100644
--- a/make/resources/android/res-test/layout/main.xml
+++ b/make/resources/android/res-demo/layout/main.xml
diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-demo/values/strings.xml
index 0d9acaadb..0d9acaadb 100644
--- a/make/resources/android/res-test/values/strings.xml
+++ b/make/resources/android/res-demo/values/strings.xml
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index a20a0f9fd..61738d6e5 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -45,8 +45,8 @@ if [ $MOSX -eq 1 ] ; then
fi
# We use TempJarCache and JAR files per default now!
-export USE_BUILDDIR=0
-#export USE_BUILDDIR=1
+#export USE_BUILDDIR=0
+export USE_BUILDDIR=1
if [ $USE_BUILDDIR -eq 1 ] ; then
export LD_LIBRARY_PATH=$JOGAMP_LD_LIBRARY_PATH
@@ -401,7 +401,7 @@ function jrun() {
else
#export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH
export USE_CLASSPATH=$JOGAMP_ALL_NOAWT_CLASSPATH
- #export USE_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILDDIR/jar/atomic/jogl.jar:$JOGL_BUILDDIR/jar/atomic/jogl-gldesktop.jar:$JOGL_BUILDDIR/jar/atomic/jogl-os-x11.jar:$JOGL_BUILDDIR/jar/atomic/jogl-util.jar:$JOGL_BUILDDIR/jar/atomic/nativewindow.jar:$JOGL_BUILDDIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILDDIR/jar/atomic/newt.jar:$JOGL_BUILDDIR/jar/atomic/newt-driver-x11.jar:$JOGL_BUILDDIR/jar/atomic/newt-ogl.jar:$JOGL_BUILDDIR/jar/jogl-test.jar:$JUNIT_JAR:$ANT_JARS
+ #export USE_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILDDIR/jar/atomic/jogl.jar:$JOGL_BUILDDIR/jar/atomic/jogl-gldesktop.jar:$JOGL_BUILDDIR/jar/atomic/jogl-os-x11.jar:$JOGL_BUILDDIR/jar/atomic/jogl-util.jar:$JOGL_BUILDDIR/jar/atomic/nativewindow.jar:$JOGL_BUILDDIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILDDIR/jar/atomic/newt.jar:$JOGL_BUILDDIR/jar/atomic/newt-driver-x11.jar:$JOGL_BUILDDIR/jar/atomic/newt-ogl.jar:$JOGL_BUILDDIR/jar/jogl-test.jar:$JOGL_BUILDDIR/jar/jogl-demos.jar:$JUNIT_JAR:$ANT_JARS
X_ARGS="-Djava.awt.headless=true $X_ARGS"
fi
# StartFlightRecording: delay=10s,
@@ -412,7 +412,7 @@ function jrun() {
# X_ARGS="-XX:StartFlightRecording=delay=10s,dumponexit=true,filename=java-run.jfr $X_ARGS"
if [ $USE_BUILDDIR -eq 1 ] ; then
- export USE_CLASSPATH=.:$GLUEGEN_BUILDDIR/classes:$GLUEGEN_BUILDDIR/test/build/classes:$JOAL_BUILDDIR/classes:$JOGL_BUILDDIR/nativewindow/classes:$JOGL_BUILDDIR/jogl/classes:$JOGL_BUILDDIR/newt/classes:$JOGL_BUILDDIR/oculusvr/classes:$JOGL_BUILDDIR/test/build/classes:$JUNIT_JAR:$ANT_JARS
+ export USE_CLASSPATH=.:$GLUEGEN_BUILDDIR/classes:$GLUEGEN_BUILDDIR/test/build/classes:$JOAL_BUILDDIR/classes:$JOGL_BUILDDIR/nativewindow/classes:$JOGL_BUILDDIR/jogl/classes:$JOGL_BUILDDIR/newt/classes:$JOGL_BUILDDIR/graphui/classes:$JOGL_BUILDDIR/oculusvr/classes:$JOGL_BUILDDIR/test/build/classes:$JOGL_BUILDDIR/demos/build/classes:$JUNIT_JAR:$ANT_JARS
fi
if [ $swton -eq 1 ] ; then
@@ -508,8 +508,8 @@ function testawtswt() {
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestGLCanvasSWTNewtCanvasSWTPosInTabs $*
#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtDemo $*
-#testawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtCanvasAWTDemo $*
+#testnoawt com.jogamp.opengl.demos.graph.ui.GPUUISceneNewtDemo $*
+#testawt com.jogamp.opengl.demos.graph.ui.GPUUISceneNewtCanvasAWTDemo $*
#testawt com.jogamp.opengl.test.junit.jogl.awt.ManualHiDPIBufferedImage01AWT $*
#
@@ -544,9 +544,9 @@ function testawtswt() {
# av demos
#
#testnoawt jogamp.opengl.openal.av.ALDummyUsage $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.CrossFadePlayer $*
+#testnoawt com.jogamp.opengl.demos.av.MovieCube $*
+#testnoawt com.jogamp.opengl.demos.av.MovieSimple $*
+#testnoawt com.jogamp.opengl.demos.av.CrossFadePlayer $*
#
# performance tests
@@ -961,15 +961,16 @@ function testawtswt() {
#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $*
#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $*
#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo $*
-#testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.UIShapeDemo01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.UITypeDemo01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtDemo $*
-#testawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtCanvasAWTDemo $*
-
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
+
+#testnoawt com.jogamp.opengl.demos.graph.GPUTextNewtDemo $*
+#testnoawt com.jogamp.opengl.demos.graph.GPURegionNewtDemo $*
+#testnoawt com.jogamp.opengl.demos.graph.ui.UIShapeDemo01 $*
+#testnoawt com.jogamp.opengl.demos.graph.ui.UITypeDemo01 $*
+#testnoawt com.jogamp.opengl.demos.graph.ui.GPUUISceneNewtDemo $*
+
+#testnoawt com.jogamp.opengl.demos.av.MovieCube $*
+#testnoawt com.jogamp.opengl.demos.av.MovieSimple $*
+
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLReadBuffer01GLWindowNEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT1 $*
@@ -980,7 +981,6 @@ function testawtswt() {
# GLDrawableFactory.createDummyAutoDrawable(..)
#
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT1 $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
# GLDrawableFactory.createOffscreenDrawable(..)
#
@@ -997,11 +997,16 @@ function testawtswt() {
#
#testmobile com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 $*
#testnoawt com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 $*
-#testmobile com.jogamp.opengl.test.junit.graph.ui.demos.GPUTextNewtDemo $*
-#testmobile com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtDemo $*
-testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtDemo $*
-#testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $*
-#testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
+
+#testnoawt com.jogamp.opengl.demos.graph.GPUTextNewtDemo $*
+#testnoawt com.jogamp.opengl.demos.graph.GPURegionNewtDemo $*
+#testnoawt com.jogamp.opengl.demos.graph.ui.UIShapeDemo01 $*
+#testnoawt com.jogamp.opengl.demos.graph.ui.UITypeDemo01 $*
+testnoawt com.jogamp.opengl.demos.graph.ui.GPUUISceneNewtDemo $*
+
+#testnoawt com.jogamp.opengl.demos.av.MovieCube $*
+#testnoawt com.jogamp.opengl.demos.av.MovieSimple $*
+
#testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
#testmobile com.jogamp.opengl.test.junit.jogl.acore.TestGLProfileXXNEWTPost $*
#testmobile com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $*
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 13:30:13 +0000