From 20fea6c46b1abe8f2fc6e1b0ed360db8de4926a1 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Tue, 12 Feb 2019 20:01:16 -0500
Subject: [PATCH] Jenkins refactoring

---
 misc/jenkins/build_java_console.bat           | 10 +++++
 misc/jenkins/build_simulator.bat              | 11 ++++++
 .../build_current_bundle.bat                  | 37 +++----------------
 3 files changed, 26 insertions(+), 32 deletions(-)
 create mode 100644 misc/jenkins/build_java_console.bat
 create mode 100644 misc/jenkins/build_simulator.bat

diff --git a/misc/jenkins/build_java_console.bat b/misc/jenkins/build_java_console.bat
new file mode 100644
index 0000000000..29a2552eb1
--- /dev/null
+++ b/misc/jenkins/build_java_console.bat
@@ -0,0 +1,10 @@
+java -version
+
+echo Building java console
+pwd
+cd java_console
+call ant clean clean_out_folder build
+cd ..
+
+if not exist java_console_binary/rusefi_console.jar echo CONSOLE COMPILATION FAILED
+echo java console looks good
diff --git a/misc/jenkins/build_simulator.bat b/misc/jenkins/build_simulator.bat
new file mode 100644
index 0000000000..26166940c7
--- /dev/null
+++ b/misc/jenkins/build_simulator.bat
@@ -0,0 +1,11 @@
+echo Building rusefi simulator
+pwd
+cd simulator
+gcc -v
+make -v
+mkdir out
+rm -rf build
+rm -rf .dep
+call compile.bat
+cd ..
+if not exist simulator/build/rusefi_simulator.exe echo SIMULATOR COMPILATION FAILED
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 f79d7c8859..054d8c982c 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
@@ -7,16 +7,8 @@ set FTP_SERVER=home451478433.1and1-data.host
 
 echo build_current_bundle.bat: Hello rusEfi build full bundle
 
-java -version
-
 echo %date% %time%
 
-echo build_current_bundle.bat: Building win32 functional tests
-cd simulator
-gcc -v
-make -v
-cd ..
-
 
 cd firmware
 echo %date% %time%
@@ -43,38 +35,19 @@ if not exist deliver/rusefi_debug.hex exit -1
 
 ..\misc\hex2dfu\HEX2DFU.exe deliver/rusefi_release.hex -out deliver/rusefi_release.dfu
 ..\misc\hex2dfu\HEX2DFU.exe deliver/rusefi_debug.hex   -out deliver/rusefi_debug.dfu
-
-
 cd ..
 
-
-echo Building java console
-cd java_console
-call ant clean
-call ant clean_out_folder
-call ant
-cd ..
-
-if not exist java_console_binary/rusefi_console.jar echo CONSOLE COMPILATION FAILED
+call misc\jenkins\build_java_console.bat
 if not exist java_console_binary/rusefi_console.jar exit -1
 
-echo Building rusefi simulator
-cd simulator
-
-mkdir out
-rm -rf build
-rm -rf .dep
-call compile.bat
-
-if not exist build/rusefi_simulator.exe echo SIMULATOR COMPILATION FAILED
-if not exist build/rusefi_simulator.exe exit -1
-
-cd ..
+call misc\jenkins\build_simulator.bat
+if not exist simulator/build/rusefi_simulator.exe exit -1
 
 rm -rf temp
 mkdir temp
 
-set folder=snapshot_%date:~10%%date:~4,2%%date:~7,2%_%time:~0,2%%time:~3,2%_rusefi
+set stm_arch=stm32f407
+set folder=snapshot_%date:~10%%date:~4,2%%date:~7,2%_%time:~0,2%%time:~3,2%_%stm_arch%_rusefi
 set folder=temp\%folder%
 
 # this replaces spaces with 0s - that's needed before 10am