From d2b2dcc11da294d2b4eef92d4d53345e8a502143 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 17 Jun 2023 22:26:31 -0400 Subject: [PATCH] only:Split ConfigGenerator around trigger_defines.txt #5051 --- firmware/gen_live_documentation.sh | 4 ++-- java_tools/configuration_definition_base/build.gradle | 8 ++++++++ .../src/main/java/com/rusefi/ReaderStateImpl.java | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/firmware/gen_live_documentation.sh b/firmware/gen_live_documentation.sh index 5b2eec5504..7b2ab04d1f 100755 --- a/firmware/gen_live_documentation.sh +++ b/firmware/gen_live_documentation.sh @@ -3,12 +3,12 @@ rm gen_live_documentation.log cd ../java_tools -./gradlew :config_definition:shadowJar +./gradlew :config_definition_base:shadowJar ./gradlew :enum_to_string:shadowJar cd ../firmware java -DSystemOut.name=logs/gen_live_documentation \ - -cp ../java_tools/configuration_definition/build/libs/config_definition.jar \ + -cp ../java_tools/configuration_definition_base/build/libs/config_definition_base.jar \ com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml [ $? -eq 0 ] || { echo "ERROR generating"; exit 1; } diff --git a/java_tools/configuration_definition_base/build.gradle b/java_tools/configuration_definition_base/build.gradle index 5c30de3258..35517c5fb2 100644 --- a/java_tools/configuration_definition_base/build.gradle +++ b/java_tools/configuration_definition_base/build.gradle @@ -1,10 +1,18 @@ plugins { id 'java-library' + id 'com.github.johnrengelman.shadow' version "${shadowVersion}" } apply from: '../../java_tools/dependencies.gradle' +defaultTasks 'shadowJar' + dependencies { api project(':inifile') api project(':enum_to_string') + api global_libs.snakeyaml } + +shadowJar { + archiveClassifier = '' +} \ No newline at end of file diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java index d55cc0eac3..3e54a833cd 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java @@ -101,7 +101,7 @@ public class ReaderStateImpl implements ReaderState { * this is the most important invocation - here we read the primary input file and generated code into all * the destinations/writers */ - SystemOut.println("Reading definition from " + definitionInputFile); + SystemOut.println("Reading definition from " + Objects.requireNonNull(definitionInputFile)); BufferedReader definitionReader = new BufferedReader(new InputStreamReader(new FileInputStream(RootHolder.ROOT + definitionInputFile), IoUtils.CHARSET.name())); readBufferedReader(definitionReader, destinations);