andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

local compilation should not dirty clone for not reason #6879 

only:verbose and narrower type
This commit is contained in:
rusefillc 2024-09-01 23:42:26 -04:00
parent 4739787ac9
commit 6a10620a2a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java
View File

@ -60,13 +60,14 @@ public class LiveDataProcessor {
System.err.println("Five arguments expected: name of live data yaml input file and else but got " + args.length + ": " + Arrays.toString(args)); System.err.println("Five arguments expected: name of live data yaml input file and else but got " + args.length + ": " + Arrays.toString(args));
System.exit(-1); System.exit(-1);
} }
log.info("Invoked with " + Arrays.toString(args));
String yamlFileNames = args[0]; String yamlFileNames = args[0];
String definitionInputFileName = args[1]; String definitionInputFileName = args[1];
String headerFileName = args[2]; String headerFileName = args[2];
String javaDestinationFileName = args[3]; String javaDestinationFileName = args[3];
String destinationFolder = args[4]; String destinationFolder = args[4];
TriggerMetaGenerator.doJob(definitionInputFileName, headerFileName, javaDestinationFileName); TriggerMetaGenerator.doJob(definitionInputFileName, headerFileName, javaDestinationFileName);
ArrayList<LinkedHashMap> totalContent = new ArrayList<>(); List<LinkedHashMap> totalContent = new ArrayList<>();
for (String fileName : yamlFileNames.split(",")) { for (String fileName : yamlFileNames.split(",")) {
ArrayList<LinkedHashMap> yamlContent = getStringObjectMap(new FileReader(fileName)); ArrayList<LinkedHashMap> yamlContent = getStringObjectMap(new FileReader(fileName));
totalContent.addAll(yamlContent); totalContent.addAll(yamlContent);
@ -128,7 +129,7 @@ public class LiveDataProcessor {
void onEntry(String name, String javaName, String folder, String prepend, boolean withCDefines, String[] outputNames, String constexpr, String conditional, String engineModule, Boolean isPtr, String cppFileName) throws IOException; void onEntry(String name, String javaName, String folder, String prepend, boolean withCDefines, String[] outputNames, String constexpr, String conditional, String engineModule, Boolean isPtr, String cppFileName) throws IOException;
} }
public int handleYaml(ArrayList<LinkedHashMap> liveDocs) throws IOException { public int handleYaml(List<LinkedHashMap> liveDocs) throws IOException {
AtomicInteger startingPosition = new AtomicInteger(); AtomicInteger startingPosition = new AtomicInteger();
OutputsSectionConsumer outputsSections = new OutputsSectionConsumer(getOutputsSectionFileName(), OutputsSectionConsumer outputsSections = new OutputsSectionConsumer(getOutputsSectionFileName(),

3
java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java
View File

@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List;
import static com.rusefi.AssertCompatibility.assertEquals; import static com.rusefi.AssertCompatibility.assertEquals;
@ -29,7 +30,7 @@ public class LiveDataProcessorTest {
; ;
ArrayList<LinkedHashMap> data = LiveDataProcessor.getStringObjectMap(new StringReader(testYaml)); List<LinkedHashMap> data = LiveDataProcessor.getStringObjectMap(new StringReader(testYaml));
TestFileCaptor captor = new TestFileCaptor(); TestFileCaptor captor = new TestFileCaptor();
LiveDataProcessor liveDataProcessor = new LiveDataProcessor("test", new ReaderProvider() { LiveDataProcessor liveDataProcessor = new LiveDataProcessor("test", new ReaderProvider() {

3
java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/StateDictionaryGeneratorTest.java
View File

@ -6,6 +6,7 @@ import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import static com.rusefi.AssertCompatibility.assertEquals; import static com.rusefi.AssertCompatibility.assertEquals;
@ -30,7 +31,7 @@ public class StateDictionaryGeneratorTest {
" conditional_compilation: \"EFI_ENGINE_CONTROL\"\n"; " conditional_compilation: \"EFI_ENGINE_CONTROL\"\n";
ArrayList<LinkedHashMap> data = LiveDataProcessor.getStringObjectMap(new StringReader(testYaml)); List<LinkedHashMap> data = LiveDataProcessor.getStringObjectMap(new StringReader(testYaml));
TestFileCaptor captor = new TestFileCaptor(); TestFileCaptor captor = new TestFileCaptor();
LiveDataProcessor liveDataProcessor = new LiveDataProcessor("test", fileName -> new StringReader(""), captor, "./"); LiveDataProcessor liveDataProcessor = new LiveDataProcessor("test", fileName -> new StringReader(""), captor, "./");