diff --git a/misc/jenkins/compile_other_versions/build_version.bat b/misc/jenkins/compile_other_versions/build_version.bat index 6a028752cc..bab2e5988f 100644 --- a/misc/jenkins/compile_other_versions/build_version.bat +++ b/misc/jenkins/compile_other_versions/build_version.bat @@ -1,3 +1,7 @@ +set script_name=build_version.bat +echo Entering %script_name% + + rm -rf temp set folder=snapshot_%date:~10%%date:~4,2%%date:~7,2%_%time:~0,2%%time:~3,2%_%bundle_name%_rusefi set folder=temp\%folder% @@ -11,8 +15,13 @@ call misc\jenkins\build_working_folder.bat rem TODO: extract FTP duplication with 407 build cd temp -mv rusefi_bundle.zip rusefi_bundle_%bundle_name%.zip +set bundle_file=rusefi_bundle_%bundle_name%.zip +mv rusefi_bundle.zip %bundle_file% -ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% . rusefi_bundle_%bundle_name%.zip +echo Uploading %bundle_file% +ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% . %bundle_file% cd .. + +pwd +echo "exiting %script_name%" 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 f0dbf2d32e..c491406225 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 @@ -3,6 +3,9 @@ rem This script would compile firmware, dev console and win32 simulator into a s rem This script depends on Cygwin tools: zip rem +set script_name=build_current_bundle +echo Entering %script_name% + set FTP_SERVER=home451478433.1and1-data.host echo build_current_bundle.bat: Hello rusEfi build full bundle @@ -92,12 +95,13 @@ pwd zip -j temp/rusefi_simulator.zip simulator/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar cd temp +echo "%script_name%: Uploading stuff" 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 cd .. echo "TIMESTAMP %date% %time%" -echo "build_current_bundle: DONE here" -pwd +pwd +echo "exiting %script_name%"