Fixed typos and unbalanced quotes in windows single template

Author: TimSVector

src/main/resources/scripts/baselineSingleJobWindows.txt

@@ -20,12 +20,12 @@ if "%VCAST_USE_STRICT_IMPORT%"=="TRUE" (
 :: Use Imported Results
 if "%VCAST_USE_IMPORTED_RESULTS%"=="TRUE" (  
     if "%VCAST_USE_LOCAL_IMPORTED_RESULTS%"=="TRUE" if exist "%VCAST_PROJECT_BASENAME%_results.vcr" (
-        %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --import-result="%VCAST_PROJECT_BASENAME%_results.vcr""
+        %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --import-result=""%VCAST_PROJECT_BASENAME%_results.vcr"""
         %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --full-status""
         if exist %VCAST_PROJECT_BASENAME%_results.vcr  ( copy %VCAST_PROJECT_BASENAME%_results.vcr %VCAST_PROJECT_BASENAME%_results_orig.vcr ) 
     ) 
     if "%VCAST_USE_EXTERNAL_IMPORTED_RESULTS%"=="TRUE" if exist "%VCAST_USE_EXTERNAL_FILENAME%" ( 
-        %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --import-result="%VCAST_USE_EXTERNAL_FILENAME%"
+        %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --import-result=""%VCAST_USE_EXTERNAL_FILENAME%"""
         %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --full-status"
     ) 
 )
@@ -38,7 +38,7 @@ del combined_incr_rebuild.tmp > nul 2>&1
 del %VCAST_PROJECT_BASENAME%_full_report.html_tmp > nul 2>&1
 del %VCAST_PROJECT_BASENAME%_metrics_report.html_tmp > nul 2>&1
 
-%VCAST_EXECUTE_PREAMBLE_WIN% %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --build-execute %VCAST_USE_CBT% --output %VCAST_PROJECT_BASENAME%_rebuild.%VCAST_HTML_OR_TEXT% 
+%VCAST_EXECUTE_PREAMBLE_WIN% %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --build-execute %VCAST_USE_CBT% --output %VCAST_PROJECT_BASENAME%_rebuild.%VCAST_HTML_OR_TEXT%"
 copy command.log complete_build.log
 
 if exist "%VCAST_PROJECT_BASENAME%_rebuild.%VCAST_HTML_OR_TEXT%" (
@@ -58,7 +58,7 @@ if "%VCAST_OPTION_USE_REPORTING%" == "TRUE" (
         %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\cobertura.py" --extended %VCAST_PROJECT_NAME%
     )
     %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\full_report_no_toc.py" "%VCAST_PROJECT_NAME%" 
-    %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --create-report=aggregate --output=\"%VCAST_PROJECT_BASENAME%_aggregate_report.html"
+    %VECTORCAST_DIR%\vpython "%WORKSPACE%\vc_scripts\managewait.py" --wait_time %VCAST_WAIT_TIME% --wait_loops %VCAST_WAIT_LOOPS% --command_line "--project %VCAST_PROJECT_NAME% --create-report=aggregate --output=""%VCAST_PROJECT_BASENAME%_aggregate_report.html"""
 
     :: Use Imported Results
     if "%VCAST_USE_IMPORTED_RESULTS%"=="TRUE" if "%VCAST_USE_LOCAL_IMPORTED_RESULTS%"=="TRUE" ( 

src/main/resources/scripts/incremental_build_report_aggregator.py

@@ -27,6 +27,7 @@
 import sys
 import shutil
 import locale
+import os, shutil, glob, logging
 
 # adding path
 workspace = os.getenv("WORKSPACE")
@@ -122,9 +123,6 @@ def parse_text_files(mpName, verbose = False):
         if os.path.exists(file):
           shutil.move(file, "rebuild_reports/"+file)
 
-import os, shutil, glob, logging
-from bs4 import BeautifulSoup
-
 def parse_html_files(mpName, verbose = False):
     """
     Parse and merge multiple *_rebuild.html reports into one combined report.

src/main/resources/scripts/vcast_exec.py

@@ -43,8 +43,6 @@
     python_path_updates = os.path.join(os.environ['VECTORCAST_DIR'], "DATA", "python")
     sys.path.append(python_path_updates)
 
-from datetime import datetime
-
 try:
     import parallel_build_execute
 except:
@@ -478,7 +476,7 @@ def runExec(self):
             build_log = self.manageWait.exec_manage_command (cmd)
             with open(self.build_log_name,"wb") as fd: 
                 fd.write(build_log.encode(self.encFmt, "replace"))
-        print("End   runExec: " + str(datetime.now()))
+
 
 if __name__ == '__main__':
 
@@ -539,6 +537,9 @@ def runExec(self):
         parser.error("ManageProject is required unless --version is specified")
         sys.exit(0)
 
+    if not args.ManageProject.endswith(".vcm"):
+        args.ManageProject += ".vcm"
+        
     if args.ManageProject and not os.path.isfile(args.ManageProject):
         print ("Manage project (.vcm file) provided does not exist: " + args.ManageProject)
         print ("exiting...")
@@ -551,9 +552,6 @@ def runExec(self):
     if args.ci:
         os.environ['VCAST_USE_CI_LICENSES'] = "1"
 
-    if not args.ManageProject.endswith(".vcm"):
-        args.ManageProject += ".vcm"
-        
     os.environ['VCAST_MANAGE_PROJECT_DIRECTORY'] = os.path.abspath(args.ManageProject).rsplit(".",1)[0]
 
     if not os.path.isfile(args.ManageProject):