only:Improve toolset for default tune canned tune generation #4871

.github/workflows/build-simulator.yaml

@@ -27,7 +27,7 @@ jobs:
 
     - name: Gradle edition of java console
       working-directory: ./java_tools
-      run: ./gradlew :ui:shadowJar
+      run: ./gradlew shadowJar
 
     - name: Print GCC version
       working-directory: .

java_tools/tune-tools/build.gradle

@@ -1,8 +1,14 @@
 plugins {
     id 'java-library'
+    id 'com.github.johnrengelman.shadow' version "${shadowVersion}"
 }
 
 dependencies {
     api project(':config_definition')
     api project(':ecu_io')
+}
+
+shadowJar {
+    dependsOn(':enum_to_string:shadowJar')
+    archiveClassifier = ''
 }

java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java

@@ -1,4 +1,4 @@
-package com.rusefi.tools;
+package com.rusefi.tools.tune;
 
 import com.opensr5.ConfigurationImage;
 import com.opensr5.ini.IniFileModel;
@@ -15,7 +15,6 @@ import java.util.Objects;
 public class WriteSimulatorConfiguration {
     // f407-discovery is historically the most inclusive .ini file
     public static final String INI_FILE_FOR_SIMULATOR = "../firmware/tunerstudio/generated/rusefi_f407-discovery.ini";
-    private static final String FOLDER = "generated";
 
     public static void main(String[] args) throws IOException, InterruptedException, JAXBException {
         try {
@@ -39,6 +38,6 @@ public class WriteSimulatorConfiguration {
         if (ini == null)
             throw new IllegalStateException("Not found " + INI_FILE_FOR_SIMULATOR);
         Msq m = MsqFactory.valueOf(configuration, ini);
-        m.writeXmlFile(FOLDER + File.separator + "simulator_tune.xml");
+        m.writeXmlFile(TuneCanTool.DEFAULT_TUNE);
     }
 }

java_tools/tune-tools/src/test/java/com/rusefi/tune/LoadOlderTuneTest.java

@@ -5,6 +5,7 @@ import com.opensr5.ini.IniFileModel;
 import com.rusefi.*;
 import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.output.ConfigStructure;
+import com.rusefi.tools.tune.TuneCanTool;
 import com.rusefi.tools.tune.TuneTools;
 import com.rusefi.tune.xml.Constant;
 import com.rusefi.tune.xml.Msq;
@@ -27,7 +28,7 @@ public class LoadOlderTuneTest {
         Page dataPage = customOldTune.findPage();
         assertFalse(dataPage.constant.isEmpty());
 
-        Msq lessOldDefaultTune = Msq.readTune(TuneReadWriteTest.SRC_TEST_RESOURCES + "simulator_tune-2023-06.xml");
+        Msq lessOldDefaultTune = Msq.readTune(TuneCanTool.SRC_TEST_RESOURCES + "simulator_tune-2023-06.xml");
 
         IniFileModel ini = new IniFileModel().readIniFile(TuneReadWriteTest.TEST_INI);
         assertFalse(ini.fieldsInUiOrder.isEmpty());

java_tools/tune-tools/src/test/java/com/rusefi/tune/TuneReadWriteTest.java

@@ -7,6 +7,7 @@ import com.opensr5.io.ConfigurationImageFile;
 import com.rusefi.binaryprotocol.MsqFactory;
 import com.rusefi.tools.tune.CurveData;
 import com.rusefi.tools.tune.TS2C;
+import com.rusefi.tools.tune.TuneCanTool;
 import com.rusefi.tune.xml.Constant;
 import com.rusefi.tune.xml.Msq;
 import org.junit.Assert;
@@ -19,8 +20,7 @@ import java.nio.file.Path;
 import static org.junit.Assert.*;
 
 public class TuneReadWriteTest {
-    public static final String SRC_TEST_RESOURCES = "src/test/resources/";
-    private static final String PATH = SRC_TEST_RESOURCES + "frankenso/";
+    private static final String PATH = TuneCanTool.SRC_TEST_RESOURCES + "frankenso/";
     static final String TUNE_NAME = PATH + "test-CurrentTune.msq";
     static final String TEST_INI = PATH + "test-mainController.ini";
     private static final String TEST_BINARY_FILE = PATH + "current_configuration.rusefi_binary";

simulator/write_tune.sh

@@ -1 +1 @@
-java -cp ../java_console/ui/build/libs/rusefi_console.jar com.rusefi.tools.WriteSimulatorConfiguration
+java -cp ../java_tools/tune-tools/build/libs/tune-tools.jar com.rusefi.tools.tune.WriteSimulatorConfiguration