andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 16:13:02 -04:00
parent 41aef2ff5b
commit cf94c69a99
6 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/gen-configs.yaml vendored
View File

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

2
firmware/gen_config_common.sh
View File

@ -1,6 +1,6 @@
COMMON_GEN_CONFIG_PREFIX=" -DSystemOut.name=logs/gen_config_${SHORT_BOARDNAME} \ COMMON_GEN_CONFIG_PREFIX=" -DSystemOut.name=logs/gen_config_${SHORT_BOARDNAME} \
-jar ../java_tools/ConfigDefinition.jar" -jar ../java_tools/configuration_definition/build/libs/config_definition.jar"
COMMON_GEN_CONFIG=" COMMON_GEN_CONFIG="
-readfile OUTPUTS_SECTION_FROM_FILE console/binary/generated/output_channels.ini \ -readfile OUTPUTS_SECTION_FROM_FILE console/binary/generated/output_channels.ini \

2
firmware/gen_live_documentation.sh
View File

@ -3,7 +3,7 @@
rm gen_live_documentation.log rm gen_live_documentation.log
java -DSystemOut.name=logs/gen_live_documentation \ java -DSystemOut.name=logs/gen_live_documentation \
-cp ../java_tools/ConfigDefinition.jar \ -cp ../java_tools/configuration_definition/build/libs/config_definition.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; }

2
firmware/gen_signature.sh
View File

@ -12,7 +12,7 @@ echo "Generating signature for ${SHORT_BOARDNAME}"
date=`TZ=Europe/London date +"%Y.%m.%d"` date=`TZ=Europe/London date +"%Y.%m.%d"`
echo "! Generated by gen_signature.sh" > ${SIGNATURE_FILE_NAME} echo "! Generated by gen_signature.sh" > ${SIGNATURE_FILE_NAME}
echo "! SIGNATURE_HASH is a built-in variable generated by ConfigDefinition.jar" >> ${SIGNATURE_FILE_NAME} echo "! SIGNATURE_HASH is a built-in variable generated by config_definition.jar" >> ${SIGNATURE_FILE_NAME}
# read the current git branch name # read the current git branch name
branchname=`git branch --show-current` branchname=`git branch --show-current`

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

2
java_tools/configuration_definition/build.gradle
View File

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