From 2881db0a07f4b49e23ad542baf8cec38552ccd0f Mon Sep 17 00:00:00 2001 From: David Holdeman Date: Thu, 18 Jun 2020 20:14:37 -0700 Subject: [PATCH] Convert scripts simulator (#1518) * remove run_gcov and call ci_gcov from run_clean_gcov * explicitly call bash * remove unused scripts * covert compile * convert compile * convert clean --- simulator/clean.bat | 11 ++++++++--- simulator/clean.sh | 3 +++ simulator/compile.bat | 13 ++++++++----- simulator/compile.sh | 3 +++ simulator/make_clean.bat | 2 -- simulator/make_run.bat | 5 ----- 6 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 simulator/clean.sh create mode 100644 simulator/compile.sh delete mode 100644 simulator/make_clean.bat delete mode 100644 simulator/make_run.bat diff --git a/simulator/clean.bat b/simulator/clean.bat index 63d0d0d7e9..20ae4d6a70 100644 --- a/simulator/clean.bat +++ b/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 ) + ) +) diff --git a/simulator/clean.sh b/simulator/clean.sh new file mode 100644 index 0000000000..614e345812 --- /dev/null +++ b/simulator/clean.sh @@ -0,0 +1,3 @@ +echo "Entering simulator/clean.sh" +rm -rf .dep +rm -rf build diff --git a/simulator/compile.bat b/simulator/compile.bat index 9a4356ccc6..20ae4d6a70 100644 --- a/simulator/compile.bat +++ b/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" \ No newline at end of file +@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 ) + ) +) diff --git a/simulator/compile.sh b/simulator/compile.sh new file mode 100644 index 0000000000..0175decbb3 --- /dev/null +++ b/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" diff --git a/simulator/make_clean.bat b/simulator/make_clean.bat deleted file mode 100644 index edbfb5ced5..0000000000 --- a/simulator/make_clean.bat +++ /dev/null @@ -1,2 +0,0 @@ -make clean -make 2> err > log \ No newline at end of file diff --git a/simulator/make_run.bat b/simulator/make_run.bat deleted file mode 100644 index 121b51deea..0000000000 --- a/simulator/make_run.bat +++ /dev/null @@ -1,5 +0,0 @@ -make -r - -cd build -rusefi_simulator.exe -