diff --git a/misc/build_current_bundle.bat b/misc/build_current_bundle.bat index d6baac6972..64919903f7 100644 --- a/misc/build_current_bundle.bat +++ b/misc/build_current_bundle.bat @@ -10,7 +10,7 @@ java -version echo %date% %time% echo build_current_bundle.bat: Building win32 functional tests -cd win32_functional_tests +cd simulator gcc -v make -v cd .. @@ -52,7 +52,7 @@ if not exist java_console_binary/rusefi_console.jar echo CONSOLE COMPILATION FAI if not exist java_console_binary/rusefi_console.jar exit -1 echo Building rusefi simulator -cd win32_functional_tests +cd simulator mkdir out rm -rf build @@ -78,7 +78,7 @@ echo %folder% mkdir %folder% cp java_console_binary/rusefi_console.jar %folder% -cp win32_functional_tests/build/rusefi_simulator.exe %folder% +cp simulator/build/rusefi_simulator.exe %folder% cp firmware/tunerstudio/rusefi.ini %folder% cp firmware/svnversion.h %folder% @@ -123,7 +123,7 @@ pwd echo "Making rusefi_simulator.zip" pwd -zip -j temp/rusefi_simulator.zip win32_functional_tests/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar +zip -j temp/rusefi_simulator.zip simulator/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar echo open ftp://u71977750-build:%RUSEFI_BUILD_FTP_PASS%@rusefi.com/ > ftp_commands.txt diff --git a/misc/git2svn.bat b/misc/git2svn.bat index d0cf415b75..2fac98457b 100644 --- a/misc/git2svn.bat +++ b/misc/git2svn.bat @@ -26,14 +26,14 @@ rd /s /q %RUSEFI_SVN_W_PATH%\hardware rd /s /q %RUSEFI_SVN_W_PATH%\java_console rd /s /q %RUSEFI_SVN_W_PATH%\unit_tests rd /s /q %RUSEFI_SVN_W_PATH%\misc -rd /s /q %RUSEFI_SVN_W_PATH%\win32_functional_tests +rd /s /q %RUSEFI_SVN_W_PATH%\simulator -cp -r firmware %RUSEFI_SVN_PATH% -cp -r hardware %RUSEFI_SVN_PATH% -cp -r java_console %RUSEFI_SVN_PATH% -cp -r unit_tests %RUSEFI_SVN_PATH% -cp -r misc %RUSEFI_SVN_PATH% -cp -r win32_functional_tests %RUSEFI_SVN_PATH% +cp -r firmware %RUSEFI_SVN_PATH% +cp -r hardware %RUSEFI_SVN_PATH% +cp -r java_console %RUSEFI_SVN_PATH% +cp -r unit_tests %RUSEFI_SVN_PATH% +cp -r misc %RUSEFI_SVN_PATH% +cp -r simulator %RUSEFI_SVN_PATH% rem rm -f %RUSEFI_GIT_PATH%/readme.* rem rm -f %RUSEFI_GIT_PATH%/README.* cp -r README.* %RUSEFI_SVN_PATH% diff --git a/misc/jenkins.bat b/misc/jenkins.bat index 6e9da237e0..d7cffcd31e 100644 --- a/misc/jenkins.bat +++ b/misc/jenkins.bat @@ -1,5 +1,5 @@ -zip -j rusefi_simulator.zip win32_functional_tests/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar +zip -j rusefi_simulator.zip simulator/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar echo user u71977750-build> ftpcmd.dat echo XXX >> ftpcmd.dat diff --git a/misc/svn2git.bat b/misc/svn2git.bat index 829e18b3d5..a131a0209a 100644 --- a/misc/svn2git.bat +++ b/misc/svn2git.bat @@ -15,13 +15,13 @@ rd /s /q %RUSEFI_GIT_PATH%\firmware rd /s /q %RUSEFI_GIT_PATH%\hardware rd /s /q %RUSEFI_GIT_PATH%\java_console rd /s /q %RUSEFI_GIT_PATH%\unit_tests -rd /s /q %RUSEFI_GIT_PATH%\win32_functional_tests +rd /s /q %RUSEFI_GIT_PATH%\simulator cp -r firmware %RUSEFI_GIT_PATH% cp -r hardware %RUSEFI_GIT_PATH% cp -r java_console %RUSEFI_GIT_PATH% cp -r unit_tests %RUSEFI_GIT_PATH% -cp -r win32_functional_tests %RUSEFI_GIT_PATH% +cp -r simulator %RUSEFI_GIT_PATH% rm -f %RUSEFI_GIT_PATH%/readme.* rm -f %RUSEFI_GIT_PATH%/README.* cp -r README.* %RUSEFI_GIT_PATH% diff --git a/win32_functional_tests/.cproject b/simulator/.cproject similarity index 100% rename from win32_functional_tests/.cproject rename to simulator/.cproject diff --git a/win32_functional_tests/.project b/simulator/.project similarity index 100% rename from win32_functional_tests/.project rename to simulator/.project diff --git a/win32_functional_tests/Makefile b/simulator/Makefile similarity index 100% rename from win32_functional_tests/Makefile rename to simulator/Makefile diff --git a/win32_functional_tests/chconf.h b/simulator/chconf.h similarity index 100% rename from win32_functional_tests/chconf.h rename to simulator/chconf.h diff --git a/win32_functional_tests/clean.bat b/simulator/clean.bat similarity index 100% rename from win32_functional_tests/clean.bat rename to simulator/clean.bat diff --git a/win32_functional_tests/compile.bat b/simulator/compile.bat similarity index 100% rename from win32_functional_tests/compile.bat rename to simulator/compile.bat diff --git a/win32_functional_tests/halconf.h b/simulator/halconf.h similarity index 100% rename from win32_functional_tests/halconf.h rename to simulator/halconf.h diff --git a/win32_functional_tests/main.c b/simulator/main.c similarity index 100% rename from win32_functional_tests/main.c rename to simulator/main.c diff --git a/win32_functional_tests/main.h b/simulator/main.h similarity index 100% rename from win32_functional_tests/main.h rename to simulator/main.h diff --git a/win32_functional_tests/make_clean.bat b/simulator/make_clean.bat similarity index 100% rename from win32_functional_tests/make_clean.bat rename to simulator/make_clean.bat diff --git a/win32_functional_tests/make_run.bat b/simulator/make_run.bat similarity index 100% rename from win32_functional_tests/make_run.bat rename to simulator/make_run.bat diff --git a/win32_functional_tests/rules.mk b/simulator/rules.mk similarity index 100% rename from win32_functional_tests/rules.mk rename to simulator/rules.mk diff --git a/win32_functional_tests/simulator/adc_inputs.h b/simulator/simulator/adc_inputs.h similarity index 100% rename from win32_functional_tests/simulator/adc_inputs.h rename to simulator/simulator/adc_inputs.h diff --git a/win32_functional_tests/simulator/boards.cpp b/simulator/simulator/boards.cpp similarity index 100% rename from win32_functional_tests/simulator/boards.cpp rename to simulator/simulator/boards.cpp diff --git a/win32_functional_tests/simulator/boards.h b/simulator/simulator/boards.h similarity index 100% rename from win32_functional_tests/simulator/boards.h rename to simulator/simulator/boards.h diff --git a/win32_functional_tests/simulator/efifeatures.h b/simulator/simulator/efifeatures.h similarity index 100% rename from win32_functional_tests/simulator/efifeatures.h rename to simulator/simulator/efifeatures.h diff --git a/win32_functional_tests/simulator/framework.cpp b/simulator/simulator/framework.cpp similarity index 100% rename from win32_functional_tests/simulator/framework.cpp rename to simulator/simulator/framework.cpp diff --git a/win32_functional_tests/simulator/framework.h b/simulator/simulator/framework.h similarity index 100% rename from win32_functional_tests/simulator/framework.h rename to simulator/simulator/framework.h diff --git a/win32_functional_tests/simulator/global.h b/simulator/simulator/global.h similarity index 100% rename from win32_functional_tests/simulator/global.h rename to simulator/simulator/global.h diff --git a/win32_functional_tests/simulator/idle_thread.h b/simulator/simulator/idle_thread.h similarity index 100% rename from win32_functional_tests/simulator/idle_thread.h rename to simulator/simulator/idle_thread.h diff --git a/win32_functional_tests/simulator/mmc_card.h b/simulator/simulator/mmc_card.h similarity index 100% rename from win32_functional_tests/simulator/mmc_card.h rename to simulator/simulator/mmc_card.h diff --git a/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp b/simulator/simulator/rusEfiFunctionalTest.cpp similarity index 100% rename from win32_functional_tests/simulator/rusEfiFunctionalTest.cpp rename to simulator/simulator/rusEfiFunctionalTest.cpp diff --git a/win32_functional_tests/simulator/rusEfiFunctionalTest.h b/simulator/simulator/rusEfiFunctionalTest.h similarity index 100% rename from win32_functional_tests/simulator/rusEfiFunctionalTest.h rename to simulator/simulator/rusEfiFunctionalTest.h diff --git a/win32_functional_tests/simulator/svnversion.h b/simulator/simulator/svnversion.h similarity index 100% rename from win32_functional_tests/simulator/svnversion.h rename to simulator/simulator/svnversion.h