only:Split ConfigGenerator around trigger_defines.txt #5051

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; }
 

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 = ''
+}

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);