Print benchmark and test output, improve external build folder structure, and use parallel build

Scripts/BuildAndInstallCoDeLib.py

@@ -46,8 +46,8 @@ def BuildAndInstallCoDeLib(
         buildEnv.GetTargetPlatform()
     )
 
-    ExternalLibInstallPath = Path(
-        ExternalLibPath / "Install" / targetPlatformString / BuildTypeString
+    ExternalZlibLibInstallPath = Path(
+        ExternalLibPath / "zlib/Install" / targetPlatformString / BuildTypeString
     )
 
     CoDeLibRootPath = Path(RepositoryRootPath / ProjectName)
@@ -76,7 +76,7 @@ def BuildAndInstallCoDeLib(
         CoDeLibRootPath,
         BuildDirectory,
         InstallDirectory,
-        ExternalLibInstallPath,
+        ExternalZlibLibInstallPath,
         BuildTypeString,
     )
     print(configureCommand)
@@ -89,7 +89,7 @@ def BuildAndInstallCoDeLib(
     print("==============================")
     print(ProjectName + ": Building ({})".format(BuildTypeString))
     print("==============================")
-    buildCommand = "cmake --build {0}".format(BuildDirectory)
+    buildCommand = "cmake --build {0} -- -j 4".format(BuildDirectory)
     print(buildCommand)
     subprocess.run(
         buildCommand,

Scripts/BuildAndInstallExternalLibs.py

@@ -52,10 +52,14 @@ def BuildAndInstallZlib(
 
     TopLevelCMakeListsDirectory = Path(ExternalLibPath / ProjectName)
     BuildDirectory = Path(
-        ExternalLibPath / "Build" / ProjectName / targetPlatformString / BuildTypeString
+        ExternalLibPath / ProjectName / "Build" / targetPlatformString / BuildTypeString
     )
     InstallDirectory = Path(
-        ExternalLibPath / "Install" / targetPlatformString / BuildTypeString
+        ExternalLibPath
+        / ProjectName
+        / "Install"
+        / targetPlatformString
+        / BuildTypeString
     )
 
     if not BuildDirectory.exists():
@@ -88,7 +92,7 @@ def BuildAndInstallZlib(
     print("==============================")
     print(ProjectName + ": Building ({})".format(BuildTypeString))
     print("==============================")
-    buildCommand = "cmake --build {0}".format(BuildDirectory)
+    buildCommand = "cmake --build {0} -- -j 4".format(BuildDirectory)
     print(buildCommand)
     subprocess.run(
         buildCommand,

Scripts/BuildBenchmark.py

@@ -52,8 +52,8 @@ def BuildBenchmark(
     CoDeLibInstallDirectory = Path(
         CoDeLibPath / "Install" / targetPlatformString / BuildTypeString
     )
-    ExternalLibInstallPath = Path(
-        ExternalLibPath / "Install" / targetPlatformString / BuildTypeString
+    ExternalZlibLibInstallPath = Path(
+        ExternalLibPath / "zlib/Install" / targetPlatformString / BuildTypeString
     )
 
     BenchmarkRootPath = Path(RepositoryRootPath / ProjectName)
@@ -75,7 +75,7 @@ def BuildBenchmark(
         CoDeLibInstallDirectory,
         BenchmarkRootPath,
         BuildDirectory,
-        ExternalLibInstallPath,
+        ExternalZlibLibInstallPath,
         BuildTypeString,
     )
     subprocess.run(
@@ -87,7 +87,7 @@ def BuildBenchmark(
     print("==============================")
     print(ProjectName + ": Building ({})".format(BuildTypeString))
     print("==============================")
-    buildCommand = "cmake --build {0}".format(BuildDirectory)
+    buildCommand = "cmake --build {0} -- -j 4".format(BuildDirectory)
     subprocess.run(
         buildCommand,
         shell=True,

Scripts/CleanAll.py

@@ -14,15 +14,15 @@
 CoDeLibInstallPath = Path(CoDeLibPath / "Install")
 
 ExternalLibPath = Path(ProjectRootPath / "External")
-ExternalLibBuildPath = Path(ExternalLibPath / "Build")
-ExternalLibInstallPath = Path(ExternalLibPath / "Install")
+ExternalZlibLibBuildPath = Path(ExternalLibPath / "zlib/Build")
+ExternalZlibLibInstallPath = Path(ExternalLibPath / "zlib/Install")
 
 DirectoriesToRemove = [
     BenchmarkBuildPath,
     CoDeLibBuildPath,
     CoDeLibInstallPath,
-    ExternalLibBuildPath,
-    ExternalLibInstallPath,
+    ExternalZlibLibBuildPath,
+    ExternalZlibLibInstallPath,
 ]
 
 

Scripts/RunBenchmark.py

@@ -117,8 +117,6 @@ def RunBenchmark(
             + "-----------------------------------------"
             + "\n"
         )
-        print("\n")
-        print(BenchmarkHeader, end="")
 
         BenchmarkExecutablePath = Path(BuildDirectory / BenchmarkName)
         if targetPlatform == EnvironmentConfig.Platform.WINDOWS:
@@ -129,7 +127,6 @@ def RunBenchmark(
         )
 
         BenchmarkCommand = str(BenchmarkExecutablePath) + " " + BenchmarkOptions
-        print("Command: {}".format(BenchmarkCommand))
 
         RawBenchmarkResultsFileNames.append(
             GetBenchmarkResultsFileRawName(buildConfig, BenchmarkName)
@@ -177,3 +174,8 @@ def RunBenchmark(
     BuildEnv, EnvironmentConfig.BuildConfig.RELEASE, BenchmarkList
 )
 AppendBenchmarkResultToTotalResultFile(BenchmarkResultFileName, RawResultFiles)
+
+# Print the content of BenchmarkResultFileName to the console
+print("\n")
+with open(BenchmarkResultFileName, "r") as file:
+    print(file.read())

Scripts/RunTest.py

@@ -104,8 +104,6 @@ def RunTests(
             + "-----------------------------------------"
             + "\n"
         )
-        print("\n")
-        print(testHeader, end="")
 
         TestExecutablePath = Path(CoDeLibBuildPath / "Test" / testName)
         if targetPlatform == EnvironmentConfig.Platform.WINDOWS:
@@ -116,8 +114,6 @@ def RunTests(
         TestOptions = '"' + str(BenchmarkTestFilesPath) + '/"'
         TestCommand = str(TestExecutablePath) + " " + TestOptions
 
-        print("Command: {}".format(TestCommand))
-
         RawTestResultsFileNames.append(GetTestResultsFileRawName(buildConfig, testName))
 
         TestResultsFileRaw = open(RawTestResultsFileNames[-1], "w")
@@ -156,3 +152,8 @@ def RunTests(
 
 RawResultFiles = RunTests(BuildEnv, EnvironmentConfig.BuildConfig.RELEASE, TestList)
 AppendTestResultToTotalResultFile(TestResultsFileName, RawResultFiles)
+
+# Print the content of BenchmarkResultFileName to the console
+print("\n")
+with open(TestResultsFileName, "r") as file:
+    print(file.read())