diff --git a/.gitignore b/.gitignore index d31629f..a8a664c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,4 @@ Makefile* installer/*.exe *.user* build_scripts/win/__pycache__ -build_scripts/win/test.bat \ No newline at end of file +build_scripts/win/current_build.bat \ No newline at end of file diff --git a/build_scripts/win/build.cmd b/build_scripts/win/build.cmd index 44c3c1c..0f6a908 100644 --- a/build_scripts/win/build.cmd +++ b/build_scripts/win/build.cmd @@ -1,8 +1,8 @@ @ECHO OFF python build.py build IF ERRORLEVEL 1 EXIT /B 1 -call test.bat +call current_build.bat IF ERRORLEVEL 1 EXIT /B 1 -del test.bat +del current_build.bat IF ERRORLEVEL 1 EXIT /B 1 PAUSE diff --git a/build_scripts/win/common.py b/build_scripts/win/common.py index 8bac5ba..6a462cd 100644 --- a/build_scripts/win/common.py +++ b/build_scripts/win/common.py @@ -122,7 +122,7 @@ def create_batch_file(): """ Creates a batch file in the dir. Must be called by another outside batch file. """ - file = open(get_project_dir() + "\\build_scripts\\win\\test.bat", "w+") + file = open(get_project_dir() + "\\build_scripts\\win\\current_build.bat", "w+") file.write(bat_file_contents) file.close() @@ -188,4 +188,4 @@ def copy_folder(src, dest): - \ No newline at end of file + diff --git a/build_scripts/win/deploy.cmd b/build_scripts/win/deploy.cmd index cdbaad9..7ba1243 100644 --- a/build_scripts/win/deploy.cmd +++ b/build_scripts/win/deploy.cmd @@ -1,8 +1,8 @@ @ECHO OFF python build.py deploy IF ERRORLEVEL 1 EXIT /B 1 -call test.bat +call current_build.bat IF ERRORLEVEL 1 EXIT /B 1 -del test.bat +del current_build.bat IF ERRORLEVEL 1 EXIT /B 1 PAUSE diff --git a/build_scripts/win/package.cmd b/build_scripts/win/package.cmd index 76ced5c..95a2084 100644 --- a/build_scripts/win/package.cmd +++ b/build_scripts/win/package.cmd @@ -1,8 +1,8 @@ @ECHO OFF python build.py package IF ERRORLEVEL 1 EXIT /B 1 -call test.bat +call current_build.bat IF ERRORLEVEL 1 EXIT /B 1 -del test.bat +del current_build.bat IF ERRORLEVEL 1 EXIT /B 1 PAUSE diff --git a/build_windows.cmd b/build_windows.cmd index be5ab62..2133014 100644 --- a/build_windows.cmd +++ b/build_windows.cmd @@ -24,13 +24,13 @@ SET project_dir=%folder_path% ECHO %top_level_activity%: Calling build script. %PYTHON_LOC%python %project_dir%\build_scripts\win\build.py build IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% -call %project_dir%\build_scripts\win\test.bat +call %project_dir%\build_scripts\win\current_build.bat IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% ECHO %top_level_activity%: Calling deployment script. %PYTHON_LOC%python %project_dir%\build_scripts\win\build.py deploy IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% -call %project_dir%\build_scripts\win\test.bat +call %project_dir%\build_scripts\win\current_build.bat IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% REM The average dev doesn't need to package and zip it, just build it and test. @@ -42,7 +42,7 @@ IF NOT DEFINED BUILD_PACKAGE ( ECHO %top_level_activity%: Calling packaging script. %PYTHON_LOC%python %project_dir%\build_scripts\win\build.py package IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% -call %project_dir%\build_scripts\win\test.bat +call %project_dir%\build_scripts\win\current_build.bat IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% CD %original_dir%