diff --git a/misc/jenkins/build_working_folder.bat b/misc/jenkins/build_working_folder.bat index 61b82b5939..27127e6dd0 100644 --- a/misc/jenkins/build_working_folder.bat +++ b/misc/jenkins/build_working_folder.bat @@ -16,12 +16,23 @@ if not exist %drivers_folder%/silent_st_drivers.exe ( EXIT /B 1 ) +if %ini_file_override%x==nox ( + set ini_file_override=rusefi.ini + echo %script_name%: N/a ini_file_override specified +) if %ini_file_override%.==. ( set ini_file_override=rusefi.ini echo %script_name%: No ini_file_override specified ) echo %script_name%: Will use %ini_file_override% +if %rusefi_console_settings%.==. ( + echo %script_name%: No rusefi_console_settings +) else ( + echo Using rusefi_console_settings %rusefi_console_settings% + cp %rusefi_console_settings% %console_folder% +) + cp java_console_binary/rusefi_console.jar %console_folder% cp simulator/build/rusefi_simulator.exe %console_folder% cp misc/console_launcher/rusefi_console.exe %console_folder% @@ -32,6 +43,7 @@ cp misc/console_launcher/readme.html %folder% cp firmware/tunerstudio/%ini_file_override% %folder% rem Unsetting since would not be used anywhere else set ini_file_override= +set rusefi_console_settings= rem users probably do not really care for this file rem cp firmware/svnversion.h %folder% diff --git a/misc/jenkins/compile_other_versions/compile_and_upload.bat b/misc/jenkins/compile_other_versions/compile_and_upload.bat index 8257e32c42..ad73d81aef 100644 --- a/misc/jenkins/compile_other_versions/compile_and_upload.bat +++ b/misc/jenkins/compile_other_versions/compile_and_upload.bat @@ -1,9 +1,10 @@ set COMPILE_FOLDER=%1 set bundle_name=%2 set ini_file_override=%3 +set rusefi_console_settings=%4 set script_name=combile_and_upload.bat -echo Entering %script_name% with %COMPILE_FOLDER% %bundle_name% +echo Entering %script_name% with 1=%COMPILE_FOLDER% 2=%bundle_name% 3=%ini_file_override% 4=%rusefi_console_settings% if %COMPILE_FOLDER%.==. ( echo COMPILE_FOLDER parameter expected diff --git a/misc/jenkins/compile_other_versions/run.bat b/misc/jenkins/compile_other_versions/run.bat index 8bd7723b70..ec2e6f31a3 100644 --- a/misc/jenkins/compile_other_versions/run.bat +++ b/misc/jenkins/compile_other_versions/run.bat @@ -14,24 +14,26 @@ IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat IF NOT ERRORLEVEL 0 EXIT /B 1 pwd -call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre rusefi_microrusefi.ini +set f7_console_setting=firmware\config\boards\nucleo_f767\rusefi_console_properties.xml + +call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre rusefi_microrusefi.ini %f7_console_setting% IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat IF NOT ERRORLEVEL 0 EXIT /B 1 pwd -call misc\jenkins\compile_other_versions\compile_and_upload.bat nucleo_f746 stm32f746_nucleo +call misc\jenkins\compile_other_versions\compile_and_upload.bat nucleo_f746 stm32f746_nucleo no %f7_console_setting% IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat IF NOT ERRORLEVEL 0 EXIT /B 1 pwd -call misc\jenkins\compile_other_versions\compile_and_upload.bat nucleo_f767 stm32f767_nucleo +call misc\jenkins\compile_other_versions\compile_and_upload.bat nucleo_f767 stm32f767_nucleo no %f7_console_setting% IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat IF NOT ERRORLEVEL 0 EXIT /B 1 pwd -call misc\jenkins\compile_other_versions\compile_and_upload.bat nucleo_f767 stm32f767_osc +call misc\jenkins\compile_other_versions\compile_and_upload.bat nucleo_f767 stm32f767_osc no %f7_console_setting% IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat IF NOT ERRORLEVEL 0 EXIT /B 1 pwd