From db43cf055f954efbaa50157637a034511eed2849 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 2 Apr 2013 19:13:05 +0200 Subject: PFW: [PFW script generator] Rename sup* to *Group BZ: 97797 Need to support the new tags for supDomains and supConf Add domainGroup, confGroup and confType in corresponding match rules. Change-Id: Ia975e77dcd8f4e9c4f8d1a48e124ecdea0647375 Signed-off-by: Kevin Rocard Reviewed-on: http://android.intel.com:8080/99542 Reviewed-by: Wagner, David Reviewed-by: cactus Reviewed-by: Gonzalve, Sebastien Tested-by: Dixon, CharlesX Reviewed-by: buildbot Tested-by: buildbot --- tools/xmlGenerator/PFWScriptGenerator.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/xmlGenerator/PFWScriptGenerator.py b/tools/xmlGenerator/PFWScriptGenerator.py index ff83ed3..c63b806 100755 --- a/tools/xmlGenerator/PFWScriptGenerator.py +++ b/tools/xmlGenerator/PFWScriptGenerator.py @@ -689,7 +689,7 @@ class Configuration (ElementWithRuleInheritance, ElementWithTag) : class GroupConfiguration (Configuration) : tag = "GroupConfiguration" optionNames = ["Name"] - match = re.compile(r"supConf *:").match + match = re.compile(r"(supConf|confGroup|confType) *:").match childWhiteList = ["Rule", "Operator", "GroupConfiguration", "Configuration", "GroupPath"] def composition (self, context) : @@ -889,8 +889,7 @@ class Domain (ElementWithRuleInheritance, ElementWithTag) : class GroupDomain (Domain) : tag = "groupDomain" - - match = re.compile(r"supDomain *:").match + match = re.compile(r"(supDomain|domainGroup) *:").match childWhiteList = ["GroupDomain", "Domain", "GroupConfiguration", "Rule", "Operator"] def toXML(self, context="") : return self.childrenToXML(context) -- cgit v1.1