summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/build
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-09-10 05:23:47 +1000
committer Vas Crabb <vas@vastheman.com>2020-09-10 05:23:47 +1000
commitb68c48f5f87890ad0faa940727036c388d3afeef (patch)
tree401a4319b57cd3b5b8c9fbca114bc5eebc8f6e5b /scripts/build
parent27d1ceacbfb01eabfe81e65885b75242fb47e998 (diff)
Remove last remaining uses of <background> elements in layouts, and print warning messages on encountering deprecated elements.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/complay.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/build/complay.py b/scripts/build/complay.py
index 9b3334d96c2..2fbc7667a8e 100755
--- a/scripts/build/complay.py
+++ b/scripts/build/complay.py
@@ -97,7 +97,6 @@ class LayoutChecker(Minifyer):
VARPATTERN = re.compile('^.*~[0-9A-Za-z_]+~.*$')
FLOATCHARS = re.compile('^.*[.eE].*$')
SHAPES = frozenset(('disk', 'dotmatrix', 'dotmatrix5dot', 'dotmatrixdot', 'led14seg', 'led14segsc', 'led16seg', 'led16segsc', 'led7seg', 'led8seg_gts1', 'rect'))
- OBJECTS = frozenset(('backdrop', ))
ORIENTATIONS = frozenset((0, 90, 180, 270))
YESNO = frozenset(('yes', 'no'))
BLENDMODES = frozenset(('none', 'alpha', 'multiply', 'add'))
@@ -452,12 +451,11 @@ class LayoutChecker(Minifyer):
self.handlers.pop()
def groupViewStartHandler(self, name, attrs):
- if (name in self.OBJECTS) or ('element' == name):
- refattr = 'ref' if 'element' == name else 'element'
- if refattr not in attrs:
- self.handleError('Element %s missing attribute %s' % (name, refattr))
- elif attrs[refattr] not in self.referenced_elements:
- self.referenced_elements[attrs[refattr]] = self.formatLocation()
+ if 'element' == name:
+ if 'ref' not in attrs:
+ self.handleError('Element %s missing attribute ref' % (name, ))
+ elif attrs['ref'] not in self.referenced_elements:
+ self.referenced_elements[attrs['ref']] = self.formatLocation()
if ('blend' in attrs) and (attrs['blend'] not in self.BLENDMODES) and not self.VARPATTERN.match(attrs['blend']):
self.handleError('Element %s attribute blend "%s" is unsupported' % (name, attrs['blend']))
if 'inputtag' in attrs: