From 7ad8b2c86368a9545dae88cc21d56d1d7f53c94a Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 6 Jun 2020 16:52:29 -0400 Subject: [PATCH] refactoring --- .../build_current_bundle.bat | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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 04d07d154b..9cbea2c756 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 @@ -100,21 +100,22 @@ echo "%script_name%: Going back to root folder" cd %root_folder% pwd -echo "%script_name%: 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 - cd temp if not exist rusefi_bundle.zip echo %script_name%: ERROR not found rusefi_bundle.zip if not exist rusefi_bundle.zip EXIT /B 1 - echo "%script_name%: Uploading stuff" ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %RUSEFI_FTP_SERVER% . rusefi_bundle.zip -ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %RUSEFI_FTP_SERVER% separate_files rusefi_simulator.zip -ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %RUSEFI_FTP_SERVER% separate_files rusefi_console.zip - cd .. -echo "TIMESTAMP %date% %time%" + +ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %RUSEFI_FTP_SERVER% separate_files temp/rusefi_console.zip + +echo "%script_name%: 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 +ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %RUSEFI_FTP_SERVER% separate_files temp/rusefi_simulator.zip + + +echo "TIMESTAMP %date% %time%" pwd echo "exiting %script_name%"