only:facilitating config reuse with non-bash consumers
This commit is contained in:
parent
e29778a257
commit
c07522328b
|
@ -3,25 +3,19 @@ COMMON_GEN_CONFIG_PREFIX=" -DSystemOut.name=logs/gen_config_${SHORT_BOARDNAME} \
|
|||
-jar ../java_tools/ConfigDefinition.jar"
|
||||
|
||||
COMMON_GEN_CONFIG="
|
||||
-enumInputFile controllers/algo/engine_types.h \
|
||||
-enumInputFile controllers/algo/rusefi_enums.h \
|
||||
-readfile OUTPUTS_SECTION_FROM_FILE console/binary/generated/output_channels.ini \
|
||||
-readfile DATALOG_SECTION_FROM_FILE console/binary/generated/data_logs.ini \
|
||||
-readfile LIVE_DATA_MENU_FROM_FILE console/binary/generated/fancy_menu.ini \
|
||||
-readfile LIVE_DATA_PANELS_FROM_FILE console/binary/generated/fancy_content.ini \
|
||||
-readfile LIVE_DATA_GAUGES_FROM_FILE console/binary/generated/gauges.ini \
|
||||
-ts_destination tunerstudio \
|
||||
-firing_order controllers/algo/firing_order.h \
|
||||
-triggerInputFolder ../unit_tests \
|
||||
-with_c_defines false \
|
||||
-field_lookup_file controllers/lua/generated/value_lookup_generated.cpp controllers/lua/generated/value_lookup_generated.md \
|
||||
-java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java \
|
||||
-initialize_to_zero false \
|
||||
-prepend console/binary/generated/total_live_data_generated.h \
|
||||
-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
|
||||
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
|
||||
-ts_output_name generated/${INI} \
|
||||
-prepend integration/rusefi_config_shared.txt \
|
||||
-prepend ${BOARD_DIR}/prepend.txt \
|
||||
-board ${BOARD_DIR} \
|
||||
-definition integration/rusefi_config.txt"
|
||||
-board ${BOARD_DIR}"
|
||||
|
|
|
@ -7,6 +7,8 @@ import com.rusefi.trigger.TriggerWheelTSLogic;
|
|||
import com.rusefi.util.SystemOut;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
|
@ -39,7 +41,10 @@ public class ConfigDefinition {
|
|||
|
||||
public static void main(String[] args) {
|
||||
try {
|
||||
doJob(args, new ReaderStateImpl());
|
||||
List<String> options = Files.readAllLines(Paths.get("../java_tools/configuration_definition/src/main/resources/config_definition.options"));
|
||||
options.addAll(Arrays.asList(args));
|
||||
String[] totalArgs = options.toArray(new String[0]);
|
||||
doJob(totalArgs, new ReaderStateImpl());
|
||||
} catch (Throwable e) {
|
||||
SystemOut.println(e);
|
||||
e.printStackTrace();
|
||||
|
|
|
@ -94,7 +94,7 @@ public class ReaderStateImpl implements ReaderState {
|
|||
|
||||
@Override
|
||||
public void doJob() throws IOException {
|
||||
if (isDestinationsEmpty())
|
||||
if (destinations.isEmpty())
|
||||
throw new IllegalArgumentException("No destinations specified");
|
||||
|
||||
for (String prependFile : prependFiles)
|
||||
|
@ -430,11 +430,6 @@ public class ReaderStateImpl implements ReaderState {
|
|||
return prependFiles;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDestinationsEmpty() {
|
||||
return destinations.isEmpty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isStackEmpty() {
|
||||
return stack.isEmpty();
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
-enumInputFile
|
||||
controllers/algo/engine_types.h
|
||||
-enumInputFile
|
||||
controllers/algo/rusefi_enums.h
|
||||
-definition
|
||||
integration/rusefi_config.txt
|
||||
-firing_order
|
||||
controllers/algo/firing_order.h
|
||||
-prepend
|
||||
console/binary/generated/total_live_data_generated.h
|
||||
-prepend
|
||||
integration/rusefi_config_shared.txt
|
|
@ -38,7 +38,5 @@ public interface ReaderState {
|
|||
|
||||
List<String> getPrependFiles();
|
||||
|
||||
boolean isDestinationsEmpty();
|
||||
|
||||
boolean isStackEmpty();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue