add useDefaultHtmlIndex and logoPath

CHANGES.md

@@ -5,6 +5,7 @@
 - Update teavm to 0.10.0-dev-1
 - Update libgdx to 1.12.1
 - Remove obfuscate from build config. Use TeaVMTool.
+- Add useDefaultHtmlIndex and logoPath config option.
 
 [1.0.0-b7]
 - Remove jParser

backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaBuildConfiguration.java

@@ -35,15 +35,15 @@ public class TeaBuildConfiguration {
     public String htmlTitle = "gdx-teavm";
     public int htmlWidth = 800;
     public int htmlHeight = 600;
-    /**
-     * If the logo is shown while the application is loading.
-     */
+
+    /** True to use the default html index. False will stop overwriting html file. */
+    public boolean useDefaultHtmlIndex = true;
+
+    /** If the logo is shown while the application is loading. Requires showLoadingLogo true. */
     public boolean showLoadingLogo = true;
 
-    /**
-     * Logo asset path.
-     */
-    public String logo = "startup-logo.png";
+    /** Logo asset path. Requires showLoadingLogo true. */
+    public String logoPath = "startup-logo.png";
 
     public String getHtmlTitle() {
         return htmlTitle;
@@ -61,6 +61,10 @@ public boolean isShowLoadingLogo() {
       return showLoadingLogo;
     }
 
+    public boolean shouldUseDefaultHtmlIndex() {
+      return useDefaultHtmlIndex;
+    }
+
     public String getMainClass() {
         return mainClass;
     }
@@ -126,6 +130,6 @@ public boolean acceptClasspath(URL url) {
     }
 
     public String getLogoPath() {
-        return logo;
+        return logoPath;
     }
 }

backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaBuilder.java

@@ -533,36 +533,42 @@ public static void configAssets(TeaClassLoader classLoader, TeaBuildConfiguratio
         webappAssetsFiles.add(webappName);
         TeaBuilder.logHeader("COPYING ASSETS");
 
-        AssetsCopy.copy(classLoader, webappAssetsFiles, new ArrayList<>(), null, webappDirectory, false);
-        TeaBuilder.log("");
+        boolean shouldUseDefaultHtmlIndex = configuration.shouldUseDefaultHtmlIndex();
+        if(shouldUseDefaultHtmlIndex) {
+            AssetsCopy.copy(classLoader, webappAssetsFiles, new ArrayList<>(), null, webappDirectory, false);
+            TeaBuilder.log("");
+        }
 
         String scriptsOutputPath = webappDirectory + File.separator + webappName;
         String assetsOutputPath = scriptsOutputPath + File.separator + "assets";
 
-        File indexFile = new File(scriptsOutputPath + File.separator + "index.html");
-        FileHandle handler = new FileHandle(indexFile);
-        String indexHtmlStr = handler.readString();
-
-        String logo = configuration.getLogoPath();
-        String htmlLogo = "assets/" + logo;
-        boolean showLoadingLogo = configuration.isShowLoadingLogo();
-
-        indexHtmlStr = indexHtmlStr.replace("%TITLE%", configuration.getHtmlTitle());
-        indexHtmlStr = indexHtmlStr.replace("%WIDTH%", configuration.getHtmlWidth());
-        indexHtmlStr = indexHtmlStr.replace("%HEIGHT%", configuration.getHtmlHeight());
-        indexHtmlStr = indexHtmlStr.replace("%ARGS%", configuration.getMainClassArgs());
-        indexHtmlStr = indexHtmlStr.replace(
-                "%LOGO%", showLoadingLogo ? "<img id=\"progress-img\" src=\"" + htmlLogo + "\">" : ""
-        );
-
-        handler.writeString(indexHtmlStr, false);
-
         AssetFilter filter = configuration.assetFilter();
         ArrayList<File> assetsPaths = new ArrayList<>();
         ArrayList<String> classPathAssetsFiles = new ArrayList<>();
         assetsDefaultClasspath(classPathAssetsFiles);
-        if(showLoadingLogo) {
-            classPathAssetsFiles.add(logo);
+
+        if(shouldUseDefaultHtmlIndex) {
+            File indexFile = new File(scriptsOutputPath + File.separator + "index.html");
+            FileHandle handler = new FileHandle(indexFile);
+            String indexHtmlStr = handler.readString();
+
+            String logo = configuration.getLogoPath();
+            String htmlLogo = "assets/" + logo;
+            boolean showLoadingLogo = configuration.isShowLoadingLogo();
+
+            indexHtmlStr = indexHtmlStr.replace("%TITLE%", configuration.getHtmlTitle());
+            indexHtmlStr = indexHtmlStr.replace("%WIDTH%", configuration.getHtmlWidth());
+            indexHtmlStr = indexHtmlStr.replace("%HEIGHT%", configuration.getHtmlHeight());
+            indexHtmlStr = indexHtmlStr.replace("%ARGS%", configuration.getMainClassArgs());
+            indexHtmlStr = indexHtmlStr.replace(
+                    "%LOGO%", showLoadingLogo ? "<img id=\"progress-img\" src=\"" + htmlLogo + "\">" : ""
+            );
+
+            handler.writeString(indexHtmlStr, false);
+
+            if(showLoadingLogo) {
+                classPathAssetsFiles.add(logo);
+            }
         }
         ArrayList<String> additionalAssetClasspath = configuration.getAdditionalAssetClasspath();
         classPathAssetsFiles.addAll(additionalAssetClasspath);

examples/core/teavm/build.gradle

@@ -27,10 +27,9 @@ tasks.register("core-build", JavaExec) {
     setClasspath(sourceSets.main.runtimeClasspath)
 }
 tasks.register("core-run-teavm") {
-    dependsOn(["clean", "core-build", "jettyRun"])
+    dependsOn(["core-build", "jettyRun"])
     setGroup("examples-teavm")
     setDescription("Run Test Demo example")
 
-    tasks.findByName("core-build")?.mustRunAfter("clean")
     tasks.findByName("jettyRun")?.mustRunAfter("core-build")
 }

examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildTeaVMTestDemo.java

@@ -15,6 +15,7 @@ public static void main(String[] args) throws IOException {
         TeaBuildConfiguration teaBuildConfiguration = new TeaBuildConfiguration();
         teaBuildConfiguration.assetsPath.add(new File("../desktop/assets"));
         teaBuildConfiguration.webappPath = new File("build/dist").getCanonicalPath();
+        teaBuildConfiguration.logoPath = "logo.png";
 
         TeaVMTool tool = TeaBuilder.config(teaBuildConfiguration);
         tool.setMainClass(TeaVMTestLauncher.class.getName());