From 0333b8e738c3c5663532194bc3ec594171d746b0 Mon Sep 17 00:00:00 2001 From: Stephanie Gawroriski Date: Sun, 5 Feb 2023 21:19:36 +0000 Subject: [PATCH] Remove clashing error prefix; Use better name for RatufaCoat ROMs. --- .../java/cc/squirreljme/plugin/multivm/RatufaCoatBuiltInTask.java | 2 +- .../java/cc/squirreljme/plugin/multivm/VMCompactLibraryTask.java | 6 ++++++ .../cc/squirreljme/plugin/multivm/VMCompactLibraryTaskAction.java | 4 +++- modules/json/build.gradle | 2 +- modules/nokia-api/build.gradle | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/RatufaCoatBuiltInTask.java b/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/RatufaCoatBuiltInTask.java index e939910fc4..fa3f39e6ff 100644 --- a/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/RatufaCoatBuiltInTask.java +++ b/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/RatufaCoatBuiltInTask.java @@ -88,6 +88,6 @@ public class RatufaCoatBuiltInTask return this.getProject().provider(() -> this.getProject().getRootDir() .toPath().resolve("ratufacoat").resolve("build") .resolve(TaskInitialization.task( - "builtin", this.classifier.getSourceSet()) + ".c")); + "builtin", this.classifier) + ".c")); } } diff --git a/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTask.java b/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTask.java index 85542f9de0..cec590aa35 100644 --- a/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTask.java +++ b/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTask.java @@ -92,6 +92,12 @@ public class VMCompactLibraryTask SquirrelJMEPluginConfiguration.configuration(project) .noShrinking))); + // Error code that is used for the prefix + this.getInputs().property("squirreljme.javaDocErrorCode", + this.getProject().provider(() -> Objects.toString( + SquirrelJMEPluginConfiguration.configuration(project) + .javaDocErrorCode))); + // Also include the built-in plugin options, in case those change as // well! this.getInputs().property("squirreljme.proguardOptionsDefault", diff --git a/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTaskAction.java b/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTaskAction.java index 2b8cfab972..56a284489e 100644 --- a/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTaskAction.java +++ b/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTaskAction.java @@ -234,7 +234,9 @@ public class VMCompactLibraryTaskAction // this time config.shrink = false; config.optimize = false; - config.flattenPackageHierarchy = "$"; + config.flattenPackageHierarchy = "$" + + (projectConfig.javaDocErrorCode == null ? "??" : + projectConfig.javaDocErrorCode); // For mapping files, members do need to be unique config.useUniqueClassMemberNames = true; diff --git a/modules/json/build.gradle b/modules/json/build.gradle index 8c8659e052..8168dce5c8 100644 --- a/modules/json/build.gradle +++ b/modules/json/build.gradle @@ -9,7 +9,7 @@ version = rootProject.version squirreljme { - javaDocErrorCode = "DG" + javaDocErrorCode = "JS" swmType = JavaMEMidletType.API swmName = "JSON API" swmVendor = "Stephanie Gawroriski" diff --git a/modules/nokia-api/build.gradle b/modules/nokia-api/build.gradle index e509733433..20d81b553e 100644 --- a/modules/nokia-api/build.gradle +++ b/modules/nokia-api/build.gradle @@ -5,7 +5,7 @@ version = rootProject.version squirreljme { - javaDocErrorCode = "AI" + javaDocErrorCode = "NO" swmType = JavaMEMidletType.API swmName = "Nokia API" swmVendor = "Stephanie Gawroriski" -- 2.11.4.GIT