Updates to avoid using with VCProjectApi(ManageProject) as api:

Author: TimSVector

src/main/resources/scripts/copy_build_dir.py

@@ -237,9 +237,9 @@ def run(ManageProjectName, Level, BaseName, Env, workspace, vCastProjectWorkspac
 
 def getVcastProjectWorkspace(args):
 
-    with VCProjectApi(args.ManageProject) as vc_api:
-#    vc_api = VCProjectApi(args.ManageProject)
-        vCastProjectWorkspace = vc_api.project.workspace
+    vc_api = VCProjectApi(args.ManageProject)
+    vCastProjectWorkspace = vc_api.project.workspace
+    vc_api.close()
 
     return vCastProjectWorkspace
 

src/main/resources/scripts/create_index_html.py

@@ -55,19 +55,23 @@ def create_index_html(mpName):
     import pathlib
     from vector.apps.DataAPI.vcproject_api import VCProjectApi
     from vector.apps.ReportBuilder.custom_report import CustomReport
-    with VCProjectApi(mpName) as api:
-        # Set custom report directory to the where this script was
-        # found. Must contain sections/index_section.py
-        rep_path = pathlib.Path(__file__).parent.resolve()
-        output_file="index.html"
-        CustomReport.report_from_api(
-                api=api,
-                title="HTML Reports",
-                report_type="INDEX_FILE",
-                formats=["HTML"],
-                output_file=output_file,
-                sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','INDEX_SECTION', 'CUSTOM_FOOTER'],
-                customization_dir=rep_path)
+
+    api = VCProjectApi(mpName)
+    
+    # Set custom report directory to the where this script was
+    # found. Must contain sections/index_section.py
+    rep_path = pathlib.Path(__file__).parent.resolve()
+    output_file="index.html"
+    CustomReport.report_from_api(
+            api=api,
+            title="HTML Reports",
+            report_type="INDEX_FILE",
+            formats=["HTML"],
+            output_file=output_file,
+            sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','INDEX_SECTION', 'CUSTOM_FOOTER'],
+            customization_dir=rep_path)
+                
+    api.close()
 
 def create_index_html_body ():
 
@@ -105,52 +109,28 @@ def create_index_html_body ():
     return topLevelEntries, indEnvFullEntries, miscEntries
 
 
-def run(html_file_list):
+def run(mpName):
 
     print("Creating index.html for VectorCAST Project Reports")
 
-    if len(html_file_list) > 0:
-        create_index_html (html_file_list)
-        
-    else:
-        print("No HTML reports found")
-        return 1
-        
-    try:
-        with open("index.html", 'w') as fd:
-            fd.write(indexHtmlText)
-    except:
-        print("Unable to write to index.html")
-        return 1
-    
+    create_index_html (mpName)
+
     return 0
 
 
 def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--html_base_dir", help='Set the base directory of the html_reports directory. The default is the workspace directory', default = "html_reports")
+    parser = argparse.ArgumentParser()    
+    parser.add_argument('ManageProject',       help='Manager Project Name')
     args = parser.parse_args()   
 
+    
+    mpName = args.ManageProject
     try:
         prj_dir = os.environ['CI_PROJECT_DIR'].replace("\\","/") + "/"
     except:
         prj_dir = os.getcwd().replace("\\","/") + "/"
-    
-    tempHtmlReportList = glob.glob("*.html")
-    tempHtmlReportList += glob.glob(os.path.join(args.html_base_dir, "*.html"))
-    htmlReportList = []
-
-    for report in tempHtmlReportList:
-        if "index.html" not in report:
-            report = report.replace("\\","/")
-            report = report.replace(prj_dir,"")
-            htmlReportList.append(report)
-            
-    return run(htmlReportList)
+                
+    return run(mpName)
 
 if __name__ == "__main__" :
-    if len(sys.argv) > 0:
-        ret = create_custom_index_html()
-    else:
-        ret = main()
-    sys.exit (ret)
+    sys.exit (main())

src/main/resources/scripts/generate_pclp_reports.py

@@ -341,18 +341,19 @@ def generate_html_report(mpName, input_xml, output_html):
     if output_html is None:
         output_html = "pclp_findings.html"
 
-    with VCProjectApi(mpName) as api:
-        # Set custom report directory to the where this script was
-        # found. Must contain sections/index_section.py
-        rep_path = pathlib.Path(__file__).parent.resolve()
-        CustomReport.report_from_api(
-                api=api,
-                title="PC-Lint Plus Results",
-                report_type="INDEX_FILE",
-                formats=["HTML"],
-                output_file=output_html,
-                sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','PCLP_SUMMARY_SECTION','PCLP_DETAILS_SECTION','PCLP_SOURCE_SECTION', 'CUSTOM_FOOTER'],
-                customization_dir=rep_path)
+    api = VCProjectApi(mpName)
+    # Set custom report directory to the where this script was
+    # found. Must contain sections/index_section.py
+    rep_path = pathlib.Path(__file__).parent.resolve()
+    CustomReport.report_from_api(
+            api=api,
+            title="PC-Lint Plus Results",
+            report_type="INDEX_FILE",
+            formats=["HTML"],
+            output_file=output_html,
+            sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','PCLP_SUMMARY_SECTION','PCLP_DETAILS_SECTION','PCLP_SOURCE_SECTION', 'CUSTOM_FOOTER'],
+            customization_dir=rep_path)
+    api.close()
 
 def has_any_coverage(line):