Release 6.6.0

* GLES2, GLES3, Vulkan.SdfFonts
  * Added support for MTSDF fonts
  * Added contour rendering
* Vulkan.AntiAliasing
  * App failed to run on on Android Pixel6 due to incorrect descriptor pool size allocations.
  * Enabled on all platforms.
* Vulkan.Gears converted to use the common vulkan demo host.
* VulkanInfo added vulkan profiles support
* Misc
  * Arcball camera control can now be inverted.
  * Google Angle compatibility testing.
  * BitmapFont V4 with support for MSDF & MTSDF fonts.
  * Vulkan demo host fixed a validation layer warning.
  * Updated to latest Android Studio version.
  * Updated OpenCV to 4.1.0
  * Updated RapidVulkan to 1.3.296
  * Updated PuxiXML top 1.15
  * Updated FMT to 11.1.2

Change-Id: I11db6be934ed88d20fd5b6993008c85e7b2d941b

Author: ReneThrane

.Config/FslBuildGen/BuildExternal/Commands/PackageRecipeValidateCommandAddTool.py

@@ -38,7 +38,8 @@
 from FslBuildGen.DataTypes import BuildRecipeValidateMethod
 
 class PackageRecipeValidateCommandAddTool(PackageRecipeValidateCommand):
-    def __init__(self, name: str, minVersion: Optional[str], versionCommand: Optional[str], versionRegEx: Optional[str], help: Optional[str]) -> None:
+    def __init__(self, name: str, minVersion: Optional[str], versionCommand: Optional[str], versionRegEx: Optional[str],
+                 versionSplitChar: str, help: Optional[str]) -> None:
         super().__init__("AddTool", BuildRecipeValidateCommand.AddTool, help)
         if '\\' in name:
             raise Exception("A path can not contain backslash '\\': '{0}'".format(name))
@@ -49,6 +50,7 @@ def __init__(self, name: str, minVersion: Optional[str], versionCommand: Optiona
         self.MinVersion = minVersion
         self.VersionCommand = versionCommand
         self.VersionRegEx = versionRegEx
+        self.VersionSplitChar = versionSplitChar
         self.__ValidateVersionCheck()
 
     def __ValidateVersionCheck(self) -> None:

.Config/FslBuildGen/BuildExternal/Commands/PackageRecipeValidateCommandFindExecutableFileInPath.py

@@ -41,7 +41,8 @@
 from FslBuildGen.DataTypes import BuildRecipeValidateCommand
 
 class PackageRecipeValidateCommandFindExecutableFileInPath(PackageRecipeValidateCommand):
-    def __init__(self, name: str, alternatives: List[str], expectedPath: Optional[str], minVersion: Optional[str], versionCommand: Optional[str], versionRegEx: Optional[str],
+    def __init__(self, name: str, alternatives: List[str], expectedPath: Optional[str], minVersion: Optional[str], versionCommand: Optional[str],
+                 versionRegEx: Optional[str], versionSplitChar: str,
                  addOnErrorWarning: List[PackageRecipeValidateCommandFindExecutableFileInPathAddOnErrorWarning], help: Optional[str]) -> None:
         super().__init__("FindFileInPath", BuildRecipeValidateCommand.FindExecutableFileInPath, help)
 
@@ -63,6 +64,7 @@ def __init__(self, name: str, alternatives: List[str], expectedPath: Optional[st
         self.MinVersion = minVersion
         self.VersionCommand = versionCommand
         self.VersionRegEx = versionRegEx
+        self.VersionSplitChar = versionSplitChar
 
         self.AddOnErrorWarning = addOnErrorWarning
 

.Config/FslBuildGen/BuildExternal/PackageRecipeInstallationUtil.py

@@ -82,7 +82,7 @@ def ToPackageRecipeValidateCommandAddLib(pathBuilder: PathBuilder, command: XmlR
 
     @staticmethod
     def ToPackageRecipeValidateCommandAddTool(pathBuilder: PathBuilder, command: XmlRecipeValidateCommandAddTool) -> PackageRecipeValidateCommandAddTool:
-        return PackageRecipeValidateCommandAddTool(command.Name, command.MinVersion, command.VersionCommand, command.VersionRegEx, command.Help)
+        return PackageRecipeValidateCommandAddTool(command.Name, command.MinVersion, command.VersionCommand, command.VersionRegEx, command.VersionSplitChar, command.Help)
 
     @staticmethod
     def ToPackageRecipeValidateCommandEnvironmentVariable(command: XmlRecipeValidateCommandEnvironmentVariable) -> PackageRecipeValidateCommandEnvironmentVariable:
@@ -105,7 +105,7 @@ def ToPackageRecipeValidateCommandFindExecutableFileInPath(command: XmlRecipeVal
         addOnErrorWarningList = PackageRecipeInstallationUtil.ToPackageRecipeValidateCommandFindExecutableFileInPathAddOnErrorWarningList(command.AddOnErrorWarning)
         return PackageRecipeValidateCommandFindExecutableFileInPath(command.Name, command.Alternatives, command.ExpectedPath,
                                                                     command.MinVersion, command.VersionCommand, command.VersionRegEx,
-                                                                    addOnErrorWarningList, command.Help)
+                                                                    command.VersionSplitChar, addOnErrorWarningList, command.Help)
 
     @staticmethod
     def ToPackageRecipeValidateCommandFindFileInPath(command: XmlRecipeValidateCommandFindFileInPath) -> PackageRecipeValidateCommandFindFileInPath:

.Config/FslBuildGen/BuildExternal/ValidationEngine.py

@@ -318,7 +318,8 @@ def __CheckOnErrorWarnings(self, foundVersionList: List[int], versionRegEx: str,
             self.__CheckOnErrorWarning(foundVersionList, versionRegEx, warning)
 
     def __TryValidateCommandVersion(self, cmd: str, versionCommand: str, versionRegEx: str, minVersion: Optional[str],
-                                    addOnErrorWarning: List[PackageRecipeValidateCommandFindExecutableFileInPathAddOnErrorWarning]) -> List[int]:
+                                    addOnErrorWarning: List[PackageRecipeValidateCommandFindExecutableFileInPathAddOnErrorWarning],
+                                    versionSplitChar: str) -> List[int]:
         output = ""
         try:
             runCmd = [cmd, versionCommand]
@@ -343,11 +344,16 @@ def __TryValidateCommandVersion(self, cmd: str, versionCommand: str, versionRegE
         if len(match.groups()) != 1:
             self.__Log.DoPrintWarning("The regex '{0}' did not capture a group with version information".format(versionRegEx))
         matchResult = match.group(1)
+        return self.__TryParseVersion(versionRegEx, minVersion, addOnErrorWarning, matchResult, versionSplitChar)
+
+
+    def __TryParseVersion(self, versionRegEx: str, minVersion: Optional[str],
+                          addOnErrorWarning: List[PackageRecipeValidateCommandFindExecutableFileInPathAddOnErrorWarning], matchResult: str, splitChar: str) -> List[int]:
         try:
             # time to parse the version string
-            foundVersionList = Util.ParseVersionString(matchResult, maxValues=4)
+            foundVersionList = Util.ParseVersionString(matchResult, splitChar=splitChar, maxValues=4)
             if minVersion is not None:
-                minVersionList = Util.ParseVersionString(minVersion, maxValues=4)
+                minVersionList = Util.ParseVersionString(minVersion, splitChar=splitChar, maxValues=4)
                 if len(minVersionList) > len(foundVersionList):
                     self.__Log.DoPrintWarning("The regex '{0}' did not capture the enough version number elements to compare against the min version '{1}'".format(versionRegEx, minVersion))
                     return []
@@ -383,7 +389,8 @@ def __ValidateFindExecutableFileInPath(self, rErrorRecordList: List[ErrorRecord]
             if result and value is not None and command.VersionCommand is not None:
                 if command.VersionCommand is None or command.VersionRegEx is None:
                     raise Exception("Internal error")
-                foundVersion = self.__TryValidateCommandVersion(value, command.VersionCommand, command.VersionRegEx, command.MinVersion, command.AddOnErrorWarning)
+                foundVersion = self.__TryValidateCommandVersion(value, command.VersionCommand, command.VersionRegEx, command.MinVersion,
+                                                                command.AddOnErrorWarning, command.VersionSplitChar)
                 result = len(foundVersion) > 0
 
             # Cache information about what we discovered
@@ -489,7 +496,7 @@ def __ValidateAddTool(self, rErrorRecordList: List[ErrorRecord],
             if result and value is not None and command.VersionCommand is not None:
                 if command.VersionCommand is None or command.VersionRegEx is None:
                     raise Exception("Internal error")
-                foundVersion = self.__TryValidateCommandVersion(value, command.VersionCommand, command.VersionRegEx, command.MinVersion, [])
+                foundVersion = self.__TryValidateCommandVersion(value, command.VersionCommand, command.VersionRegEx, command.MinVersion, [], command.VersionSplitChar)
                 result = len(foundVersion) > 0
 
             exeRecord = PackageRecipeResultFoundExecutable(command.Name, command.Name, value, self.__ToVersion(foundVersion))

.Config/FslBuildGen/Config.py

@@ -86,6 +86,7 @@ def __init__(self, log: Log,
         self.GroupException = True  # type: bool
         # Variant extension is getting closer to working, so lets enable it
         self.AllowVariantExtension = True  # type: bool
+        self.AllowExeDependency = toolConfig.ProjectRootConfig.AllowExeDependency # type: bool
         self.GenFileName = toolConfig.GenFileName
 
         self.AllowDevelopmentPlugins = allowDevelopmentPlugins

.Config/FslBuildGen/Generator/CMakeGeneratorUtil.py

@@ -108,6 +108,7 @@ def __init__(self, sdkConfigTemplatePath: str, strTemplatePath: str, overrideDir
         self.PackageDependencyTargetLinkLibraries = self.__ReadFile("PackageDependency_target_link_libraries.txt")
         self.PackageDependencyTargetCompileDefinitions = self.__ReadFile("PackageDependency_target_compile_definitions.txt")
         self.PackageDependencyFindPackage = self.__ReadFile("PackageDependency_find_package.txt")
+        self.PackageDependencyFindPackageInternal = self.__ReadOptionalFile("PackageDependency_find_package_internal.txt", self.PackageDependencyFindPackage)
         self.SnippetTargetCompileOptionsDefault = self.__ReadFile("Snippet_TargetCompileOptions_Default.txt")
         self.SnippetTargetCompileFeaturesDefault = self.__ReadFile("Snippet_TargetCompileFeatures_Default.txt")
         self.SnippetTargetCompileFeaturesInterface = self.__ReadFile("Snippet_TargetCompileFeatures_Interface.txt")

.Config/FslBuildGen/Generator/GeneratorAndroidGradleCMake.py

@@ -213,7 +213,7 @@ def __GenerateCMakeFile(self, config: Config,
         sourceFiles = CMakeGeneratorUtil.ExpandPathAndJoin(toolConfig, package, package.ResolvedBuildSourceFiles)
         linkLibrariesDirectDependencies = CMakeGeneratorUtil.BuildTargetLinkLibrariesForDirectDependencies(config, package,
                                                                                                            template.PackageDependencyTargetLinkLibraries,
-                                                                                                           template.PackageDependencyFindPackage,
+                                                                                                           template.PackageDependencyFindPackageInternal,
                                                                                                            ignoreLibs)
         linkLibrariesDirectDependencies = linkLibrariesDirectDependencies.replace(Variable.RecipeVariant, "${ANDROID_ABI}")
         directDefinitions = CMakeGeneratorUtil.BuildDirectDefinitions(config, package, template.PackageDependencyTargetCompileDefinitions)

.Config/FslBuildGen/Generator/GeneratorCMake.py

@@ -217,7 +217,7 @@ def __GenerateCMakeFile(self, log: Log, toolConfig: ToolConfig, cmakeBuildPackag
 
         linkLibrariesDirectDependencies = CMakeGeneratorUtil.BuildTargetLinkLibrariesForDirectDependencies(log, package,
                                                                                                            template.PackageDependencyTargetLinkLibraries,
-                                                                                                           template.PackageDependencyFindPackage)
+                                                                                                           template.PackageDependencyFindPackageInternal)
 
         extraDefines = None
         if generatorMode == CMakeGeneratorMode.Tidy and not package.IsVirtual:

.Config/FslBuildGen/Main.py

@@ -165,14 +165,15 @@ def Resolve(self, platformContext: PlatformContext,
         configIsDryRun = self.Config.IsDryRun
         configIgnoreNotSupported = self.Config.IgnoreNotSupported
         configAllowVariantExtension = self.Config.AllowVariantExtension
+        configAllowExeDependency = self.Config.AllowExeDependency
         configGroupException = self.Config.GroupException
         toolConfig = self.Config.ToolConfig
 
         packageResolver = PackageResolver(log, configBuildDir, configIsDryRun, configIgnoreNotSupported, configAllowVariantExtension,
                                           configGroupException, toolConfig, platformContext, sourceGenFiles, autoAddRecipeExternals, fullResolve,
                                           self.MarkExternalLibFirstUse,
                                           packageFilters.RecipeFilterManager, packageManagerFilter, externalVariantConstraints,
-                                          engineResolveConfig, self.__writeGraph, filterMode)
+                                          engineResolveConfig, self.__writeGraph, filterMode, configAllowExeDependency)
         self.IsFullResolve = fullResolve
         self.Packages = packageResolver.Packages
         return self.Packages

.Config/FslBuildGen/PackageBuilder.py

@@ -65,7 +65,7 @@ def __init__(self, log: Log, configBuildDir: str, configIgnoreNotSupported: bool
                  platformName: str, hostPlatformName: str, basicBuildConfig: BasicBuildConfig, generatorInfo: GeneratorInfo,
                  genFiles: List[XmlGenFile], packageManagerFilter: PackageManagerFilter,
                  externalVariantConstraints: ExternalVariantConstraints, engineResolveConfig: EngineResolveConfig,
-                 filterMode: FilterMode,
+                 filterMode: FilterMode, allowExeDependency: bool,
                  logVerbosity: int = 1, writeGraph: bool = False) -> None:
         super().__init__()
 
@@ -74,7 +74,7 @@ def __init__(self, log: Log, configBuildDir: str, configIgnoreNotSupported: bool
 
         packageManager = PackageManager(log, configBuildDir, configIgnoreNotSupported, toolConfig, platformName, hostPlatformName, basicBuildConfig,
                                         generatorInfo, genFiles, packageManagerFilter, externalVariantConstraints, engineResolveConfig,
-                                        writeGraph, filterMode)
+                                        writeGraph, filterMode, allowExeDependency)
         packages = packageManager.Packages
 
         # Build a graph containing all packages