we are confusing gradle when we ask shadowJar output to look same as jar output #5966
This commit is contained in:
parent
76c60493af
commit
b50a735cb8
|
@ -1,6 +1,6 @@
|
|||
|
||||
COMMON_GEN_CONFIG_PREFIX=" -DSystemOut.name=logs/gen_config_${SHORT_BOARD_NAME} \
|
||||
-jar ../java_tools/configuration_definition/build/libs/config_definition.jar"
|
||||
-jar ../java_tools/configuration_definition/build/libs/config_definition-all.jar"
|
||||
|
||||
COMMON_GEN_CONFIG="
|
||||
-readfile OUTPUTS_SECTION_FROM_FILE console/binary/generated/output_channels.ini \
|
||||
|
|
|
@ -12,7 +12,7 @@ echo "Generating signature for ${SHORT_BOARD_NAME}"
|
|||
date=`TZ=Europe/London date +"%Y.%m.%d"`
|
||||
echo "! Generated by gen_signature.sh" > ${SIGNATURE_FILE_NAME}
|
||||
|
||||
echo "! SIGNATURE_HASH is a built-in variable generated by config_definition.jar" >> ${SIGNATURE_FILE_NAME}
|
||||
echo "! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar" >> ${SIGNATURE_FILE_NAME}
|
||||
|
||||
# read the current git branch name
|
||||
branchname=`git branch --show-current`
|
||||
|
|
|
@ -17,11 +17,6 @@ dependencies {
|
|||
shadowJar {
|
||||
dependsOn(':enum_to_string:shadowJar')
|
||||
dependsOn(':config_definition_base:shadowJar')
|
||||
/*
|
||||
to exclude suffix '-all'
|
||||
in resulting archive file name
|
||||
*/
|
||||
archiveClassifier = ''
|
||||
|
||||
manifest {
|
||||
attributes(
|
||||
|
|
Loading…
Reference in New Issue