summaryrefslogtreecommitdiffstats
path: root/tools/xmlGenerator
diff options
context:
space:
mode:
authorKevin Rocard <kevinx.rocard@intel.com>2013-04-02 19:13:05 +0200
committerDavid Wagner <david.wagner@intel.com>2014-02-12 17:03:49 +0100
commitdb43cf055f954efbaa50157637a034511eed2849 (patch)
treed19b0ebd87682acff7c1fcc73a336ef99c7a7b61 /tools/xmlGenerator
parent2bc8bc68f508680a724f987f7d17401fb2f647f4 (diff)
downloadexternal_parameter-framework-db43cf055f954efbaa50157637a034511eed2849.zip
external_parameter-framework-db43cf055f954efbaa50157637a034511eed2849.tar.gz
external_parameter-framework-db43cf055f954efbaa50157637a034511eed2849.tar.bz2
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 <kevinx.rocard@intel.com> Reviewed-on: http://android.intel.com:8080/99542 Reviewed-by: Wagner, David <david.wagner@intel.com> Reviewed-by: cactus <cactus@intel.com> Reviewed-by: Gonzalve, Sebastien <sebastien.gonzalve@intel.com> Tested-by: Dixon, CharlesX <charlesx.dixon@intel.com> Reviewed-by: buildbot <buildbot@intel.com> Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'tools/xmlGenerator')
-rwxr-xr-xtools/xmlGenerator/PFWScriptGenerator.py5
1 files 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)