From d4b09c76addee31c0814186d6035bb921d8a7bad Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Wed, 2 Jan 2019 22:33:02 +0100
Subject: [PATCH] Update python scripts, build_windows.cmd

---
 build_scripts/win/build.py  | 10 ++++------
 build_scripts/win/common.py | 17 ++++++++---------
 build_scripts/win/test.bat  |  4 ++++
 build_windows.cmd           | 16 +++++++++++++++-
 4 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 build_scripts/win/test.bat

diff --git a/build_scripts/win/build.py b/build_scripts/win/build.py
index 35f3b63..7d3e86c 100644
--- a/build_scripts/win/build.py
+++ b/build_scripts/win/build.py
@@ -1,11 +1,11 @@
 import os
 from sys import argv
+import inspect
 from common import *
 
 def package():
     set_current_activity("PACKAGE")
-    set_original_folder(os.getcwd())
-    set_project_folder(os.path.abspath(os.path.join(ORIGINAL_DIR , "..\..")))
+    set_dirs()
 
     say("Testing if all required build environment variables are set:")
     ZIP_LOC = get_required_env_var_path(ZIP_LOC_VAR_NAME, ZIP_LOC_DEFAULT)
@@ -34,8 +34,7 @@ def package():
 
 def deploy():
     set_current_activity("DEPLOY")
-    set_original_folder(os.getcwd())
-    set_project_folder(os.path.abspath(os.path.join(ORIGINAL_DIR , "..\..")))
+    set_dirs()
 
     say("Testing if all required build environment variables are set:")
     QT_LOC = get_required_env_var_path(QT_LOC_VAR_NAME, QT_LOC_DEFAULT)
@@ -91,8 +90,7 @@ def deploy():
 
 def build():
     set_current_activity("BUILD")
-    set_original_folder(os.getcwd())
-    set_project_folder(os.path.abspath(os.path.join(ORIGINAL_DIR , "..\..")))
+    set_dirs()
 
     COMPILE_MODE = ""
     COMPILER = ""
diff --git a/build_scripts/win/common.py b/build_scripts/win/common.py
index 0dfb857..a33a0b0 100644
--- a/build_scripts/win/common.py
+++ b/build_scripts/win/common.py
@@ -85,24 +85,23 @@ def get_required_env_var_path(env_var_name: str, default_env_var_value: str):
     return path
     
 def create_batch_file():
-    file = open("test.bat", "w+")
+    file = open(get_project_dir() + "\\build_scripts\\win\\test.bat", "w+")
     file.write(bat_file_contents)
     file.close()    
 
 def exit_on_error(error_number):
     sys.exit(error_number)
     
-def set_original_folder(path):
+def set_dirs():
     global ORIGINAL_DIR
-    ORIGINAL_DIR = path
-        
-def set_project_folder(path):
     global PROJECT_DIR
     global DEPLOY_DIR
-    PROJECT_DIR = path   
-    DEPLOY_DIR = PROJECT_DIR + OUTPUT_DIR
-         
-        
+    ORIGINAL_DIR = os.path.dirname(__file__)
+    PROJECT_DIR = os.path.abspath(os.path.join(ORIGINAL_DIR, r"..\.."))
+    DEPLOY_DIR = DEPLOY_DIR = PROJECT_DIR + OUTPUT_DIR
+    
+    print(ORIGINAL_DIR)
+    
 def get_project_dir():
     return PROJECT_DIR
         
diff --git a/build_scripts/win/test.bat b/build_scripts/win/test.bat
new file mode 100644
index 0000000..9f346b7
--- /dev/null
+++ b/build_scripts/win/test.bat
@@ -0,0 +1,4 @@
+set PATH=%PATH%;C:\Qt\5.11.1\msvc2017_64\bin\;
+@ECHO Starting windeployqt:
+"windeployqt" --dir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\qtdata --libdir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings --plugindir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\qtdata\plugins --no-system-d3d-compiler --no-opengl-sw --release --qmldir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\src\res\qml\ Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\AdvancedSettings.exe
+@ECHO windeployqt finished.
diff --git a/build_windows.cmd b/build_windows.cmd
index 2a44535..dcd44f1 100644
--- a/build_windows.cmd
+++ b/build_windows.cmd
@@ -27,6 +27,16 @@ IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
 
 ECHO %top_level_activity%: Calling deployment script.
 CALL %project_dir%\build_scripts\win\deploy.cmd
+=======
+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
+IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
+
+ECHO %top_level_activity%: Calling deployment script.
+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
 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.
@@ -37,8 +47,12 @@ IF NOT DEFINED BUILD_PACKAGE (
 )
 ECHO %top_level_activity%: Calling packaging script.
 CALL %project_dir%\build_scripts\win\package.cmd
+=======
+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
 IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
 
 CD %original_dir%
 
-ECHO %top_level_activity%: MASTER DONE.
\ No newline at end of file
+ECHO %top_level_activity%: MASTER DONE.