we are confusing gradle when we ask shadowJar output to look same as jar output #5966
This commit is contained in:
parent
14c38631c6
commit
76c60493af
|
@ -5,7 +5,7 @@
|
||||||
cd ../../../../..
|
cd ../../../../..
|
||||||
|
|
||||||
java -DSystemOut.name=logs/gen_enum_to_string_hellen_cypress \
|
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 \
|
-outputPath config/boards/сypress/config/controllers/algo \
|
||||||
-enumInputFile config/boards/cypress/rusefi_hw_enums.h
|
-enumInputFile config/boards/cypress/rusefi_hw_enums.h
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
cd ../../../..
|
cd ../../../..
|
||||||
|
|
||||||
java -DSystemOut.name=logs/gen_enum_to_string_kinetis \
|
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 \
|
-outputPath config/boards/kinetis/config/controllers/algo \
|
||||||
-enumInputFile config/boards/kinetis/rusefi_hw_enums.h
|
-enumInputFile config/boards/kinetis/rusefi_hw_enums.h
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ echo This batch files reads rusefi_enums.h and produces auto_generated_enums.* f
|
||||||
BOARD=subaru_eg33
|
BOARD=subaru_eg33
|
||||||
|
|
||||||
java -DSystemOut.name=logs/gen_enum_to_string \
|
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 . \
|
-inputPath . \
|
||||||
-outputPath config/boards/${BOARD}/config/controllers/algo \
|
-outputPath config/boards/${BOARD}/config/controllers/algo \
|
||||||
-enumInputFile config/boards/${BOARD}/rusefi_hw_enums.h
|
-enumInputFile config/boards/${BOARD}/rusefi_hw_enums.h
|
||||||
|
|
|
@ -9,7 +9,7 @@ cd ../firmware
|
||||||
|
|
||||||
rm gen_enum_to_string.log
|
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
|
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; }
|
[ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; }
|
||||||
|
|
|
@ -8,13 +8,13 @@ cd ../java_tools
|
||||||
cd ../firmware
|
cd ../firmware
|
||||||
|
|
||||||
java -DSystemOut.name=logs/gen_live_documentation \
|
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
|
com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml
|
||||||
[ $? -eq 0 ] || { echo "ERROR generating"; exit 1; }
|
[ $? -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; }
|
[ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; }
|
||||||
|
|
||||||
# live_data_ids.h is generated above so order of operations is important here!
|
# live_data_ids.h is generated above so order of operations is important here!
|
||||||
|
|
||||||
./gen_enum_to_string.sh
|
./gen_enum_to_string.sh
|
||||||
|
|
|
@ -17,5 +17,4 @@ dependencies {
|
||||||
|
|
||||||
shadowJar {
|
shadowJar {
|
||||||
dependsOn(':enum_to_string:shadowJar')
|
dependsOn(':enum_to_string:shadowJar')
|
||||||
archiveClassifier = ''
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,12 +10,6 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
shadowJar {
|
shadowJar {
|
||||||
/*
|
|
||||||
to exclude suffix '-all'
|
|
||||||
in resulting archive file name
|
|
||||||
*/
|
|
||||||
archiveClassifier = ''
|
|
||||||
|
|
||||||
manifest {
|
manifest {
|
||||||
attributes(
|
attributes(
|
||||||
'Main-Class': 'com.rusefi.EnumToString'
|
'Main-Class': 'com.rusefi.EnumToString'
|
||||||
|
|
Loading…
Reference in New Issue