only:CI to use tools from source code, also time to not have jar files in repo in the first place?

This commit is contained in:
Andrey 2023-06-17 17:03:38 -04:00
parent e4f20cf49a
commit cda1faf0e8
10 changed files with 6 additions and 10 deletions

View File

@ -67,7 +67,6 @@ jobs:
git add 'simulator/generated/*xml'
# get the original ramdisk images back in order to not overwrite the default placeholder
git checkout -- firmware/hw_layer/mass_storage/ramdisk_image.h firmware/hw_layer/mass_storage/ramdisk_image_compressed.h
git checkout -- java_tools/enum2string.jar
git status
OUT=$(git commit -am "Auto-generated default tune" 2>&1) || echo "commit failed, finding out why"
if echo "$OUT" | grep 'nothing to commit'; then

View File

@ -75,7 +75,6 @@ jobs:
git add *_generated.h
# get the original ramdisk images back in order to not overwrite the default placeholder
git checkout -- firmware/hw_layer/mass_storage/ramdisk_image.h firmware/hw_layer/mass_storage/ramdisk_image_compressed.h
git checkout -- java_tools/enum2string.jar
git status
OUT=$(git commit -am "Auto-generated configs and docs" 2>&1) || echo "commit failed, finding out why"
if echo "$OUT" | grep 'nothing to commit'; then

View File

@ -5,7 +5,7 @@
cd ../../../../..
java -DSystemOut.name=logs/gen_enum_to_string_hellen_cypress \
-jar ../java_tools/enum2string.jar \
-jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
-outputPath config/boards/сypress/config/controllers/algo \
-enumInputFile config/boards/cypress/rusefi_hw_enums.h

View File

@ -3,7 +3,7 @@
cd ../../../..
java -DSystemOut.name=logs/gen_enum_to_string_kinetis \
-jar ../java_tools/enum2string.jar \
-jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
-outputPath config/boards/kinetis/config/controllers/algo \
-enumInputFile config/boards/kinetis/rusefi_hw_enums.h

View File

@ -8,7 +8,7 @@ echo This batch files reads rusefi_enums.h and produces auto_generated_enums.* f
BOARD=subaru_eg33
java -DSystemOut.name=logs/gen_enum_to_string \
-jar ../java_tools/enum2string.jar \
-jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
-inputPath . \
-outputPath config/boards/${BOARD}/config/controllers/algo \
-enumInputFile config/boards/${BOARD}/rusefi_hw_enums.h

View File

@ -8,7 +8,7 @@ cd ../firmware
rm gen_enum_to_string.log
ENUM_JAR=../java_tools/enum2string.jar
ENUM_JAR=../java_tools/enum_to_string/build/libs/enum_to_string.jar
java -DSystemOut.name=logs/gen_java_enum -cp ${ENUM_JAR} com.rusefi.ToJavaEnum -enumInputFile controllers/sensors/sensor_type.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
[ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; }

View File

@ -11,5 +11,5 @@ java -DSystemOut.name=logs/gen_live_documentation \
com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml
[ $? -eq 0 ] || { echo "ERROR generating"; exit 1; }
java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum_to_string/build/libs/enum_to_string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
[ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; }

Binary file not shown.

View File

@ -14,10 +14,8 @@ shadowJar {
to exclude suffix '-all'
in resulting archive file name
*/
archiveBaseName = 'enum2string'
archiveClassifier = ''
destinationDirectory = file( '$rootDir/../..' )
manifest {
attributes(
'Main-Class': 'com.rusefi.EnumToString'

View File

@ -20,7 +20,7 @@ public class EnumToString {
/**
* same header for .cpp and .h
*/
private final static StringBuilder commonFilesHeader = new StringBuilder("// by enum2string.jar tool " +
private final static StringBuilder commonFilesHeader = new StringBuilder("// by enum_to_string.jar tool " +
"on " + new Date() + "\n" +
"// see also gen_config_and_enums.bat\n" +
"\n" +