Merge remote-tracking branch 'origin/master'

simulator/clean.bat

@@ -1,3 +1,8 @@
-echo Entering simulator\clean.bat
-rm -rf .dep
-rm -rf build
+@echo off
+sh.exe compile.sh || (
+  if exist C:\cygwin64 (
+    C:\cygwin64\bin\sh.exe compile.sh
+  ) else (
+    if exist C:\cygwin ( C:\cygwin\bin\sh.exe compile.sh )
+  )
+)

simulator/clean.sh

@@ -0,0 +1,3 @@
+echo "Entering simulator/clean.sh"
+rm -rf .dep
+rm -rf build

simulator/compile.bat

@@ -1,5 +1,8 @@
-rem this is about CygWin colon issue, .dep files are invalid because of that
-rem rm -rf .dep
-rm -f build/rusefi_simulator.exe
-make -j4 -r
-echo "TIMESTAMP %date% %time% just compiled rusefi simulator"
+@echo off
+sh.exe compile.sh || (
+  if exist C:\cygwin64 (
+    C:\cygwin64\bin\sh.exe compile.sh
+  ) else (
+    if exist C:\cygwin ( C:\cygwin\bin\sh.exe compile.sh )
+  )
+)

simulator/compile.sh

@@ -0,0 +1,3 @@
+rm -f build/rusefi_simulator.exe
+make -j4 -r
+echo "TIMESTAMP $(date "+%D %T.%2N") just compiled rusefi simulator"

simulator/make_clean.bat

@@ -1,2 +0,0 @@
-make clean
-make 2> err > log

simulator/make_run.bat

@@ -1,5 +0,0 @@
-make -r
-
-cd build
-rusefi_simulator.exe
-

unit_tests/compile.bat

@@ -1,4 +1,8 @@
-echo I am compiling unit tests
-rm -rf .dep/
-rm -rf build/
-make -j4
+@echo off
+sh.exe compile.sh || (
+  if exist C:\cygwin64 (
+    C:\cygwin64\bin\sh.exe compile.sh
+  ) else (
+    if exist C:\cygwin ( C:\cygwin\bin\sh.exe compile.sh )
+  )
+)

unit_tests/compile.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "Compiling unit tests"
+rm -rf .dep/
+rm -rf build/
+make -j4