diff --git a/firmware/config/boards/NUCLEO_F746/!compile-nucleo_f746.bat b/firmware/config/boards/NUCLEO_F746/!compile-nucleo_f746.bat index 28f88a3328..b5223503de 100644 --- a/firmware/config/boards/NUCLEO_F746/!compile-nucleo_f746.bat +++ b/firmware/config/boards/NUCLEO_F746/!compile-nucleo_f746.bat @@ -8,6 +8,6 @@ set PROJECT_CPU=ST_STM32F7 set EXTRA_PARAMS=-DDUMMY -DSTM32F746xx ^ -DEFI_INJECTOR_PIN3=GPIO_UNASSIGNED ^ -DRAM_UNUSED_SIZE=10 -DCCM_UNUSED_SIZE=10 - -rem call compile_and_program.bat -r -make -j8 +set DEBUG_LEVEL_OPT="-O2" +make -j4 +..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu diff --git a/firmware/config/boards/NUCLEO_F767/!compile-nucleo_f767.bat b/firmware/config/boards/NUCLEO_F767/!compile-nucleo_f767.bat index fbd23b12fb..e2c0d7104d 100644 --- a/firmware/config/boards/NUCLEO_F767/!compile-nucleo_f767.bat +++ b/firmware/config/boards/NUCLEO_F767/!compile-nucleo_f767.bat @@ -10,4 +10,4 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F767xx ^ -DEFI_ENABLE_ASSERTS=FALSE ^ -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE set DEBUG_LEVEL_OPT="-O2" -call compile_and_program.bat -r +make -j4 \ No newline at end of file diff --git a/misc/jenkins/build_working_folder.bat b/misc/jenkins/build_working_folder.bat new file mode 100644 index 0000000000..832df3b169 --- /dev/null +++ b/misc/jenkins/build_working_folder.bat @@ -0,0 +1,34 @@ + +echo Working folder: %folder% +mkdir %folder% + +cp java_console_binary/rusefi_console.jar %folder% +cp simulator/build/rusefi_simulator.exe %folder% +cp firmware/tunerstudio/rusefi.ini %folder% + +cp firmware/svnversion.h %folder% +cp -r misc/install/openocd %folder% +cp java_console/rusefi.xml %folder% +rem 407 has two versions +cp firmware/deliver/rusefi_release.* %folder% +cp firmware/deliver/rusefi_debug.* %folder% +rem 746 builds one version at the moment +cp firmware/deliver/rusefi.* %folder% +cp misc/console_launcher/rusefi_console.exe %folder% + + +cd temp +echo "Please copy find.exe to findcyg.exe in cygwin folder" +findcyg . -name '.svn' > folders_to_delete.txt +echo "Deleting .svn" +xargs rm -rf < folders_to_delete.txt +echo "Deleted .svn" +rm -rf folders_to_delete.txt + +echo "Building bundle" +pwd +zip -r rusefi_bundle.zip * +echo "Bundle ready" +cd .. +echo "We are back in root directory" +pwd diff --git a/misc/jenkins/compile_other_versions/run.bat b/misc/jenkins/compile_other_versions/run.bat index 031e714a63..fb9afec358 100644 --- a/misc/jenkins/compile_other_versions/run.bat +++ b/misc/jenkins/compile_other_versions/run.bat @@ -15,8 +15,33 @@ cd .. echo Compiling F767 cd firmware\config\boards\NUCLEO_F746 call !compile-nucleo_f746.bat +cd .. pwd +set stm_arch=stm32f467 +set folder=snapshot_%date:~10%%date:~4,2%%date:~7,2%_%time:~0,2%%time:~3,2%_%stm_arch%_rusefi +set folder=temp\%folder% + +rem this replaces spaces with 0s - that's needed before 10am +set folder=%folder: =0% + +echo Building file +call misc\jenkins\build_working_folder.bat + +rem TODO: extract FTP duplication with 407 build + +echo open ftp://u71977750-build:%RUSEFI_BUILD_FTP_PASS%@%FTP_SERVER%/ > ftp_commands.txt +echo binary >> ftp_commands.txt +echo put rusefi_bundle.zip rusefi_bundle_746.zip >> ftp_commands.txt + +echo exit >> ftp_commands.txt + +cd temp +call winscp.com /script=../ftp_commands.txt +IF NOT ERRORLEVEL 0 echo winscp error DETECTED +IF NOT ERRORLEVEL 0 EXIT /B 1 + + echo OK for now 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 054d8c982c..5b40f98bef 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 @@ -53,37 +53,7 @@ set folder=temp\%folder% # this replaces spaces with 0s - that's needed before 10am set folder=%folder: =0% -echo Working folder: -echo %folder% -mkdir %folder% - -cp java_console_binary/rusefi_console.jar %folder% -cp simulator/build/rusefi_simulator.exe %folder% -cp firmware/tunerstudio/rusefi.ini %folder% - -cp firmware/svnversion.h %folder% -cp -r misc/install/openocd %folder% -cp java_console/rusefi.xml %folder% -cp firmware/deliver/rusefi_release.* %folder% -cp firmware/deliver/rusefi_debug.* %folder% -cp misc/console_launcher/rusefi_console.exe %folder% - - -cd temp -echo "Please copy find.exe to findcyg.exe in cygwin folder" -findcyg . -name '.svn' > folders_to_delete.txt -echo "Deleting .svn" -xargs rm -rf < folders_to_delete.txt -echo "Deleted .svn" -rm -rf folders_to_delete.txt - -echo "Building bundle" -pwd -zip -r rusefi_bundle.zip * -echo "Bundle ready" -cd .. -echo "We are back in root directory" -pwd +call jenkins\build_working_folder.bat echo "Building only console" cd %folder%