diff --git a/misc/jenkins/build_working_folder.bat b/misc/jenkins/build_working_folder.bat index 89b430a3cc..ee537ac7f4 100644 --- a/misc/jenkins/build_working_folder.bat +++ b/misc/jenkins/build_working_folder.bat @@ -8,6 +8,12 @@ set console_folder=%folder%\console mkdir %console_folder% ls -l %folder% +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% + 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% @@ -15,7 +21,9 @@ cp java_console/rusefi.xml %console_folder% cp misc/console_launcher/readme.html %folder% -cp firmware/tunerstudio/rusefi.ini %folder% +cp firmware/tunerstudio/%ini_file_override% %folder% +rem Unsetting since would not be used anywhere else +set ini_file_override= 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 ff45a6f135..8257e32c42 100644 --- a/misc/jenkins/compile_other_versions/compile_and_upload.bat +++ b/misc/jenkins/compile_other_versions/compile_and_upload.bat @@ -1,6 +1,6 @@ set COMPILE_FOLDER=%1 set bundle_name=%2 - +set ini_file_override=%3 set script_name=combile_and_upload.bat echo Entering %script_name% with %COMPILE_FOLDER% %bundle_name% diff --git a/misc/jenkins/compile_other_versions/run.bat b/misc/jenkins/compile_other_versions/run.bat index 3a4521e225..95f349d847 100644 --- a/misc/jenkins/compile_other_versions/run.bat +++ b/misc/jenkins/compile_other_versions/run.bat @@ -13,6 +13,10 @@ 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 +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 IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat