From 8a1a4ff78724df4e975167ed19c26e681a004181 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sun, 16 Dec 2018 00:19:15 -0500
Subject: [PATCH] better folder structure

---
 README.md                                     |  1 +
 .../build_current_bundle.bat                  |  5 +--
 .../hw_test.bat                               | 31 +++++++++++++++++++
 .../functional_test_and_build_bundle/run.bat  | 10 ++++++
 misc/test_bundle.bat                          | 23 --------------
 5 files changed, 43 insertions(+), 27 deletions(-)
 rename misc/{ => jenkins/functional_test_and_build_bundle}/build_current_bundle.bat (99%)
 create mode 100644 misc/jenkins/functional_test_and_build_bundle/hw_test.bat
 create mode 100644 misc/jenkins/functional_test_and_build_bundle/run.bat
 delete mode 100644 misc/test_bundle.bat

diff --git a/README.md b/README.md
index c993775cef..b798342470 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ Important note - we now use submodules:
  * General source code Q&A is at http://rusefi.com/forum/viewtopic.php?f=5&t=10
  * Facebook https://www.facebook.com/rusEfiECU
  * YouTube: https://www.youtube.com/user/rusefi
+ * Patreon https://www.patreon.com/rusefi
 
 # Building the Code
 See https://rusefi.com/forum/viewtopic.php?f=5&t=9
diff --git a/misc/build_current_bundle.bat b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
similarity index 99%
rename from misc/build_current_bundle.bat
rename to misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
index d8e9988f52..f54efeb5ae 100644
--- a/misc/build_current_bundle.bat
+++ b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
@@ -18,7 +18,6 @@ make -v
 cd ..
 
 
-
 cd firmware
 echo %date% %time%
 
@@ -30,8 +29,7 @@ call flash_erase.bat
 
 
 echo build_current_bundle.bat: Building firmware
-rm -fR .dep
-rm -fR build
+call clean.bat
 git submodule update --init
 
 call update_version.bat
@@ -150,4 +148,3 @@ echo %date% %time%
 echo "build_current_bundle: DONE here"
 pwd
 
-
diff --git a/misc/jenkins/functional_test_and_build_bundle/hw_test.bat b/misc/jenkins/functional_test_and_build_bundle/hw_test.bat
new file mode 100644
index 0000000000..01feee0042
--- /dev/null
+++ b/misc/jenkins/functional_test_and_build_bundle/hw_test.bat
@@ -0,0 +1,31 @@
+echo I am hw_test.bat
+pwd
+
+cd firmware
+call flash_erase
+rem This script depends on someone else building firmware
+call flash_openocd
+
+if not exist build/rusefi.bin echo FIRMWARE NOT FOUND
+if not exist build/rusefi.bin exit -1
+
+pwd
+
+cd ..
+
+rem echo Running some commands
+rem pwd
+rem java -cp java_console_binary\rusefi_console.jar com.rusefi.CmdLine "set_led_blinking_period 10"
+
+cd java_console
+
+echo Running tests
+which java
+which javac
+ant realtest
+
+IF NOT ERRORLEVEL echo ERROR DETECTED
+IF NOT ERRORLEVEL 0 EXIT /B 1
+
+echo %date% %time%
+echo hw_test.bat: done
diff --git a/misc/jenkins/functional_test_and_build_bundle/run.bat b/misc/jenkins/functional_test_and_build_bundle/run.bat
new file mode 100644
index 0000000000..d967c1cabe
--- /dev/null
+++ b/misc/jenkins/functional_test_and_build_bundle/run.bat
@@ -0,0 +1,10 @@
+
+call misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
+IF NOT ERRORLEVEL 0 echo build ERROR DETECTED
+IF NOT ERRORLEVEL 0 EXIT /B 1
+
+
+call misc/jenkins/functional_test_and_build_bundle/hw_test.bat
+IF NOT ERRORLEVEL 0 echo real hardware test ERROR DETECTED
+IF NOT ERRORLEVEL 0 EXIT /B 1
+
diff --git a/misc/test_bundle.bat b/misc/test_bundle.bat
deleted file mode 100644
index 0621dcf828..0000000000
--- a/misc/test_bundle.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-echo Statding test_bundle.bat
-
-cd java_console
-rem call ant autotest
-rem IF NOT ERRORLEVEL 0 echo auto test ERROR DETECTED
-rem IF NOT ERRORLEVEL 0 EXIT /B 1
-cd ..
-
-pwd
-echo Cleaning
-cd firmware
-call clean.bat
-cd ..
-
-cd misc
-call hw_test.bat
-IF NOT ERRORLEVEL 0 echo real hardware test ERROR DETECTED
-IF NOT ERRORLEVEL 0 EXIT /B 1
-cd ..
-pwd
-
-echo %date% %time%
-echo test_bundle.bat: done
\ No newline at end of file