diff --git a/misc/jenkins/build_working_folder.bat b/misc/jenkins/build_working_folder.bat index 35bbdc29e7..21d055e030 100644 --- a/misc/jenkins/build_working_folder.bat +++ b/misc/jenkins/build_working_folder.bat @@ -27,17 +27,17 @@ IF NOT ERRORLEVEL 0 EXIT /B 1 echo "Deleting .svn" xargs rm -rf < folders_to_delete.txt -echo "Deleted .svn" +echo "%script_name%: Deleted .svn" rm -rf folders_to_delete.txt echo "Building bundle" pwd set zip_name=rusefi_bundle.zip -zip -r %zip_name$ * +zip -r %zip_name% * IF NOT ERRORLEVEL 0 echo %script_name%: ERROR INVOKING zip IF NOT ERRORLEVEL 0 EXIT /B 1 -echo "Bundle %zip_name$ ready" +echo "Bundle %zip_name% ready" ls %zip_name% cd .. echo "%script_name%: We are back in root directory" diff --git a/misc/jenkins/compile_other_versions/build_version.bat b/misc/jenkins/compile_other_versions/build_version.bat index 06bcb588f9..6a028752cc 100644 --- a/misc/jenkins/compile_other_versions/build_version.bat +++ b/misc/jenkins/compile_other_versions/build_version.bat @@ -10,18 +10,9 @@ call misc\jenkins\build_working_folder.bat rem TODO: extract FTP duplication with 407 build -echo open ftp://%RUSEFI_BUILD_FTP_USER%:%RUSEFI_BUILD_FTP_PASS%@%FTP_SERVER%/ > ftp_commands.txt -echo binary >> ftp_commands.txt -echo put rusefi_bundle.zip rusefi_bundle_%bundle_name%.zip >> ftp_commands.txt - -echo exit >> ftp_commands.txt - cd temp mv rusefi_bundle.zip rusefi_bundle_%bundle_name%.zip ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% . rusefi_bundle_%bundle_name%.zip -rem call winscp.com /script=../ftp_commands.txt -rem IF NOT ERRORLEVEL 0 echo winscp error DETECTED -rem IF NOT ERRORLEVEL 0 EXIT /B 1 cd .. diff --git a/misc/jenkins/compile_other_versions/run.bat b/misc/jenkins/compile_other_versions/run.bat index 7cdde957d2..25c7277843 100644 --- a/misc/jenkins/compile_other_versions/run.bat +++ b/misc/jenkins/compile_other_versions/run.bat @@ -1,3 +1,5 @@ +set script_name=build_working_folder.bat +echo Entering %script_name% set FTP_SERVER=home451478433.1and1-data.host @@ -20,7 +22,7 @@ cd .. pwd set bundle_name=stm32f746_nucleo call misc\jenkins\compile_other_versions\build_version.bat -echo Done with F746-nucleo +echo %script_name%: Done with F746-nucleo cd firmware @@ -35,7 +37,7 @@ cd .. pwd set bundle_name=stm32f767_nucleo call misc\jenkins\compile_other_versions\build_version.bat -echo Done with F767-nucleo +echo %script_name%: Done with F767-nucleo @@ -68,7 +70,7 @@ cd .. pwd set bundle_name=prometheus_405 call misc\jenkins\compile_other_versions\build_version.bat -echo Done with prometheus_405 +echo %script_name%: Done with prometheus_405 @@ -84,6 +86,6 @@ cd .. pwd set bundle_name=prometheus_469 call misc\jenkins\compile_other_versions\build_version.bat -echo Done with prometheus_469 +echo %script_name%: Done with prometheus_469 diff --git a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat index 21f383473c..f0dbf2d32e 100644 --- a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat +++ b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat @@ -91,26 +91,11 @@ echo "Making rusefi_simulator.zip" pwd zip -j temp/rusefi_simulator.zip simulator/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar - -rem echo open ftp://%RUSEFI_BUILD_FTP_USER%:%RUSEFI_BUILD_FTP_PASS%@%FTP_SERVER%/ > ftp_commands.txt -rem echo binary >> ftp_commands.txt -rem echo put rusefi_bundle.zip >> ftp_commands.txt - -rem echo cd separate_files >> ftp_commands.txt -rem echo put rusefi_simulator.zip >> ftp_commands.txt -rem echo put rusefi_console.zip >> ftp_commands.txt -rem echo exit >> ftp_commands.txt - cd temp ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% . rusefi_bundle.zip ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% separate_files rusefi_simulator.zip ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% separate_files rusefi_console.zip -rem call winscp.com /script=../ftp_commands.txt -rem IF NOT ERRORLEVEL 0 echo winscp error DETECTED -rem IF NOT ERRORLEVEL 0 EXIT /B 1 - - cd .. echo "TIMESTAMP %date% %time%" echo "build_current_bundle: DONE here" diff --git a/misc/jenkins/setup/readme.md b/misc/jenkins/setup/readme.md index 89f1214ff4..bd80118ef2 100644 --- a/misc/jenkins/setup/readme.md +++ b/misc/jenkins/setup/readme.md @@ -7,6 +7,8 @@ https://cygwin.com/install.html needs to be added to System PATH manually cygwin: make, gcc, zip +cp c:\cygwin\bin\find.exe c:\cygwin\bin\findcyg.exe + cygwin: ccache Add System Environment Variable