Rename GLES worker. Rename GLES/vulkan worker outputs. (#126)

Author: paulthomson

build/ci_vulkan_worker/2-build-travis.sh

@@ -25,6 +25,6 @@ popd
 find vulkan-worker/src/android/build/outputs/
 
 mkdir -p out
-cp vulkan-worker/src/android/build/outputs/apk/debug/android-debug.apk out/android-vulkan-worker.apk
+cp vulkan-worker/src/android/build/outputs/apk/debug/vulkan-worker-android-debug.apk out/vulkan-worker-android-debug.apk
 
 find out/

build/travis/build.py

@@ -95,16 +95,16 @@ def go():
 
     source_root = os.path.abspath(".")
 
-    os.chdir(path("platforms", "libgdx", "OGLTesting"))
+    os.chdir(path("gles-worker"))
 
     # Build desktop worker.
     subprocess.check_call(
         ["./gradlew", "desktop:dist"])
 
     # Copy desktop worker.
     shutil.copy2(
-        path("desktop", "build", "libs", "desktop-1.0.jar"),
-        path(source_root, "out", "desktop-gles-worker.jar")
+        path("desktop", "build", "libs", "gles-worker-desktop-1.0.jar"),
+        path(source_root, "out", "gles-worker-desktop-1.0.jar")
     )
 
     # Build Android worker
@@ -113,8 +113,8 @@ def go():
 
     # Copy Android worker.
     shutil.copy2(
-        path("android", "build", "outputs", "apk", "debug", "android-debug.apk"),
-        path(source_root, "out", "android-gles-worker.apk")
+        path("android", "build", "outputs", "apk", "debug", "gles-worker-android-debug.apk"),
+        path(source_root, "out", "gles-worker-android-debug.apk")
     )
 
     os.chdir(source_root)

build/travis/check_headers.py

@@ -41,12 +41,12 @@ def exclude_dirpath(f: str):
     return \
         f.startswith("./vulkan-worker/build") or \
         f in [
-            "./platforms/libgdx/OGLTesting/build",
-            "./platforms/libgdx/OGLTesting/android/build",
-            "./platforms/libgdx/OGLTesting/android/libs",
-            "./platforms/libgdx/OGLTesting/core/build",
-            "./platforms/libgdx/OGLTesting/desktop/build",
-            "./platforms/libgdx/OGLTesting/gradle/wrapper",
+            "./gles-worker/build",
+            "./gles-worker/android/build",
+            "./gles-worker/android/libs",
+            "./gles-worker/core/build",
+            "./gles-worker/desktop/build",
+            "./gles-worker/gradle/wrapper",
             "./build/licenses",
             "./vulkan-worker/src/android/build",
 
@@ -77,16 +77,16 @@ def exclude_filepath(f: str):
         f in [
             "./graphicsfuzz/src/main/scripts/server-static/shaders/shader.vert",
             "./server-static-public/src/main/files/server-static/runner_multi_template.html",
-            "./platforms/libgdx/OGLTesting/build.gradle",
-            "./platforms/libgdx/OGLTesting/gradle.properties",
-            "./platforms/libgdx/OGLTesting/settings.gradle",
-            "./platforms/libgdx/OGLTesting/android/build.gradle",
-            "./platforms/libgdx/OGLTesting/android/proguard-project.txt",
-            "./platforms/libgdx/OGLTesting/android/project.properties",
-            "./platforms/libgdx/OGLTesting/core/build.gradle",
-            "./platforms/libgdx/OGLTesting/desktop/build.gradle",
-            "./platforms/libgdx/OGLTesting/ios/build.gradle",
-            "./platforms/libgdx/OGLTesting/ios/robovm.properties",
+            "./gles-worker/build.gradle",
+            "./gles-worker/gradle.properties",
+            "./gles-worker/settings.gradle",
+            "./gles-worker/android/build.gradle",
+            "./gles-worker/android/proguard-project.txt",
+            "./gles-worker/android/project.properties",
+            "./gles-worker/core/build.gradle",
+            "./gles-worker/desktop/build.gradle",
+            "./gles-worker/ios/build.gradle",
+            "./gles-worker/ios/robovm.properties",
             "./mvnw",
             "./mvnw.cmd"
 

client-tests/src/test/java/com/graphicsfuzz/clienttests/DesktopClientTest.java

@@ -105,8 +105,8 @@ private static String getClientJar() throws URISyntaxException {
         .getCodeSource()
         .getLocation()
         .toURI()).getAbsoluteFile().getParentFile();
-    return Paths.get(ToolPaths.getSourceRoot(file), "platforms", "libgdx",
-        "OGLTesting", "desktop", "build", "libs", "desktop-1.0.jar").toString();
+    return Paths.get(ToolPaths.getSourceRoot(file), "gles-worker",
+        "desktop", "build", "libs", "gles-worker-desktop-1.0.jar").toString();
   }
 
   @Test

android-client-dep/pom.xml gles-worker-dependencies/pom.xml

@@ -18,9 +18,17 @@ limitations under the License.
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>android-client-dep</artifactId>
-  <name>android-client-dep</name>
+  <artifactId>gles-worker-dependencies</artifactId>
+  <name>gles-worker-dependencies</name>
   <packaging>jar</packaging>
+  <description>
+    A shaded jar (uber jar) containing Java dependencies needed for the gles-worker. This includes
+    some dependencies from the main GraphicsFuzz Maven build, plus repackaged third-party Java
+    libraries. The repackaged third-party classes have a prefix added to their package names
+    (e.g. com.graphicsfuzz.repackaged.org.apache) to guarantee that they won't conflict with any
+    Java libraries that already exist on Android. We also compile at source level 1.6 for Android
+    compatibility, although this may no longer be necessary with recent Android SDKs.
+  </description>
 
   <parent>
     <groupId>com.graphicsfuzz</groupId>

android-client-dep/src/main/java/.gitignore gles-worker-dependencies/src/main/java/.gitignore

@@ -17,7 +17,7 @@ limitations under the License.
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.graphicsfuzz.libgdxclient"
+    package="com.graphicsfuzz.glesworker"
     android:versionCode="1"
     android:versionName="1.0" >
 

android-client-dep/src/main/resources/empty/.gitignore gles-worker-dependencies/src/main/resources/empty/.gitignore

@@ -16,6 +16,8 @@ apply plugin: "com.android.application"
 
 configurations { natives }
 
+assert file("../../gles-worker-dependencies/target/gles-worker-dependencies-1.0.jar").exists()
+
 dependencies {
     implementation project(":core")
     implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
@@ -25,18 +27,19 @@ dependencies {
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
     implementation "com.android.support:appcompat-v7:23.4.0"
-    implementation files("../../../../android-client-dep/target/android-client-dep-1.0.jar")
+    implementation files("../../gles-worker-dependencies/target/gles-worker-dependencies-1.0.jar")
 }
 
 android {
     compileSdkVersion 26
 
     defaultConfig {
-        applicationId "com.graphicsfuzz.libgdxclient"
+        applicationId "com.graphicsfuzz.glesworker"
         minSdkVersion 24
         targetSdkVersion 26
         versionCode  1
         versionName '0.0.1'
+        setProperty("archivesBaseName", "gles-worker-android")
     }
     buildTypes {
         release {

android-client-dep/src/test/java/.gitignore gles-worker-dependencies/src/test/java/.gitignore

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import android.content.Intent;
 import android.os.Build;
@@ -32,7 +32,7 @@
 
 public class AndroidLauncher extends AndroidApplication {
 
-	Main main = null;
+	com.graphicsfuzz.glesworker.Main main = null;
 	private static final boolean USE_GLES3 = true;
 	private static final boolean STANDALONE = false;
 

platforms/libgdx/OGLTesting/.gitignore gles-worker/.gitignore

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import android.content.Context;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.RandomAccessFile;

platforms/libgdx/OGLTesting/android/AndroidManifest.xml gles-worker/android/AndroidManifest.xml

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import android.opengl.GLES30;
+
 import java.nio.ByteBuffer;
 
 public class AndroidProgramBinaryGetter implements IProgramBinaryGetter {

platforms/libgdx/OGLTesting/android/build.gradle gles-worker/android/build.gradle

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningTaskInfo;
@@ -114,7 +114,7 @@ public void run() {
         boolean foundOurTask = false;
 
         for(RunningTaskInfo i: activityManager.getRunningTasks(Integer.MAX_VALUE)) {
-          if("com.graphicsfuzz.libgdxclient.AndroidLauncher"
+          if("AndroidLauncher"
               .equals(i.baseActivity.getClassName())) {
             activityManager.moveTaskToFront(i.id, ActivityManager.MOVE_TASK_WITH_HOME);
             foundOurTask = true;

platforms/libgdx/OGLTesting/android/ic_launcher-web.png gles-worker/android/ic_launcher-web.png

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import android.os.Process;
 import android.util.Log;
+
 import java.util.concurrent.TimeUnit;
 
 public class AndroidWatchdog implements IWatchdog {

platforms/libgdx/OGLTesting/android/proguard-project.txt gles-worker/android/proguard-project.txt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import android.app.Activity;
 import android.content.Intent;

platforms/libgdx/OGLTesting/android/res/drawable-hdpi/gfz_icon.png gles-worker/android/res/drawable-hdpi/gfz_icon.png

@@ -2,7 +2,7 @@
 allprojects {
     version = '1.0'
     ext {
-        appName = "libgdxclient"
+        appName = "glesworker"
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.5'
         box2DLightsVersion = '1.4'
@@ -20,8 +20,6 @@ allprojects {
     }
 }
 
-assert file("../../../android-client-dep/target/android-client-dep-1.0.jar").exists()
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

platforms/libgdx/OGLTesting/android/res/drawable-ldpi/gfz_icon.png gles-worker/android/res/drawable-ldpi/gfz_icon.png

@@ -1,8 +1,10 @@
 apply plugin: "java"
 
+assert file("../../gles-worker-dependencies/target/gles-worker-dependencies-1.0.jar").exists()
+
 dependencies {
     implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
-    implementation files("../../../../android-client-dep/target/android-client-dep-1.0.jar")
+    implementation files("../../gles-worker-dependencies/target/gles-worker-dependencies-1.0.jar")
     implementation "ar.com.hjg:pngj:2.1.0"
 }
 

platforms/libgdx/OGLTesting/android/res/drawable-mdpi/gfz_icon.png gles-worker/android/res/drawable-mdpi/gfz_icon.png

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import java.util.ArrayDeque;
 

platforms/libgdx/OGLTesting/android/res/drawable-xhdpi/gfz_icon.png gles-worker/android/res/drawable-xhdpi/gfz_icon.png

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import com.badlogic.gdx.Gdx;
 import com.graphicsfuzz.repackaged.com.google.gson.JsonObject;

platforms/libgdx/OGLTesting/android/res/drawable-xxhdpi/gfz_icon.png gles-worker/android/res/drawable-xxhdpi/gfz_icon.png

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 public class Constants
 {

platforms/libgdx/OGLTesting/android/res/drawable-xxxhdpi/gfz_icon.png gles-worker/android/res/drawable-xxxhdpi/gfz_icon.png

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 public class GetPNGException extends Exception {
 
-  public GetPNGException(GlErrorException ex) {
+  public GetPNGException(com.graphicsfuzz.glesworker.GlErrorException ex) {
     super(ex);
   }
 
   @Override
-  public synchronized GlErrorException getCause() {
+  public synchronized com.graphicsfuzz.glesworker.GlErrorException getCause() {
     return (GlErrorException) super.getCause();
   }
 }

platforms/libgdx/OGLTesting/android/res/values/strings.xml gles-worker/android/res/values/strings.xml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 public class GlErrorException extends Exception {
   public final int glError;

platforms/libgdx/OGLTesting/android/res/values/styles.xml gles-worker/android/res/values/styles.xml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 public interface IPersistentFile {
 

platforms/libgdx/OGLTesting/android/src/com/graphicsfuzz/libgdxclient/AndroidLauncher.java gles-worker/android/src/com/graphicsfuzz/glesworker/AndroidLauncher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import java.nio.ByteBuffer;
 

platforms/libgdx/OGLTesting/android/src/com/graphicsfuzz/libgdxclient/AndroidPersistentFile.java gles-worker/android/src/com/graphicsfuzz/glesworker/AndroidPersistentFile.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 public interface IWatchdog {
 

platforms/libgdx/OGLTesting/android/src/com/graphicsfuzz/libgdxclient/AndroidProgramBinaryGetter.java gles-worker/android/src/com/graphicsfuzz/glesworker/AndroidProgramBinaryGetter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.utils.Disposable;

platforms/libgdx/OGLTesting/android/src/com/graphicsfuzz/libgdxclient/AndroidService.java gles-worker/android/src/com/graphicsfuzz/glesworker/AndroidService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.graphicsfuzz.libgdxclient;
+package com.graphicsfuzz.glesworker;
 
 public enum JobType {