progress - consuming new .ini file names
This commit is contained in:
parent
7b223f1fd9
commit
eee51a575f
|
@ -46,20 +46,6 @@ java -DSystemOut.name=gen_config_board \
|
||||||
-prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
|
-prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
|
||||||
-prepend config/boards/${BOARDNAME}/prepend.txt
|
-prepend config/boards/${BOARDNAME}/prepend.txt
|
||||||
|
|
||||||
java -DSystemOut.name=gen_config_board \
|
|
||||||
-jar ../java_tools/ConfigDefinition.jar \
|
|
||||||
-definition integration/rusefi_config.txt \
|
|
||||||
-tool gen_config.sh \
|
|
||||||
-ts_destination tunerstudio \
|
|
||||||
-cache ${BOARDNAME} \
|
|
||||||
-cache_zip_file tunerstudio/generated/cache.zip \
|
|
||||||
-firing_order controllers/algo/firing_order.h \
|
|
||||||
-ts_output_name rusefi_${BOARDNAME}.ini \
|
|
||||||
-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
|
|
||||||
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
|
|
||||||
-prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
|
|
||||||
-prepend config/boards/${BOARDNAME}/prepend.txt
|
|
||||||
|
|
||||||
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }
|
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }
|
||||||
|
|
||||||
if [ -z "${TS_PATH}" ]; then
|
if [ -z "${TS_PATH}" ]; then
|
||||||
|
|
|
@ -14,7 +14,7 @@ rem #
|
||||||
rem # see gen_config.sh where short<>long name dictionary is hard-coded
|
rem # see gen_config.sh where short<>long name dictionary is hard-coded
|
||||||
rem #
|
rem #
|
||||||
|
|
||||||
call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre_f4 rusefi_microrusefi.ini
|
call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre_f4 rusefi_mre_f4.ini
|
||||||
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
||||||
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
||||||
pwd
|
pwd
|
||||||
|
@ -42,17 +42,17 @@ set f7_console_setting=firmware\config\boards\nucleo_f767\rusefi_console_propert
|
||||||
|
|
||||||
rem folter_name configuration_name [optional .ini file name]
|
rem folter_name configuration_name [optional .ini file name]
|
||||||
|
|
||||||
call misc\jenkins\compile_other_versions\compile_and_upload.bat proteus proteus_f4 rusefi_proteus.ini
|
call misc\jenkins\compile_other_versions\compile_and_upload.bat proteus proteus_f4 rusefi_proteus_f4.ini
|
||||||
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
||||||
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
||||||
pwd
|
pwd
|
||||||
|
|
||||||
call misc\jenkins\compile_other_versions\compile_and_upload.bat proteus proteus_f7 rusefi_proteus.ini
|
call misc\jenkins\compile_other_versions\compile_and_upload.bat proteus proteus_f7 rusefi_proteus_f7.ini
|
||||||
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
||||||
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
||||||
pwd
|
pwd
|
||||||
|
|
||||||
call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre_f7 rusefi_microrusefi.ini %f7_console_setting%
|
call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre_f7 rusefi_mre_f7.ini %f7_console_setting%
|
||||||
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
||||||
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
||||||
pwd
|
pwd
|
||||||
|
@ -80,13 +80,13 @@ rem IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
||||||
rem pwd
|
rem pwd
|
||||||
|
|
||||||
|
|
||||||
call misc\jenkins\compile_other_versions\compile_and_upload.bat prometheus prometheus_405
|
call misc\jenkins\compile_other_versions\compile_and_upload.bat prometheus prometheus_405 rusefi_prometheus_405.ini
|
||||||
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
||||||
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
||||||
pwd
|
pwd
|
||||||
|
|
||||||
|
|
||||||
call misc\jenkins\compile_other_versions\compile_and_upload.bat prometheus prometheus_469
|
call misc\jenkins\compile_other_versions\compile_and_upload.bat prometheus prometheus_469 rusefi_prometheus_469.ini
|
||||||
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
|
||||||
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
IF %ERRORLEVEL% NEQ 0 EXIT /B 1
|
||||||
pwd
|
pwd
|
||||||
|
|
Loading…
Reference in New Issue