we are confusing gradle when we ask shadowJar output to look same as jar output #5966

This commit is contained in:
Andrey 2024-02-17 00:48:57 -05:00 committed by rusefillc
parent 14c38631c6
commit 76c60493af
7 changed files with 7 additions and 14 deletions

View File

@ -5,7 +5,7 @@
cd ../../../../..
java -DSystemOut.name=logs/gen_enum_to_string_hellen_cypress \
-jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
-jar ../java_tools/enum_to_string/build/libs/enum_to_string-all.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/enum_to_string/build/libs/enum_to_string.jar \
-jar ../java_tools/enum_to_string/build/libs/enum_to_string-all.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/enum_to_string/build/libs/enum_to_string.jar \
-jar ../java_tools/enum_to_string/build/libs/enum_to_string-all.jar \
-inputPath . \
-outputPath config/boards/${BOARD}/config/controllers/algo \
-enumInputFile config/boards/${BOARD}/rusefi_hw_enums.h

View File

@ -9,7 +9,7 @@ cd ../firmware
rm gen_enum_to_string.log
ENUM_JAR=../java_tools/enum_to_string/build/libs/enum_to_string.jar
ENUM_JAR=../java_tools/enum_to_string/build/libs/enum_to_string-all.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

@ -8,13 +8,13 @@ cd ../java_tools
cd ../firmware
java -DSystemOut.name=logs/gen_live_documentation \
-cp ../java_tools/configuration_definition_base/build/libs/config_definition_base.jar \
-cp ../java_tools/configuration_definition_base/build/libs/config_definition_base-all.jar \
com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml
[ $? -eq 0 ] || { echo "ERROR generating"; exit 1; }
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
java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum_to_string/build/libs/enum_to_string-all.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; }
# live_data_ids.h is generated above so order of operations is important here!
./gen_enum_to_string.sh
./gen_enum_to_string.sh

View File

@ -17,5 +17,4 @@ dependencies {
shadowJar {
dependsOn(':enum_to_string:shadowJar')
archiveClassifier = ''
}

View File

@ -10,12 +10,6 @@ dependencies {
}
shadowJar {
/*
to exclude suffix '-all'
in resulting archive file name
*/
archiveClassifier = ''
manifest {
attributes(
'Main-Class': 'com.rusefi.EnumToString'