diff options
author | 2022-03-30 12:56:08 +1100 | |
---|---|---|
committer | 2022-03-30 12:56:08 +1100 | |
commit | 6b1d35f62347d115d527fbdc5f0d16d26adc3ebb (patch) | |
tree | 422459c4df2c9c0686b4a1bafd87cb89bd698201 /docs/release/scripts | |
parent | 8aa3f3a324ea7044dc5da2c2b92dd78ea6e89ae3 (diff) |
Files for 0.242tag242
Diffstat (limited to 'docs/release/scripts')
-rw-r--r-- | docs/release/scripts/build/complay.py | 426 | ||||
-rw-r--r-- | docs/release/scripts/build/makedep.py | 71 | ||||
-rw-r--r-- | docs/release/scripts/build/verinfo.py | 6 | ||||
-rw-r--r-- | docs/release/scripts/genie.lua | 8 | ||||
-rw-r--r-- | docs/release/scripts/src/3rdparty.lua | 27 | ||||
-rw-r--r-- | docs/release/scripts/src/bus.lua | 26 | ||||
-rw-r--r-- | docs/release/scripts/src/cpu.lua | 36 | ||||
-rw-r--r-- | docs/release/scripts/src/machine.lua | 23 | ||||
-rw-r--r-- | docs/release/scripts/target/hbmame/hbmame.lua | 5 | ||||
-rw-r--r-- | docs/release/scripts/target/mame/arcade.lua | 42 | ||||
-rw-r--r-- | docs/release/scripts/target/mame/mess.lua | 8 |
11 files changed, 372 insertions, 306 deletions
diff --git a/docs/release/scripts/build/complay.py b/docs/release/scripts/build/complay.py index 996908ecde0..475806c0e65 100644 --- a/docs/release/scripts/build/complay.py +++ b/docs/release/scripts/build/complay.py @@ -12,9 +12,9 @@ import xml.sax.saxutils import zlib -class ErrorHandler(object): +class ErrorHandler: def __init__(self, **kwargs): - super(ErrorHandler, self).__init__(**kwargs) + super().__init__(**kwargs) self.errors = 0 self.warnings = 0 @@ -30,9 +30,9 @@ class ErrorHandler(object): sys.stderr.write('warning: %s' % (exception)) -class Minifyer(object): +class Minifyer: def __init__(self, output, **kwargs): - super(Minifyer, self).__init__(**kwargs) + super().__init__(**kwargs) self.output = output self.incomplete_tag = False @@ -91,13 +91,13 @@ class LayoutChecker(Minifyer): BADTAGPATTERN = re.compile('[^abcdefghijklmnopqrstuvwxyz0123456789_.:^$]') VARPATTERN = re.compile('^.*~[0-9A-Za-z_]+~.*$') FLOATCHARS = re.compile('^.*[.eE].*$') - SHAPES = frozenset(('disk', 'led14seg', 'led14segsc', 'led16seg', 'led16segsc', 'led7seg', 'led8seg_gts1', 'rect')) + SHAPES = frozenset(('disk', 'led14seg', 'led14segsc', 'led16seg', 'led16segsc', 'led7seg', 'rect')) ORIENTATIONS = frozenset((0, 90, 180, 270)) YESNO = frozenset(('yes', 'no')) BLENDMODES = frozenset(('none', 'alpha', 'multiply', 'add')) def __init__(self, output, **kwargs): - super(LayoutChecker, self).__init__(output=output, **kwargs) + super().__init__(output=output, **kwargs) self.locator = None self.errors = 0 self.elements = { } @@ -108,14 +108,14 @@ class LayoutChecker(Minifyer): self.group_collections = { } self.current_collections = None - def formatLocation(self): + def format_location(self): return '%s:%d:%d' % (self.locator.getSystemId(), self.locator.getLineNumber(), self.locator.getColumnNumber()) - def handleError(self, msg): + def handle_error(self, msg): self.errors += 1 - sys.stderr.write('error: %s: %s\n' % (self.formatLocation(), msg)) + sys.stderr.write('error: %s: %s\n' % (self.format_location(), msg)) - def checkIntAttribute(self, name, attrs, key, default): + def check_int_attribute(self, name, attrs, key, default): if key not in attrs: return default val = attrs[key] @@ -134,10 +134,10 @@ class LayoutChecker(Minifyer): try: return int(val[offs:], base) except: - self.handleError('Element %s attribute %s "%s" is not an integer' % (name, key, val)) + self.handle_error('Element %s attribute %s "%s" is not an integer' % (name, key, val)) return None - def checkFloatAttribute(self, name, attrs, key, default): + def check_float_attribute(self, name, attrs, key, default): if key not in attrs: return default val = attrs[key] @@ -146,10 +146,10 @@ class LayoutChecker(Minifyer): try: return float(val) except: - self.handleError('Element %s attribute %s "%s" is not a floating point number' % (name, key, val)) + self.handle_error('Element %s attribute %s "%s" is not a floating point number' % (name, key, val)) return None - def checkNumericAttribute(self, name, attrs, key, default): + def check_numeric_attribute(self, name, attrs, key, default): if key not in attrs: return default val = attrs[key] @@ -171,121 +171,121 @@ class LayoutChecker(Minifyer): return float(val) return int(val[offs:], base) except: - self.handleError('Element %s attribute %s "%s" is not a number' % (name, key, val)) + self.handle_error('Element %s attribute %s "%s" is not a number' % (name, key, val)) return None - def checkParameter(self, attrs): + def check_parameter(self, attrs): if 'name' not in attrs: - self.handleError('Element param missing attribute name') + self.handle_error('Element param missing attribute name') else: name = attrs['name'] - self.checkNumericAttribute('param', attrs, 'increment', None) - lshift = self.checkIntAttribute('param', attrs, 'lshift', None) + self.check_numeric_attribute('param', attrs, 'increment', None) + lshift = self.check_int_attribute('param', attrs, 'lshift', None) if (lshift is not None) and (0 > lshift): - self.handleError('Element param attribute lshift "%s" is negative' % (attrs['lshift'], )) - rshift = self.checkIntAttribute('param', attrs, 'rshift', None) + self.handle_error('Element param attribute lshift "%s" is negative' % (attrs['lshift'], )) + rshift = self.check_int_attribute('param', attrs, 'rshift', None) if (rshift is not None) and (0 > rshift): - self.handleError('Element param attribute rshift "%s" is negative' % (attrs['rshift'], )) + self.handle_error('Element param attribute rshift "%s" is negative' % (attrs['rshift'], )) if self.repeat_depth and self.repeat_depth[-1]: if 'start' in attrs: if 'value' in attrs: - self.handleError('Element param has both start and value attributes') + self.handle_error('Element param has both start and value attributes') if 'name' in attrs: if name not in self.variable_scopes[-1]: self.variable_scopes[-1][name] = True elif not self.VARPATTERN.match(name): - self.handleError('Generator parameter "%s" redefined' % (name, )) + self.handle_error('Generator parameter "%s" redefined' % (name, )) else: if 'value' not in attrs: - self.handleError('Element param missing attribute value') + self.handle_error('Element param missing attribute value') if ('increment' in attrs) or ('lshift' in attrs) or ('rshift' in attrs): - self.handleError('Element param has increment/lshift/rshift attribute(s) without start attribute') + self.handle_error('Element param has increment/lshift/rshift attribute(s) without start attribute') if 'name' in attrs: if not self.variable_scopes[-1].get(name, False): self.variable_scopes[-1][name] = False elif not self.VARPATTERN.match(name): - self.handleError('Generator parameter "%s" redefined' % (name, )) + self.handle_error('Generator parameter "%s" redefined' % (name, )) else: if ('start' in attrs) or ('increment' in attrs) or ('lshift' in attrs) or ('rshift' in attrs): - self.handleError('Element param with start/increment/lshift/rshift attribute(s) not in repeat scope') + self.handle_error('Element param with start/increment/lshift/rshift attribute(s) not in repeat scope') if 'value' not in attrs: - self.handleError('Element param missing attribute value') + self.handle_error('Element param missing attribute value') if 'name' in attrs: self.variable_scopes[-1][attrs['name']] = False - def checkBounds(self, attrs): - left = self.checkFloatAttribute('bounds', attrs, 'left', 0.0) - top = self.checkFloatAttribute('bounds', attrs, 'top', 0.0) - right = self.checkFloatAttribute('bounds', attrs, 'right', 1.0) - bottom = self.checkFloatAttribute('bounds', attrs, 'bottom', 1.0) - x = self.checkFloatAttribute('bounds', attrs, 'x', 0.0) - y = self.checkFloatAttribute('bounds', attrs, 'y', 0.0) - xc = self.checkFloatAttribute('bounds', attrs, 'xc', 0.0) - yc = self.checkFloatAttribute('bounds', attrs, 'yc', 0.0) - width = self.checkFloatAttribute('bounds', attrs, 'width', 1.0) - height = self.checkFloatAttribute('bounds', attrs, 'height', 1.0) + def check_bounds(self, attrs): + left = self.check_float_attribute('bounds', attrs, 'left', 0.0) + top = self.check_float_attribute('bounds', attrs, 'top', 0.0) + right = self.check_float_attribute('bounds', attrs, 'right', 1.0) + bottom = self.check_float_attribute('bounds', attrs, 'bottom', 1.0) + self.check_float_attribute('bounds', attrs, 'x', 0.0) + self.check_float_attribute('bounds', attrs, 'y', 0.0) + self.check_float_attribute('bounds', attrs, 'xc', 0.0) + self.check_float_attribute('bounds', attrs, 'yc', 0.0) + width = self.check_float_attribute('bounds', attrs, 'width', 1.0) + height = self.check_float_attribute('bounds', attrs, 'height', 1.0) if (left is not None) and (right is not None) and (left > right): - self.handleError('Element bounds attribute left "%s" is greater than attribute right "%s"' % ( + self.handle_error('Element bounds attribute left "%s" is greater than attribute right "%s"' % ( attrs.get('left', 0.0), attrs.get('right', 1.0))) if (top is not None) and (bottom is not None) and (top > bottom): - self.handleError('Element bounds attribute top "%s" is greater than attribute bottom "%s"' % ( + self.handle_error('Element bounds attribute top "%s" is greater than attribute bottom "%s"' % ( attrs.get('top', 0.0), attrs.get('bottom', 1.0))) if (width is not None) and (0.0 > width): - self.handleError('Element bounds attribute width "%s" is negative' % (attrs['width'], )) + self.handle_error('Element bounds attribute width "%s" is negative' % (attrs['width'], )) if (height is not None) and (0.0 > height): - self.handleError('Element bounds attribute height "%s" is negative' % (attrs['height'], )) + self.handle_error('Element bounds attribute height "%s" is negative' % (attrs['height'], )) if (('left' in attrs) and (('x' in attrs) or ('xc' in attrs))) or (('x' in attrs) and ('xc' in attrs)): - self.handleError('Element bounds has multiple horizontal origin attributes (left/x/xc)') + self.handle_error('Element bounds has multiple horizontal origin attributes (left/x/xc)') if (('left' in attrs) and ('width' in attrs)) or ((('x' in attrs) or ('xc' in attrs)) and ('right' in attrs)): - self.handleError('Element bounds has both left/right and x/xc/width attributes') + self.handle_error('Element bounds has both left/right and x/xc/width attributes') if (('top' in attrs) and (('y' in attrs) or ('yc' in attrs))) or (('y' in attrs) and ('yc' in attrs)): - self.handleError('Element bounds has multiple vertical origin attributes (top/y/yc)') + self.handle_error('Element bounds has multiple vertical origin attributes (top/y/yc)') if (('top' in attrs) and ('height' in attrs)) or ((('y' in attrs) or ('yc' in attrs)) and ('bottom' in attrs)): - self.handleError('Element bounds has both top/bottom and y/yc/height attributes') + self.handle_error('Element bounds has both top/bottom and y/yc/height attributes') - def checkOrientation(self, attrs): + def check_orientation(self, attrs): if self.have_orientation[-1]: - self.handleError('Duplicate element orientation') + self.handle_error('Duplicate element orientation') else: self.have_orientation[-1] = True - if self.checkIntAttribute('orientation', attrs, 'rotate', 0) not in self.ORIENTATIONS: - self.handleError('Element orientation attribute rotate "%s" is unsupported' % (attrs['rotate'], )) + if self.check_int_attribute('orientation', attrs, 'rotate', 0) not in self.ORIENTATIONS: + self.handle_error('Element orientation attribute rotate "%s" is unsupported' % (attrs['rotate'], )) for name in ('swapxy', 'flipx', 'flipy'): if (attrs.get(name, 'no') not in self.YESNO) and (not self.VARPATTERN.match(attrs[name])): - self.handleError('Element orientation attribute %s "%s" is not "yes" or "no"' % (name, attrs[name])) + self.handle_error('Element orientation attribute %s "%s" is not "yes" or "no"' % (name, attrs[name])) - def checkColor(self, attrs): - self.checkColorChannel(attrs, 'red') - self.checkColorChannel(attrs, 'green') - self.checkColorChannel(attrs, 'blue') - self.checkColorChannel(attrs, 'alpha') + def check_color(self, attrs): + self.check_color_channel(attrs, 'red') + self.check_color_channel(attrs, 'green') + self.check_color_channel(attrs, 'blue') + self.check_color_channel(attrs, 'alpha') - def checkColorChannel(self, attrs, name): - channel = self.checkFloatAttribute('color', attrs, name, None) + def check_color_channel(self, attrs, name): + channel = self.check_float_attribute('color', attrs, name, None) if (channel is not None) and ((0.0 > channel) or (1.0 < channel)): - self.handleError('Element color attribute %s "%s" outside valid range 0.0-1.0' % (name, attrs[name])) + self.handle_error('Element color attribute %s "%s" outside valid range 0.0-1.0' % (name, attrs[name])) - def checkTag(self, tag, element, attr): + def check_tag(self, tag, element, attr): if '' == tag: - self.handleError('Element %s attribute %s is empty' % (element, attr)) + self.handle_error('Element %s attribute %s is empty' % (element, attr)) else: if tag.find('^') >= 0: - self.handleError('Element %s attribute %s "%s" contains parent device reference' % (element, attr, tag)) + self.handle_error('Element %s attribute %s "%s" contains parent device reference' % (element, attr, tag)) if ':' == tag[-1]: - self.handleError('Element %s attribute %s "%s" ends with separator' % (element, attr, tag)) + self.handle_error('Element %s attribute %s "%s" ends with separator' % (element, attr, tag)) if tag.find('::') >= 0: - self.handleError('Element %s attribute %s "%s" contains double separator' % (element, attr, tag)) + self.handle_error('Element %s attribute %s "%s" contains double separator' % (element, attr, tag)) - def checkComponent(self, name, attrs): - statemask = self.checkIntAttribute(name, attrs, 'statemask', None) - stateval = self.checkIntAttribute(name, attrs, 'state', None) + def check_component(self, name, attrs): + statemask = self.check_int_attribute(name, attrs, 'statemask', None) + stateval = self.check_int_attribute(name, attrs, 'state', None) if stateval is not None: if 0 > stateval: - self.handleError('Element %s attribute state "%s" is negative' % (name, attrs['state'])) + self.handle_error('Element %s attribute state "%s" is negative' % (name, attrs['state'])) if (statemask is not None) and (stateval & ~statemask): - self.handleError('Element %s attribute state "%s" has bits set that are clear in attribute statemask "%s"' % (name, attrs['state'], attrs['statemask'])) + self.handle_error('Element %s attribute state "%s" has bits set that are clear in attribute statemask "%s"' % (name, attrs['state'], attrs['statemask'])) if 'image' == name: self.handlers.append((self.imageComponentStartHandler, self.imageComponentEndHandler)) else: @@ -293,39 +293,39 @@ class LayoutChecker(Minifyer): self.have_bounds.append({ }) self.have_color.append({ }) - def checkViewItem(self, name, attrs): + def check_view_item(self, name, attrs): if 'id' in attrs: if not attrs['id']: - self.handleError('Element %s attribute id is empty' % (name, )) + self.handle_error('Element %s attribute id is empty' % (name, )) elif not self.VARPATTERN.match(attrs['id']): if attrs['id'] in self.item_ids: - self.handleError('Element %s has duplicate id "%s" (previous %s)' % (name, attrs['id'], self.item_ids[attrs['id']])) + self.handle_error('Element %s has duplicate id "%s" (previous %s)' % (name, attrs['id'], self.item_ids[attrs['id']])) else: - self.item_ids[attrs['id']] = self.formatLocation() + self.item_ids[attrs['id']] = self.format_location() if self.repeat_depth[-1]: - self.handleError('Element %s attribute id "%s" in repeat contains no parameter references' % (name, attrs['id'])) + self.handle_error('Element %s attribute id "%s" in repeat contains no parameter references' % (name, attrs['id'])) 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'])) + self.handle_error('Element %s attribute blend "%s" is unsupported' % (name, attrs['blend'])) if 'inputtag' in attrs: if 'inputmask' not in attrs: - self.handleError('Element %s has inputtag attribute without inputmask attribute' % (name, )) - self.checkTag(attrs['inputtag'], name, 'inputtag') + self.handle_error('Element %s has inputtag attribute without inputmask attribute' % (name, )) + self.check_tag(attrs['inputtag'], name, 'inputtag') elif 'inputmask' in attrs: - self.handleError('Element %s has inputmask attribute without inputtag attribute' % (name, )) + self.handle_error('Element %s has inputmask attribute without inputtag attribute' % (name, )) inputraw = None if 'inputraw' in attrs: if (attrs['inputraw'] not in self.YESNO) and (not self.VARPATTERN.match(attrs['inputraw'])): - self.handleError('Element %s attribute inputraw "%s" is not "yes" or "no"' % (name, attrs['inputraw'])) + self.handle_error('Element %s attribute inputraw "%s" is not "yes" or "no"' % (name, attrs['inputraw'])) else: inputraw = 'yes' == attrs['inputraw'] if 'inputmask' not in attrs: - self.handleError('Element %s has inputraw attribute without inputmask attribute' % (name, )) + self.handle_error('Element %s has inputraw attribute without inputmask attribute' % (name, )) if 'inputtag' not in attrs: - self.handleError('Element %s has inputraw attribute without inputtag attribute' % (name, )) - inputmask = self.checkIntAttribute(name, attrs, 'inputmask', None) + self.handle_error('Element %s has inputraw attribute without inputtag attribute' % (name, )) + inputmask = self.check_int_attribute(name, attrs, 'inputmask', None) if (inputmask is not None) and (not inputmask): if (inputraw is None) or (not inputraw): - self.handleError('Element %s attribute inputmask "%s" is zero' % (name, attrs['inputmask'])) + self.handle_error('Element %s attribute inputmask "%s" is zero' % (name, attrs['inputmask'])) def startViewItem(self, name): self.handlers.append((self.viewItemStartHandler, self.viewItemEndHandler)) @@ -338,15 +338,15 @@ class LayoutChecker(Minifyer): def rootStartHandler(self, name, attrs): if 'mamelayout' != name: self.ignored_depth = 1 - self.handleError('Expected root element mamelayout but found %s' % (name, )) + self.handle_error('Expected root element mamelayout but found %s' % (name, )) else: if 'version' not in attrs: - self.handleError('Element mamelayout missing attribute version') + self.handle_error('Element mamelayout missing attribute version') else: try: int(attrs['version']) except: - self.handleError('Element mamelayout attribute version "%s" is not an integer' % (attrs['version'], )) + self.handle_error('Element mamelayout attribute version "%s" is not an integer' % (attrs['version'], )) self.have_script = None self.variable_scopes.append({ }) self.repeat_depth.append(0) @@ -358,33 +358,33 @@ class LayoutChecker(Minifyer): def layoutStartHandler(self, name, attrs): if 'element' == name: if 'name' not in attrs: - self.handleError('Element element missing attribute name') + self.handle_error('Element element missing attribute name') else: generated_name = self.VARPATTERN.match(attrs['name']) if generated_name: self.generated_element_names = True if attrs['name'] not in self.elements: - self.elements[attrs['name']] = self.formatLocation() + self.elements[attrs['name']] = self.format_location() elif not generated_name: - self.handleError('Element element has duplicate name (previous %s)' % (self.elements[attrs['name']], )) - defstate = self.checkIntAttribute(name, attrs, 'defstate', None) + self.handle_error('Element element has duplicate name (previous %s)' % (self.elements[attrs['name']], )) + defstate = self.check_int_attribute(name, attrs, 'defstate', None) if (defstate is not None) and (0 > defstate): - self.handleError('Element element attribute defstate "%s" is negative' % (attrs['defstate'], )) + self.handle_error('Element element attribute defstate "%s" is negative' % (attrs['defstate'], )) self.handlers.append((self.elementStartHandler, self.elementEndHandler)) elif 'group' == name: self.current_collections = { } if 'name' not in attrs: - self.handleError('Element group missing attribute name') + self.handle_error('Element group missing attribute name') else: generated_name = self.VARPATTERN.match(attrs['name']) if generated_name: self.generated_group_names = True if attrs['name'] not in self.groups: - self.groups[attrs['name']] = self.formatLocation() + self.groups[attrs['name']] = self.format_location() if not generated_name: self.group_collections[attrs['name']] = self.current_collections elif not generated_name: - self.handleError('Element group has duplicate name (previous %s)' % (self.groups[attrs['name']], )) + self.handle_error('Element group has duplicate name (previous %s)' % (self.groups[attrs['name']], )) self.handlers.append((self.groupViewStartHandler, self.groupViewEndHandler)) self.variable_scopes.append({ }) self.item_ids = { } @@ -393,12 +393,12 @@ class LayoutChecker(Minifyer): elif ('view' == name) and (not self.repeat_depth[-1]): self.current_collections = { } if 'name' not in attrs: - self.handleError('Element view missing attribute name') + self.handle_error('Element view missing attribute name') else: if attrs['name'] not in self.views: - self.views[attrs['name']] = self.formatLocation() + self.views[attrs['name']] = self.format_location() elif not self.VARPATTERN.match(attrs['name']): - self.handleError('Element view has duplicate name "%s" (previous %s)' % (attrs['name'], self.views[attrs['name']])) + self.handle_error('Element view has duplicate name "%s" (previous %s)' % (attrs['name'], self.views[attrs['name']])) self.handlers.append((self.groupViewStartHandler, self.groupViewEndHandler)) self.variable_scopes.append({ }) self.item_ids = { } @@ -406,24 +406,24 @@ class LayoutChecker(Minifyer): self.have_bounds.append(None) elif 'repeat' == name: if 'count' not in attrs: - self.handleError('Element repeat missing attribute count') + self.handle_error('Element repeat missing attribute count') else: - count = self.checkIntAttribute(name, attrs, 'count', None) + count = self.check_int_attribute(name, attrs, 'count', None) if (count is not None) and (0 >= count): - self.handleError('Element repeat attribute count "%s" is not positive' % (attrs['count'], )) + self.handle_error('Element repeat attribute count "%s" is not positive' % (attrs['count'], )) self.variable_scopes.append({ }) self.repeat_depth[-1] += 1 elif 'param' == name: - self.checkParameter(attrs) + self.check_parameter(attrs) self.ignored_depth = 1 elif ('script' == name) and (not self.repeat_depth[-1]): if self.have_script is None: - self.have_script = self.formatLocation() + self.have_script = self.format_location() else: - self.handleError('Duplicate script element (previous %s)' % (self.have_script, )) + self.handle_error('Duplicate script element (previous %s)' % (self.have_script, )) self.ignored_depth = 1 else: - self.handleError('Encountered unexpected element %s' % (name, )) + self.handle_error('Encountered unexpected element %s' % (name, )) self.ignored_depth = 1 def layoutEndHandler(self, name): @@ -434,56 +434,56 @@ class LayoutChecker(Minifyer): if not self.generated_element_names: for element in self.referenced_elements: if (element not in self.elements) and (not self.VARPATTERN.match(element)): - self.handleError('Element "%s" not found (first referenced at %s)' % (element, self.referenced_elements[element])) + self.handle_error('Element "%s" not found (first referenced at %s)' % (element, self.referenced_elements[element])) if not self.generated_group_names: for group in self.referenced_groups: if (group not in self.groups) and (not self.VARPATTERN.match(group)): - self.handleError('Group "%s" not found (first referenced at %s)' % (group, self.referenced_groups[group])) + self.handle_error('Group "%s" not found (first referenced at %s)' % (group, self.referenced_groups[group])) if not self.views: - self.handleError('No view elements found') + self.handle_error('No view elements found') del self.have_script self.handlers.pop() def elementStartHandler(self, name, attrs): if name in self.SHAPES: - self.checkComponent(name, attrs) + self.check_component(name, attrs) elif 'text' == name: if 'string' not in attrs: - self.handleError('Element text missing attribute string') - align = self.checkIntAttribute(name, attrs, 'align', None) + self.handle_error('Element text missing attribute string') + align = self.check_int_attribute(name, attrs, 'align', None) if (align is not None) and ((0 > align) or (2 < align)): - self.handleError('Element text attribute align "%s" not in valid range 0-2' % (attrs['align'], )) - self.checkComponent(name, attrs) + self.handle_error('Element text attribute align "%s" not in valid range 0-2' % (attrs['align'], )) + self.check_component(name, attrs) elif 'simplecounter' == name: - maxstate = self.checkIntAttribute(name, attrs, 'maxstate', None) + maxstate = self.check_int_attribute(name, attrs, 'maxstate', None) if (maxstate is not None) and (0 > maxstate): - self.handleError('Element simplecounter attribute maxstate "%s" is negative' % (attrs['maxstate'], )) - digits = self.checkIntAttribute(name, attrs, 'digits', None) + self.handle_error('Element simplecounter attribute maxstate "%s" is negative' % (attrs['maxstate'], )) + digits = self.check_int_attribute(name, attrs, 'digits', None) if (digits is not None) and (0 >= digits): - self.handleError('Element simplecounter attribute digits "%s" is not positive' % (attrs['digits'], )) - align = self.checkIntAttribute(name, attrs, 'align', None) + self.handle_error('Element simplecounter attribute digits "%s" is not positive' % (attrs['digits'], )) + align = self.check_int_attribute(name, attrs, 'align', None) if (align is not None) and ((0 > align) or (2 < align)): - self.handleError('Element simplecounter attribute align "%s" not in valid range 0-2' % (attrs['align'], )) - self.checkComponent(name, attrs) + self.handle_error('Element simplecounter attribute align "%s" not in valid range 0-2' % (attrs['align'], )) + self.check_component(name, attrs) elif 'image' == name: self.have_file = 'file' in attrs self.have_data = None - self.checkComponent(name, attrs) + self.check_component(name, attrs) elif 'reel' == name: # TODO: validate symbollist and improve validation of other attributes - self.checkIntAttribute(name, attrs, 'stateoffset', None) - numsymbolsvisible = self.checkIntAttribute(name, attrs, 'numsymbolsvisible', None) + self.check_int_attribute(name, attrs, 'stateoffset', None) + numsymbolsvisible = self.check_int_attribute(name, attrs, 'numsymbolsvisible', None) if (numsymbolsvisible is not None) and (0 >= numsymbolsvisible): - self.handleError('Element reel attribute numsymbolsvisible "%s" not positive' % (attrs['numsymbolsvisible'], )) - reelreversed = self.checkIntAttribute(name, attrs, 'reelreversed', None) + self.handle_error('Element reel attribute numsymbolsvisible "%s" not positive' % (attrs['numsymbolsvisible'], )) + reelreversed = self.check_int_attribute(name, attrs, 'reelreversed', None) if (reelreversed is not None) and ((0 > reelreversed) or (1 < reelreversed)): - self.handleError('Element reel attribute reelreversed "%s" not in valid range 0-1' % (attrs['reelreversed'], )) - beltreel = self.checkIntAttribute(name, attrs, 'beltreel', None) + self.handle_error('Element reel attribute reelreversed "%s" not in valid range 0-1' % (attrs['reelreversed'], )) + beltreel = self.check_int_attribute(name, attrs, 'beltreel', None) if (beltreel is not None) and ((0 > beltreel) or (1 < beltreel)): - self.handleError('Element reel attribute beltreel "%s" not in valid range 0-1' % (attrs['beltreel'], )) - self.checkComponent(name, attrs) + self.handle_error('Element reel attribute beltreel "%s" not in valid range 0-1' % (attrs['beltreel'], )) + self.check_component(name, attrs) else: - self.handleError('Encountered unexpected element %s' % (name, )) + self.handle_error('Encountered unexpected element %s' % (name, )) self.ignored_depth = 1 def elementEndHandler(self, name): @@ -491,25 +491,25 @@ class LayoutChecker(Minifyer): def componentStartHandler(self, name, attrs): if 'bounds' == name: - state = self.checkIntAttribute(name, attrs, 'state', 0) + state = self.check_int_attribute(name, attrs, 'state', 0) if state is not None: if 0 > state: - self.handleError('Element bounds attribute state "%s" is negative' % (attrs['state'], )) + self.handle_error('Element bounds attribute state "%s" is negative' % (attrs['state'], )) if state in self.have_bounds[-1]: - self.handleError('Duplicate bounds for state %d (previous %s)' % (state, self.have_bounds[-1][state])) + self.handle_error('Duplicate bounds for state %d (previous %s)' % (state, self.have_bounds[-1][state])) else: - self.have_bounds[-1][state] = self.formatLocation() - self.checkBounds(attrs) + self.have_bounds[-1][state] = self.format_location() + self.check_bounds(attrs) elif 'color' == name: - state = self.checkIntAttribute(name, attrs, 'state', 0) + state = self.check_int_attribute(name, attrs, 'state', 0) if state is not None: if 0 > state: - self.handleError('Element color attribute state "%s" is negative' % (attrs['state'], )) + self.handle_error('Element color attribute state "%s" is negative' % (attrs['state'], )) if state in self.have_color[-1]: - self.handleError('Duplicate color for state %d (previous %s)' % (state, self.have_color[-1][state])) + self.handle_error('Duplicate color for state %d (previous %s)' % (state, self.have_color[-1][state])) else: - self.have_color[-1][state] = self.formatLocation() - self.checkColor(attrs) + self.have_color[-1][state] = self.format_location() + self.check_color(attrs) self.ignored_depth = 1 def componentEndHandler(self, name): @@ -520,18 +520,18 @@ class LayoutChecker(Minifyer): def imageComponentStartHandler(self, name, attrs): if 'data' == name: if self.have_data is not None: - self.handleError('Element image has multiple data child elements (previous %s)' % (self.have_data)) + self.handle_error('Element image has multiple data child elements (previous %s)' % (self.have_data)) else: - self.have_data = self.formatLocation() + self.have_data = self.format_location() if self.have_file: - self.handleError('Element image has attribute file and child element data') + self.handle_error('Element image has attribute file and child element data') self.ignored_depth = 1 else: self.componentStartHandler(name, attrs) def imageComponentEndHandler(self, name): if (not self.have_file) and (self.have_data is None): - self.handleError('Element image missing attribute file or child element data') + self.handle_error('Element image missing attribute file or child element data') del self.have_file del self.have_data self.componentEndHandler(name) @@ -539,75 +539,75 @@ class LayoutChecker(Minifyer): def groupViewStartHandler(self, name, attrs): if 'element' == name: if 'ref' not in attrs: - self.handleError('Element %s missing attribute ref' % (name, )) + self.handle_error('Element %s missing attribute ref' % (name, )) elif attrs['ref'] not in self.referenced_elements: - self.referenced_elements[attrs['ref']] = self.formatLocation() - self.checkViewItem(name, attrs) + self.referenced_elements[attrs['ref']] = self.format_location() + self.check_view_item(name, attrs) self.startViewItem(name) elif 'screen' == name: if 'index' in attrs: - index = self.checkIntAttribute(name, attrs, 'index', None) + index = self.check_int_attribute(name, attrs, 'index', None) if (index is not None) and (0 > index): - self.handleError('Element screen attribute index "%s" is negative' % (attrs['index'], )) + self.handle_error('Element screen attribute index "%s" is negative' % (attrs['index'], )) if 'tag' in attrs: - self.handleError('Element screen has both index and tag attributes') + self.handle_error('Element screen has both index and tag attributes') if 'tag' in attrs: tag = attrs['tag'] - self.checkTag(tag, name, 'tag') + self.check_tag(tag, name, 'tag') if self.BADTAGPATTERN.search(tag): - self.handleError('Element screen attribute tag "%s" contains invalid characters' % (tag, )) - self.checkViewItem(name, attrs) + self.handle_error('Element screen attribute tag "%s" contains invalid characters' % (tag, )) + self.check_view_item(name, attrs) self.startViewItem(name) elif 'group' == name: if 'ref' not in attrs: - self.handleError('Element group missing attribute ref') + self.handle_error('Element group missing attribute ref') else: if attrs['ref'] not in self.referenced_groups: - self.referenced_groups[attrs['ref']] = self.formatLocation() + self.referenced_groups[attrs['ref']] = self.format_location() if (not self.VARPATTERN.match(attrs['ref'])) and (attrs['ref'] in self.group_collections): for n, l in self.group_collections[attrs['ref']].items(): if n not in self.current_collections: self.current_collections[n] = l else: - self.handleError('Element group instantiates collection with duplicate name "%s" from %s (previous %s)' % (n, l, self.current_collections[n])) + self.handle_error('Element group instantiates collection with duplicate name "%s" from %s (previous %s)' % (n, l, self.current_collections[n])) self.startViewItem(name) elif 'repeat' == name: if 'count' not in attrs: - self.handleError('Element repeat missing attribute count') + self.handle_error('Element repeat missing attribute count') else: - count = self.checkIntAttribute(name, attrs, 'count', None) + count = self.check_int_attribute(name, attrs, 'count', None) if (count is not None) and (0 >= count): - self.handleError('Element repeat attribute count "%s" is negative' % (attrs['count'], )) + self.handle_error('Element repeat attribute count "%s" is negative' % (attrs['count'], )) self.variable_scopes.append({ }) self.repeat_depth[-1] += 1 elif 'collection' == name: if 'name' not in attrs: - self.handleError('Element collection missing attribute name') + self.handle_error('Element collection missing attribute name') elif not self.VARPATTERN.match(attrs['name']): if attrs['name'] not in self.current_collections: - self.current_collections[attrs['name']] = self.formatLocation() + self.current_collections[attrs['name']] = self.format_location() else: - self.handleError('Element collection has duplicate name (previous %s)' % (self.current_collections[attrs['name']], )) + self.handle_error('Element collection has duplicate name (previous %s)' % (self.current_collections[attrs['name']], )) if attrs.get('visible', 'yes') not in self.YESNO: - self.handleError('Element collection attribute visible "%s" is not "yes" or "no"' % (attrs['visible'], )) + self.handle_error('Element collection attribute visible "%s" is not "yes" or "no"' % (attrs['visible'], )) self.variable_scopes.append({ }) self.collection_depth += 1 elif 'param' == name: - self.checkParameter(attrs) + self.check_parameter(attrs) self.ignored_depth = 1 elif 'bounds' == name: if self.have_bounds[-1] is not None: - self.handleError('Duplicate element bounds (previous %s)' % (self.have_bounds[-1], )) + self.handle_error('Duplicate element bounds (previous %s)' % (self.have_bounds[-1], )) else: - self.have_bounds[-1] = self.formatLocation() - self.checkBounds(attrs) + self.have_bounds[-1] = self.format_location() + self.check_bounds(attrs) if self.repeat_depth[-1]: - self.handleError('Element bounds inside repeat') + self.handle_error('Element bounds inside repeat') elif self.collection_depth: - self.handleError('Element bounds inside collection') + self.handle_error('Element bounds inside collection') self.ignored_depth = 1 else: - self.handleError('Encountered unexpected element %s' % (name, )) + self.handle_error('Encountered unexpected element %s' % (name, )) self.ignored_depth = 1 def groupViewEndHandler(self, name): @@ -628,65 +628,65 @@ class LayoutChecker(Minifyer): if isinstance(self.have_bounds[-1], dict): if 'inputtag' in attrs: if 'name' in attrs: - self.handleError('Element animate has both attribute inputtag and attribute name') - self.checkTag(attrs['inputtag'], name, 'inputtag') + self.handle_error('Element animate has both attribute inputtag and attribute name') + self.check_tag(attrs['inputtag'], name, 'inputtag') elif 'name' not in attrs: - self.handleError('Element animate has neither attribute inputtag nor attribute name') - self.checkIntAttribute(name, attrs, 'mask', None) + self.handle_error('Element animate has neither attribute inputtag nor attribute name') + self.check_int_attribute(name, attrs, 'mask', None) else: - self.handleError('Encountered unexpected element %s' % (name, )) + self.handle_error('Encountered unexpected element %s' % (name, )) elif 'bounds' == name: if self.have_bounds[-1] is None: - self.have_bounds[-1] = self.formatLocation() + self.have_bounds[-1] = self.format_location() elif isinstance(self.have_bounds[-1], dict): - state = self.checkIntAttribute(name, attrs, 'state', 0) + state = self.check_int_attribute(name, attrs, 'state', 0) if state is not None: if 0 > state: - self.handleError('Element bounds attribute state "%s" is negative' % (attrs['state'], )) + self.handle_error('Element bounds attribute state "%s" is negative' % (attrs['state'], )) if state in self.have_bounds[-1]: - self.handleError('Duplicate bounds for state %d (previous %s)' % (state, self.have_bounds[-1][state])) + self.handle_error('Duplicate bounds for state %d (previous %s)' % (state, self.have_bounds[-1][state])) else: - self.have_bounds[-1][state] = self.formatLocation() + self.have_bounds[-1][state] = self.format_location() else: - self.handleError('Duplicate element bounds (previous %s)' % (self.have_bounds[-1], )) - self.checkBounds(attrs) + self.handle_error('Duplicate element bounds (previous %s)' % (self.have_bounds[-1], )) + self.check_bounds(attrs) elif 'orientation' == name: - self.checkOrientation(attrs) + self.check_orientation(attrs) elif 'color' == name: if self.have_color[-1] is None: - self.have_color[-1] = self.formatLocation() + self.have_color[-1] = self.format_location() elif isinstance(self.have_color[-1], dict): - state = self.checkIntAttribute(name, attrs, 'state', 0) + state = self.check_int_attribute(name, attrs, 'state', 0) if state is not None: if 0 > state: - self.handleError('Element color attribute state "%s" is negative' % (attrs['state'], )) + self.handle_error('Element color attribute state "%s" is negative' % (attrs['state'], )) if state in self.have_color[-1]: - self.handleError('Duplicate color for state %d (previous %s)' % (state, self.have_color[-1][state])) + self.handle_error('Duplicate color for state %d (previous %s)' % (state, self.have_color[-1][state])) else: - self.have_color[-1][state] = self.formatLocation() + self.have_color[-1][state] = self.format_location() else: - self.handleError('Duplicate element color (previous %s)' % (self.have_color[-1], )) - self.checkColor(attrs) + self.handle_error('Duplicate element color (previous %s)' % (self.have_color[-1], )) + self.check_color(attrs) elif ('xscroll' == name) or ('yscroll' == name): have_scroll = self.have_xscroll if 'xscroll' == name else self.have_yscroll if have_scroll[-1] is None: - self.handleError('Encountered unexpected element %s' % (name, )) + self.handle_error('Encountered unexpected element %s' % (name, )) elif have_scroll[-1]: - self.handleError('Duplicate element %s' % (name, )) + self.handle_error('Duplicate element %s' % (name, )) else: - have_scroll[-1] = self.formatLocation() - self.checkFloatAttribute(name, attrs, 'size', 1.0) + have_scroll[-1] = self.format_location() + self.check_float_attribute(name, attrs, 'size', 1.0) if (attrs.get('wrap', 'no') not in self.YESNO) and (not self.VARPATTERN.match(attrs['wrap'])): - self.handleError('Element %s attribute wrap "%s" is not "yes" or "no"' % (name, attrs['wrap'])) + self.handle_error('Element %s attribute wrap "%s" is not "yes" or "no"' % (name, attrs['wrap'])) if 'inputtag' in attrs: if 'name' in attrs: - self.handleError('Element %s has both attribute inputtag and attribute name' % (name, )) - self.checkTag(attrs['inputtag'], name, 'inputtag') - self.checkIntAttribute(name, attrs, 'mask', None) - self.checkIntAttribute(name, attrs, 'min', None) - self.checkIntAttribute(name, attrs, 'max', None) + self.handle_error('Element %s has both attribute inputtag and attribute name' % (name, )) + self.check_tag(attrs['inputtag'], name, 'inputtag') + self.check_int_attribute(name, attrs, 'mask', None) + self.check_int_attribute(name, attrs, 'min', None) + self.check_int_attribute(name, attrs, 'max', None) else: - self.handleError('Encountered unexpected element %s' % (name, )) + self.handle_error('Encountered unexpected element %s' % (name, )) self.ignored_depth = 1 def viewItemEndHandler(self, name): @@ -699,7 +699,7 @@ class LayoutChecker(Minifyer): def setDocumentLocator(self, locator): self.locator = locator - super(LayoutChecker, self).setDocumentLocator(locator) + super().setDocumentLocator(locator) def startDocument(self): self.handlers = [(self.rootStartHandler, self.rootEndHandler)] @@ -714,7 +714,7 @@ class LayoutChecker(Minifyer): self.have_yscroll = [ ] self.generated_element_names = False self.generated_group_names = False - super(LayoutChecker, self).startDocument() + super().startDocument() def endDocument(self): self.locator = None @@ -737,27 +737,27 @@ class LayoutChecker(Minifyer): del self.have_yscroll del self.generated_element_names del self.generated_group_names - super(LayoutChecker, self).endDocument() + super().endDocument() def startElement(self, name, attrs): if 0 < self.ignored_depth: self.ignored_depth += 1 else: self.handlers[-1][0](name, attrs) - super(LayoutChecker, self).startElement(name, attrs) + super().startElement(name, attrs) def endElement(self, name): if 0 < self.ignored_depth: self.ignored_depth -= 1 else: self.handlers[-1][1](name) - super(LayoutChecker, self).endElement(name) + super().endElement(name) -def compressLayout(src, dst, comp): +def compress_layout(src, dst, comp): state = [0, 0] def write(block): - for ch in bytearray(block): + for octet in bytearray(block): if 0 == state[0]: dst('\t') elif 0 == (state[0] % 32): @@ -765,7 +765,7 @@ def compressLayout(src, dst, comp): else: dst(', ') state[0] += 1 - dst('%3u' % (ch)) + dst('%3u' % (octet, )) def output(text): block = text.encode('UTF-8') @@ -782,7 +782,7 @@ def compressLayout(src, dst, comp): write(comp.flush()) dst('\n') except xml.sax.SAXException as exception: - print('fatal error: %s' % (exception)) + print('fatal error: %s' % (exception, )) raise XmlError('Fatal error parsing XML') if (content_handler.errors > 0) or (error_handler.errors > 0) or (error_handler.warnings > 0): raise XmlError('Error(s) and/or warning(s) parsing XML') @@ -790,7 +790,7 @@ def compressLayout(src, dst, comp): return state[1], state[0] -class BlackHole(object): +class BlackHole: def write(self, *args): pass def close(self): @@ -818,7 +818,7 @@ if __name__ == '__main__': try: dst = open(dstfile,'w') if dstfile is not None else BlackHole() dst.write('static const unsigned char %s_data[] = {\n' % (varname)) - byte_count, comp_size = compressLayout(srcfile, lambda x: dst.write(x), zlib.compressobj()) + byte_count, comp_size = compress_layout(srcfile, dst.write, zlib.compressobj()) dst.write('};\n\n') dst.write('const internal_layout %s = {\n' % (varname)) dst.write('\t%d, sizeof(%s_data), %s, %s_data\n' % (byte_count, varname, comp_type, varname)) diff --git a/docs/release/scripts/build/makedep.py b/docs/release/scripts/build/makedep.py index 6867a6cb34a..f957e1d2e79 100644 --- a/docs/release/scripts/build/makedep.py +++ b/docs/release/scripts/build/makedep.py @@ -9,11 +9,10 @@ import os.path import sys -class ParserBase(object): - def process_lines(self, f): +class ParserBase: + def process_lines(self, inputfile): self.input_line = 1 - for line in f: - pos = 0 + for line in inputfile: start = 0 if line.endswith('\n'): line = line[:-1] @@ -39,7 +38,7 @@ class CppParser(ParserBase): [chr(x) for x in range(ord('A'), ord('F') + 1)] + [chr(x) for x in range(ord('a'), ord('f') + 1)]) - class Handler(object): + class Handler: def line(self, text): pass @@ -49,7 +48,7 @@ class CppParser(ParserBase): def line_comment(self, text): pass - class ParseState(object): + class ParseState: DEFAULT = 0 COMMENT = 1 LINE_COMMENT = 2 @@ -59,7 +58,7 @@ class CppParser(ParserBase): NUMERIC_CONSTANT = 6 def __init__(self, handler, **kwargs): - super(CppParser, self).__init__(**kwargs) + super().__init__(**kwargs) self.handler = handler self.processors = { self.ParseState.DEFAULT: self.process_default, @@ -70,14 +69,14 @@ class CppParser(ParserBase): self.ParseState.CHARACTER_CONSTANT: self.process_text, self.ParseState.NUMERIC_CONSTANT: self.process_numeric } - def parse(self, f): + def parse(self, inputfile): self.parse_state = self.ParseState.DEFAULT self.comment_line = None self.lead_digit = None self.radix = None self.line_buffer = '' self.comment_buffer = '' - self.process_lines(f) + self.process_lines(inputfile) if self.parse_state == self.ParseState.COMMENT: raise Exception('unterminated multi-line comment beginning on line %d' % (self.comment_line, )) elif self.parse_state == self.ParseState.CHARACTER_CONSTANT: @@ -238,7 +237,7 @@ class CppParser(ParserBase): class LuaParser(ParserBase): - class Handler(object): + class Handler: def short_comment(self, text): pass @@ -251,7 +250,7 @@ class LuaParser(ParserBase): def long_comment_end(self): pass - class ParseState(object): + class ParseState: DEFAULT = 0 SHORT_COMMENT = 1 LONG_COMMENT = 2 @@ -259,7 +258,7 @@ class LuaParser(ParserBase): LONG_STRING_CONSTANT = 4 def __init__(self, handler, **kwargs): - super(LuaParser, self).__init__(**kwargs) + super().__init__(**kwargs) self.handler = handler self.processors = { self.ParseState.DEFAULT: self.process_default, @@ -268,20 +267,20 @@ class LuaParser(ParserBase): self.ParseState.STRING_CONSTANT: self.process_string_constant, self.ParseState.LONG_STRING_CONSTANT: self.process_long_string_constant } - def parse(self, f): + def parse(self, inputfile): self.parse_state = self.ParseState.DEFAULT self.long_bracket_level = None self.escape = False self.block_line = None self.block_level = None self.string_quote = None - self.process_lines(f) + self.process_lines(inputfile) if self.parse_state == self.ParseState.LONG_COMMENT: - raise Exception('unterminated long comment beginning on line %d' % (self.block_line, )); - elif self.parse_state == self.ParseState.STRING_CONSTANT: - raise Exception('unterminated string literal on line %d' % (self.input_line, )); - elif self.parse_state == self.ParseState.LONG_STRING_CONSTANT: - raise Exception('unterminated long string literal beginning on line %d' % (self.block_line, )); + raise Exception('unterminated long comment beginning on line %d' % (self.block_line, )) + if self.parse_state == self.ParseState.STRING_CONSTANT: + raise Exception('unterminated string literal on line %d' % (self.input_line, )) + if self.parse_state == self.ParseState.LONG_STRING_CONSTANT: + raise Exception('unterminated long string literal beginning on line %d' % (self.block_line, )) def process_default(self, line): pos = 0 @@ -293,7 +292,7 @@ class LuaParser(ParserBase): self.parse_state = self.ParseState.STRING_CONSTANT self.long_bracket_level = None self.escape = False - return pos + 1; + return pos + 1 elif (ch == '-') and self.escape: self.parse_state = self.ParseState.SHORT_COMMENT self.long_bracket_level = None @@ -381,20 +380,20 @@ class LuaParser(ParserBase): self.escape = (ch == '\\') and not self.escape pos += 1 if not self.escape: - raise Exception('unterminated string literal on line %d' % (self.input_line, )); + raise Exception('unterminated string literal on line %d' % (self.input_line, )) def process_long_string_constant(self, line): self.process_long_comment(line) # this works because they're both closed by a matching long bracket -class DriverFilter(object): +class DriverFilter: DRIVER_CHARS = frozenset( [chr(x) for x in range(ord('0'), ord('9') + 1)] + [chr(x) for x in range(ord('a'), ord('z') + 1)] + ['_']) def __init__(self, options, **kwargs): - super(DriverFilter, self).__init__(**kwargs) + super().__init__(**kwargs) self.parse_filter(options.filter) self.parse_list(options.list) @@ -426,7 +425,7 @@ class DriverFilter(object): elif text.startswith('+'): text = text[1:].lstrip() if not text: - sys.stderr.write('%s:%s: Empty driver name\n' % (p, parser.input_line, text)) + sys.stderr.write('%s:%s: Empty driver name\n' % (p, parser.input_line)) sys.exit(1) elif not all(x in self.DRIVER_CHARS for x in text): sys.stderr.write('%s:%s: Invalid character in driver name "%s"\n' % (p, parser.input_line, text)) @@ -436,7 +435,7 @@ class DriverFilter(object): elif text.startswith('-'): text = text[1:].lstrip() if not text: - sys.stderr.write('%s:%s: Empty driver name\n' % (p, parser.input_line, text)) + sys.stderr.write('%s:%s: Empty driver name\n' % (p, parser.input_line)) sys.exit(1) elif not all(x in self.DRIVER_CHARS for x in text): sys.stderr.write('%s:%s: Invalid character in driver name "%s"\n' % (p, parser.input_line, text)) @@ -450,16 +449,16 @@ class DriverFilter(object): if n not in filters: filters.add(n) try: - f = io.open(n, 'r', encoding='utf-8') + filterfile = io.open(n, 'r', encoding='utf-8') except IOError: sys.stderr.write('Unable to open filter file "%s"\n' % (p, )) sys.exit(1) - with f: + with filterfile: handler = CppParser.Handler() handler.line = line_hook parser = CppParser(handler) try: - parser.parse(f) + parser.parse(filterfile) except IOError: sys.stderr.write('Error reading filter file "%s"\n' % (p, )) sys.exit(1) @@ -508,16 +507,16 @@ class DriverFilter(object): if n not in lists: lists.add(n) try: - f = io.open(n, 'r', encoding='utf-8') + listfile = io.open(n, 'r', encoding='utf-8') except IOError: sys.stderr.write('Unable to open list file "%s"\n' % (p, )) sys.exit(1) - with f: + with listfile: handler = CppParser.Handler() handler.line = line_hook parser = CppParser(handler) try: - parser.parse(f) + parser.parse(listfile) except IOError: sys.stderr.write('Error reading list file "%s"\n' % (p, )) sys.exit(1) @@ -694,16 +693,16 @@ def scan_source_dependencies(options): return seen -def write_project(options, f, mappings, sources): +def write_project(options, projectfile, mappings, sources): targetsrc = '' for source in sorted(sources): action = mappings.get(source) if action: for line in action: - f.write(line + '\n') + projectfile.write(line + '\n') if source.startswith('src/mame/'): targetsrc += ' MAME_DIR .. "%s",\n' % (source, ) - f.write( + projectfile.write( '\n' \ 'function createProjects_mame_%s(_target, _subtarget)\n' \ ' project ("mame_%s")\n' \ @@ -740,7 +739,7 @@ def write_project(options, f, mappings, sources): 'end\n' % (options.target, options.target, options.target, targetsrc, options.target, options.target)) -def write_filter(options, f): +def write_filter(options, filterfile): drivers = set() for source in options.sources: components = tuple(x for x in split_path(source) if x) @@ -749,7 +748,7 @@ def write_filter(options, f): if ext.startswith('.c'): drivers.add('/'.join(components[3:])) for driver in sorted(drivers): - f.write(driver + '\n') + filterfile.write(driver + '\n') if __name__ == '__main__': diff --git a/docs/release/scripts/build/verinfo.py b/docs/release/scripts/build/verinfo.py index 719b4ae3493..55377c524ab 100644 --- a/docs/release/scripts/build/verinfo.py +++ b/docs/release/scripts/build/verinfo.py @@ -1,10 +1,8 @@ -#!/usr/bin/python +#!/usr/bin/python3 ## ## license:BSD-3-Clause ## copyright-holders:Aaron Giles, Andrew Gardner -from __future__ import with_statement - import io import re import sys @@ -28,7 +26,7 @@ def parse_args(): format = 'plist' elif flags and (sys.argv[i] == '-b'): i += 1 - if (i >= len(sys.argv)): + if i >= len(sys.argv): usage() else: target = sys.argv[i] diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index d95877305fc..935738bfd9e 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -1079,7 +1079,6 @@ end } if (version >= 80000) then buildoptions { - "-Wno-format-overflow", -- try machine/bfm_sc45_helper.cpp in GCC 8.0.1, among others "-Wno-stringop-truncation", -- ImGui again "-Wno-stringop-overflow", -- formats/victor9k_dsk.cpp bugs the compiler } @@ -1087,17 +1086,10 @@ end "-Wno-class-memaccess", -- many instances in ImGui and BGFX } end - if (version >= 100000) then - buildoptions { - "-Wno-return-local-addr", -- sqlite3.c in GCC 10 - } - end if (version >= 110000) then buildoptions { "-Wno-nonnull", -- luaengine.cpp lambdas do not need "this" captured but GCC 11.1 erroneously insists "-Wno-stringop-overread", -- machine/bbc.cpp in GCC 11.1 - "-Wno-misleading-indentation", -- sqlite3.c in GCC 11.1 - "-Wno-maybe-uninitialized" -- expat in GCC 11.1 } end end diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 6060edb068a..0c6c03663f6 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -80,6 +80,18 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end + + configuration { "gmake or ninja" } +if _OPTIONS["gcc"]~=nil then + if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then + + else + buildoptions_c { + "-Wno-maybe-uninitialized", -- expat in GCC 11.1 + } + end +end + configuration { } files { @@ -104,7 +116,7 @@ project "zlib" kind "StaticLib" local version = str_to_version(_OPTIONS["gcc_version"]) - if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then + if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android")) then configuration { "gmake or ninja" } if (version >= 30700) then buildoptions { @@ -961,17 +973,24 @@ project "sqlite3" uuid "5cb3d495-57ed-461c-81e5-80dc0857517d" kind "StaticLib" - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-bad-function-cast", "-Wno-discarded-qualifiers", "-Wno-undef", "-Wno-unused-but-set-variable", } -if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then +if _OPTIONS["gcc"]~=nil then + if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then buildoptions_c { "-Wno-incompatible-pointer-types-discards-qualifiers", } + else + buildoptions_c { + "-Wno-return-local-addr", -- sqlite3.c in GCC 10 + "-Wno-misleading-indentation", -- sqlite3.c in GCC 11.1 + } + end end configuration { "vs*" } if _OPTIONS["vs"]=="clangcl" then @@ -1186,7 +1205,7 @@ project "bimg" MAME_DIR .. "3rdparty/bx/include/compat/freebsd", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-unused-but-set-variable", } diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index 0311718c4d3..21cdbe5dda8 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -325,6 +325,8 @@ if (BUSES["ARCHIMEDES_ECONET"]~=null) then MAME_DIR .. "src/devices/bus/archimedes/econet/slot.h", MAME_DIR .. "src/devices/bus/archimedes/econet/econet.cpp", MAME_DIR .. "src/devices/bus/archimedes/econet/econet.h", + MAME_DIR .. "src/devices/bus/archimedes/econet/midi.cpp", + MAME_DIR .. "src/devices/bus/archimedes/econet/midi.h", MAME_DIR .. "src/devices/bus/archimedes/econet/rtfmjoy.cpp", MAME_DIR .. "src/devices/bus/archimedes/econet/rtfmjoy.h", } @@ -374,6 +376,8 @@ if (BUSES["ARCHIMEDES_PODULE"]~=null) then MAME_DIR .. "src/devices/bus/archimedes/podule/lark.h", MAME_DIR .. "src/devices/bus/archimedes/podule/laserd.cpp", MAME_DIR .. "src/devices/bus/archimedes/podule/laserd.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/midi_emr.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/midi_emr.h", MAME_DIR .. "src/devices/bus/archimedes/podule/midimax.cpp", MAME_DIR .. "src/devices/bus/archimedes/podule/midimax.h", MAME_DIR .. "src/devices/bus/archimedes/podule/nexus.cpp", @@ -603,6 +607,8 @@ if (BUSES["BBC_JOYPORT"]~=null) then MAME_DIR .. "src/devices/bus/bbc/joyport/joyport.h", MAME_DIR .. "src/devices/bus/bbc/joyport/joystick.cpp", MAME_DIR .. "src/devices/bus/bbc/joyport/joystick.h", + MAME_DIR .. "src/devices/bus/bbc/joyport/mouse.cpp", + MAME_DIR .. "src/devices/bus/bbc/joyport/mouse.h", } end @@ -3036,6 +3042,8 @@ if (BUSES["NES_CTRL"]~=null) then MAME_DIR .. "src/devices/bus/nes_ctrl/partytap.h", MAME_DIR .. "src/devices/bus/nes_ctrl/powerpad.cpp", MAME_DIR .. "src/devices/bus/nes_ctrl/powerpad.h", + MAME_DIR .. "src/devices/bus/nes_ctrl/rob.cpp", + MAME_DIR .. "src/devices/bus/nes_ctrl/rob.h", MAME_DIR .. "src/devices/bus/nes_ctrl/snesadapter.cpp", MAME_DIR .. "src/devices/bus/nes_ctrl/snesadapter.h", MAME_DIR .. "src/devices/bus/nes_ctrl/suborkey.cpp", @@ -3044,6 +3052,16 @@ if (BUSES["NES_CTRL"]~=null) then MAME_DIR .. "src/devices/bus/nes_ctrl/turbofile.h", MAME_DIR .. "src/devices/bus/nes_ctrl/zapper.cpp", MAME_DIR .. "src/devices/bus/nes_ctrl/zapper.h", + MAME_DIR .. "src/devices/bus/nes_ctrl/zapper_sensor.cpp", + MAME_DIR .. "src/devices/bus/nes_ctrl/zapper_sensor.h", + } + + dependency { + { MAME_DIR .. "src/devices/bus/nes_ctrl/rob.cpp", GEN_DIR .. "emu/layout/nes_rob.lh" }, + } + + custombuildtask { + layoutbuildtask("emu/layout", "nes_rob"), } end @@ -3546,6 +3564,8 @@ if (BUSES["TI99"]~=null) then MAME_DIR .. "src/devices/bus/ti99/peb/ti_fdc.h", MAME_DIR .. "src/devices/bus/ti99/peb/ti_rs232.cpp", MAME_DIR .. "src/devices/bus/ti99/peb/ti_rs232.h", + MAME_DIR .. "src/devices/bus/ti99/peb/tipi.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/tipi.h", MAME_DIR .. "src/devices/bus/ti99/peb/tn_ide.cpp", MAME_DIR .. "src/devices/bus/ti99/peb/tn_ide.h", MAME_DIR .. "src/devices/bus/ti99/peb/tn_usbsm.cpp", @@ -3745,6 +3765,8 @@ end --------------------------------------------------- if (BUSES["EPSON_QX"]~=null) then files { + MAME_DIR .. "src/devices/bus/epson_qx/multifont.cpp", + MAME_DIR .. "src/devices/bus/epson_qx/multifont.h", MAME_DIR .. "src/devices/bus/epson_qx/option.cpp", MAME_DIR .. "src/devices/bus/epson_qx/option.h", } @@ -4645,6 +4667,10 @@ if (BUSES["MULTIBUS"]~=null) then MAME_DIR .. "src/devices/bus/multibus/multibus.h", MAME_DIR .. "src/devices/bus/multibus/isbc202.cpp", MAME_DIR .. "src/devices/bus/multibus/isbc202.h", + MAME_DIR .. "src/devices/bus/multibus/cpuap.cpp", + MAME_DIR .. "src/devices/bus/multibus/cpuap.h", + MAME_DIR .. "src/devices/bus/multibus/serad.cpp", + MAME_DIR .. "src/devices/bus/multibus/serad.h", } end diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index 8528391edc4..f578e6ac969 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -2215,6 +2215,10 @@ end -------------------------------------------------- -- Sharp SM510 series --@src/devices/cpu/sm510/sm510.h,CPUS["SM510"] = true +--@src/devices/cpu/sm510/sm511.h,CPUS["SM510"] = true +--@src/devices/cpu/sm510/sm530.h,CPUS["SM510"] = true +--@src/devices/cpu/sm510/sm590.h,CPUS["SM510"] = true +--@src/devices/cpu/sm510/sm5a.h,CPUS["SM510"] = true -------------------------------------------------- if CPUS["SM510"] then @@ -2849,6 +2853,38 @@ if opt_tool(CPUS, "SUPERFX") then end -------------------------------------------------- +-- Rockwell A/B5000 family +--@src/devices/cpu/rw5000/a5000.h,CPUS["RW5000"] = true +--@src/devices/cpu/rw5000/a5500.h,CPUS["RW5000"] = true +--@src/devices/cpu/rw5000/b5000.h,CPUS["RW5000"] = true +--@src/devices/cpu/rw5000/b6000.h,CPUS["RW5000"] = true +--@src/devices/cpu/rw5000/b6100.h,CPUS["RW5000"] = true +-------------------------------------------------- + +if CPUS["RW5000"] then + files { + MAME_DIR .. "src/devices/cpu/rw5000/rw5000base.cpp", + MAME_DIR .. "src/devices/cpu/rw5000/rw5000base.h", + MAME_DIR .. "src/devices/cpu/rw5000/b5000.cpp", + MAME_DIR .. "src/devices/cpu/rw5000/b5000.h", + MAME_DIR .. "src/devices/cpu/rw5000/b5000op.cpp", + MAME_DIR .. "src/devices/cpu/rw5000/b6000.cpp", + MAME_DIR .. "src/devices/cpu/rw5000/b6000.h", + MAME_DIR .. "src/devices/cpu/rw5000/b6100.cpp", + MAME_DIR .. "src/devices/cpu/rw5000/b6100.h", + MAME_DIR .. "src/devices/cpu/rw5000/a5000.cpp", + MAME_DIR .. "src/devices/cpu/rw5000/a5000.h", + MAME_DIR .. "src/devices/cpu/rw5000/a5500.cpp", + MAME_DIR .. "src/devices/cpu/rw5000/a5500.h", + } +end + +if opt_tool(CPUS, "RW5000") then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/rw5000/rw5000d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/rw5000/rw5000d.h") +end + +-------------------------------------------------- -- Rockwell PPS-4 --@src/devices/cpu/pps4/pps4.h,CPUS["PPS4"] = true -------------------------------------------------- diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 02d1cf71579..1e1c601b56e 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -1976,6 +1976,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/ldv4200hle.h,MACHINES["LDV4200HLE"] = true +--------------------------------------------------- + +if (MACHINES["LDV4200HLE"]~=null) then + files { + MAME_DIR .. "src/devices/machine/ldv4200hle.cpp", + MAME_DIR .. "src/devices/machine/ldv4200hle.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/ldp1000.h,MACHINES["LDP1000"] = true --------------------------------------------------- @@ -4934,3 +4946,14 @@ if (MACHINES["BITMAP_PRINTER"]~=null) then MAME_DIR .. "src/devices/machine/bitmap_printer.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/ns32382.h,MACHINES["NS32382"] = true +--------------------------------------------------- +if (MACHINES["NS32382"]~=null) then + files { + MAME_DIR .. "src/devices/machine/ns32382.cpp", + MAME_DIR .. "src/devices/machine/ns32382.h", + } +end diff --git a/docs/release/scripts/target/hbmame/hbmame.lua b/docs/release/scripts/target/hbmame/hbmame.lua index 5b4d26e6322..cdc53d8eec1 100644 --- a/docs/release/scripts/target/hbmame/hbmame.lua +++ b/docs/release/scripts/target/hbmame/hbmame.lua @@ -248,6 +248,7 @@ MACHINES["Z80SIO"] = true -- ddenlovr BUSES["ATA"] = true BUSES["GENERIC"] = true BUSES["NSCSI"] = true +BUSES["NES_CTRL"] = true -- playch10 BUSES["SAT_CTRL"] = true -- stv BUSES["SCSI"] = true @@ -393,7 +394,6 @@ files { MAME_DIR .. "src/mame/video/1942.cpp", MAME_DIR .. "src/mame/audio/nl_1942.cpp", MAME_DIR .. "src/hbmame/drivers/blktiger.cpp", - MAME_DIR .. "src/mame/video/blktiger.cpp", MAME_DIR .. "src/hbmame/drivers/commando.cpp", MAME_DIR .. "src/mame/video/commando.cpp", MAME_DIR .. "src/hbmame/drivers/cps1.cpp", @@ -404,7 +404,6 @@ files { MAME_DIR .. "src/mame/audio/cps3.cpp", MAME_DIR .. "src/hbmame/drivers/fcrash.cpp", MAME_DIR .. "src/hbmame/drivers/mitchell.cpp", - MAME_DIR .. "src/mame/video/mitchell.cpp", MAME_DIR .. "src/mame/machine/kabuki.cpp", } @@ -1025,9 +1024,7 @@ files { MAME_DIR .. "src/hbmame/drivers/tehkanwc.cpp", MAME_DIR .. "src/mame/video/tehkanwc.cpp", MAME_DIR .. "src/mame/drivers/wc90.cpp", - MAME_DIR .. "src/mame/video/wc90.cpp", MAME_DIR .. "src/hbmame/drivers/wc90b.cpp", - MAME_DIR .. "src/mame/video/wc90b.cpp", } createHBMAMEProjects(_target, _subtarget, "toaplan") diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index 2ef88c63ebe..ed047d4cf33 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -120,6 +120,7 @@ CPUS["UNSP"] = true CPUS["HCD62121"] = true CPUS["PPS4"] = true --CPUS["PPS41"] = true +--CPUS["RW5000"] = true CPUS["UPD7725"] = true CPUS["HD61700"] = true CPUS["LC8670"] = true @@ -138,7 +139,7 @@ CPUS["HMCS40"] = true --CPUS["E0C6200"] = true --CPUS["MELPS4"] = true --CPUS["HPHYBRID"] = true ---CPUS["SM510"] = true +CPUS["SM510"] = true CPUS["ST62XX"] = true CPUS["DSPP"] = true CPUS["HPC"] = true @@ -541,6 +542,7 @@ MACHINES["LC89510"] = true MACHINES["LDPR8210"] = true MACHINES["LDSTUB"] = true MACHINES["LDV1000"] = true +MACHINES["LDV4200HLE"] = true MACHINES["LDP1000"] = true MACHINES["LDP1450"] = true MACHINES["LDVP931"] = true @@ -1527,12 +1529,8 @@ files { MAME_DIR .. "src/mame/video/tigeroad_spr.cpp", MAME_DIR .. "src/mame/video/tigeroad_spr.h", MAME_DIR .. "src/mame/drivers/blktiger.cpp", - MAME_DIR .. "src/mame/includes/blktiger.h", - MAME_DIR .. "src/mame/video/blktiger.cpp", MAME_DIR .. "src/mame/drivers/blktiger_ms.cpp", MAME_DIR .. "src/mame/drivers/cbasebal.cpp", - MAME_DIR .. "src/mame/includes/cbasebal.h", - MAME_DIR .. "src/mame/video/cbasebal.cpp", MAME_DIR .. "src/mame/drivers/commando.cpp", MAME_DIR .. "src/mame/includes/commando.h", MAME_DIR .. "src/mame/video/commando.cpp", @@ -1571,8 +1569,6 @@ files { MAME_DIR .. "src/mame/includes/lwings.h", MAME_DIR .. "src/mame/video/lwings.cpp", MAME_DIR .. "src/mame/drivers/mitchell.cpp", - MAME_DIR .. "src/mame/includes/mitchell.h", - MAME_DIR .. "src/mame/video/mitchell.cpp", MAME_DIR .. "src/mame/drivers/psrockman.cpp", MAME_DIR .. "src/mame/drivers/sf.cpp", MAME_DIR .. "src/mame/drivers/sidearms.cpp", @@ -1877,8 +1873,6 @@ files { MAME_DIR .. "src/mame/includes/dynax.h", MAME_DIR .. "src/mame/video/dynax.cpp", MAME_DIR .. "src/mame/drivers/hnayayoi.cpp", - MAME_DIR .. "src/mame/includes/hnayayoi.h", - MAME_DIR .. "src/mame/video/hnayayoi.cpp", MAME_DIR .. "src/mame/drivers/realbrk.cpp", MAME_DIR .. "src/mame/includes/realbrk.h", MAME_DIR .. "src/mame/video/realbrk.cpp", @@ -2257,8 +2251,6 @@ files { createMAMEProjects(_target, _subtarget, "itech") files { MAME_DIR .. "src/mame/drivers/capbowl.cpp", - MAME_DIR .. "src/mame/includes/capbowl.h", - MAME_DIR .. "src/mame/video/capbowl.cpp", MAME_DIR .. "src/mame/drivers/itech8.cpp", MAME_DIR .. "src/mame/includes/itech8.h", MAME_DIR .. "src/mame/machine/itech8.cpp", @@ -2466,8 +2458,6 @@ files { MAME_DIR .. "src/mame/includes/fastfred.h", MAME_DIR .. "src/mame/video/fastfred.cpp", MAME_DIR .. "src/mame/drivers/fastlane.cpp", - MAME_DIR .. "src/mame/includes/fastlane.h", - MAME_DIR .. "src/mame/video/fastlane.cpp", MAME_DIR .. "src/mame/drivers/finalizr.cpp", MAME_DIR .. "src/mame/includes/finalizr.h", MAME_DIR .. "src/mame/video/finalizr.cpp", @@ -2475,8 +2465,6 @@ files { MAME_DIR .. "src/mame/machine/midikbd.cpp", MAME_DIR .. "src/mame/machine/midikbd.h", MAME_DIR .. "src/mame/drivers/flkatck.cpp", - MAME_DIR .. "src/mame/includes/flkatck.h", - MAME_DIR .. "src/mame/video/flkatck.cpp", MAME_DIR .. "src/mame/drivers/gberet.cpp", MAME_DIR .. "src/mame/includes/gberet.h", MAME_DIR .. "src/mame/video/gberet.cpp", @@ -2569,8 +2557,6 @@ files { MAME_DIR .. "src/mame/includes/mainevt.h", MAME_DIR .. "src/mame/video/mainevt.cpp", MAME_DIR .. "src/mame/drivers/megazone.cpp", - MAME_DIR .. "src/mame/includes/megazone.h", - MAME_DIR .. "src/mame/video/megazone.cpp", MAME_DIR .. "src/mame/drivers/mikie.cpp", MAME_DIR .. "src/mame/includes/mikie.h", MAME_DIR .. "src/mame/video/mikie.cpp", @@ -2678,8 +2664,6 @@ files { MAME_DIR .. "src/mame/includes/ultraman.h", MAME_DIR .. "src/mame/video/ultraman.cpp", MAME_DIR .. "src/mame/drivers/vendetta.cpp", - MAME_DIR .. "src/mame/includes/vendetta.h", - MAME_DIR .. "src/mame/video/vendetta.cpp", MAME_DIR .. "src/mame/drivers/viper.cpp", MAME_DIR .. "src/mame/drivers/wecleman.cpp", MAME_DIR .. "src/mame/includes/wecleman.h", @@ -3957,8 +3941,6 @@ createMAMEProjects(_target, _subtarget, "suna") files { MAME_DIR .. "src/mame/drivers/go2000.cpp", MAME_DIR .. "src/mame/drivers/goindol.cpp", - MAME_DIR .. "src/mame/includes/goindol.h", - MAME_DIR .. "src/mame/video/goindol.cpp", MAME_DIR .. "src/mame/drivers/suna8.cpp", MAME_DIR .. "src/mame/includes/suna8.h", MAME_DIR .. "src/mame/audio/suna8.cpp", @@ -4047,8 +4029,6 @@ files { MAME_DIR .. "src/mame/video/darius.cpp", MAME_DIR .. "src/mame/drivers/dinoking.cpp", MAME_DIR .. "src/mame/drivers/exzisus.cpp", - MAME_DIR .. "src/mame/includes/exzisus.h", - MAME_DIR .. "src/mame/video/exzisus.cpp", MAME_DIR .. "src/mame/drivers/fgoal.cpp", MAME_DIR .. "src/mame/includes/fgoal.h", MAME_DIR .. "src/mame/video/fgoal.cpp", @@ -4393,11 +4373,7 @@ files { MAME_DIR .. "src/mame/includes/tehkanwc.h", MAME_DIR .. "src/mame/video/tehkanwc.cpp", MAME_DIR .. "src/mame/drivers/wc90.cpp", - MAME_DIR .. "src/mame/includes/wc90.h", - MAME_DIR .. "src/mame/video/wc90.cpp", MAME_DIR .. "src/mame/drivers/wc90b.cpp", - MAME_DIR .. "src/mame/includes/wc90b.h", - MAME_DIR .. "src/mame/video/wc90b.cpp", } createMAMEProjects(_target, _subtarget, "terminal") @@ -4509,8 +4485,6 @@ files { MAME_DIR .. "src/mame/includes/nova2001.h", MAME_DIR .. "src/mame/video/nova2001.cpp", MAME_DIR .. "src/mame/drivers/xxmissio.cpp", - MAME_DIR .. "src/mame/includes/xxmissio.h", - MAME_DIR .. "src/mame/video/xxmissio.cpp", } createMAMEProjects(_target, _subtarget, "valadon") @@ -4579,14 +4553,10 @@ files { MAME_DIR .. "src/mame/includes/suprslam.h", MAME_DIR .. "src/mame/video/suprslam.cpp", MAME_DIR .. "src/mame/drivers/tail2nos.cpp", - MAME_DIR .. "src/mame/includes/tail2nos.h", - MAME_DIR .. "src/mame/video/tail2nos.cpp", MAME_DIR .. "src/mame/drivers/taotaido.cpp", MAME_DIR .. "src/mame/includes/taotaido.h", MAME_DIR .. "src/mame/video/taotaido.cpp", MAME_DIR .. "src/mame/drivers/welltris.cpp", - MAME_DIR .. "src/mame/includes/welltris.h", - MAME_DIR .. "src/mame/video/welltris.cpp", } createMAMEProjects(_target, _subtarget, "wing") @@ -4608,8 +4578,6 @@ files { MAME_DIR .. "src/mame/includes/paradise.h", MAME_DIR .. "src/mame/video/paradise.cpp", MAME_DIR .. "src/mame/drivers/yunsung8.cpp", - MAME_DIR .. "src/mame/includes/yunsung8.h", - MAME_DIR .. "src/mame/video/yunsung8.cpp", MAME_DIR .. "src/mame/drivers/yunsun16.cpp", MAME_DIR .. "src/mame/includes/yunsun16.h", MAME_DIR .. "src/mame/video/yunsun16.cpp", @@ -4855,6 +4823,7 @@ files { MAME_DIR .. "src/mame/drivers/cointek.cpp", MAME_DIR .. "src/mame/drivers/comebaby.cpp", MAME_DIR .. "src/mame/drivers/compucranes.cpp", + MAME_DIR .. "src/mame/drivers/cosmos_playc8f.cpp", MAME_DIR .. "src/mame/drivers/cowtipping.cpp", MAME_DIR .. "src/mame/drivers/crazybal.cpp", MAME_DIR .. "src/mame/drivers/cromptons.cpp", @@ -5146,8 +5115,6 @@ files { MAME_DIR .. "src/mame/drivers/tecnodar.cpp", MAME_DIR .. "src/mame/drivers/thayers.cpp", MAME_DIR .. "src/mame/drivers/thedeep.cpp", - MAME_DIR .. "src/mame/includes/thedeep.h", - MAME_DIR .. "src/mame/video/thedeep.cpp", MAME_DIR .. "src/mame/drivers/tickee.cpp", MAME_DIR .. "src/mame/drivers/tmspoker.cpp", MAME_DIR .. "src/mame/drivers/triviaquiz.cpp", @@ -5157,6 +5124,7 @@ files { MAME_DIR .. "src/mame/drivers/trucocl.cpp", MAME_DIR .. "src/mame/includes/trucocl.h", MAME_DIR .. "src/mame/video/trucocl.cpp", + MAME_DIR .. "src/mame/drivers/truesys.cpp", MAME_DIR .. "src/mame/drivers/trvmadns.cpp", MAME_DIR .. "src/mame/drivers/trvquest.cpp", MAME_DIR .. "src/mame/drivers/ttchamp.cpp", diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index f8f9e672ac4..ac3879802ac 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -123,6 +123,7 @@ CPUS["UNSP"] = true CPUS["HCD62121"] = true CPUS["PPS4"] = true CPUS["PPS41"] = true +CPUS["RW5000"] = true CPUS["UPD7725"] = true CPUS["HD61700"] = true CPUS["LC8670"] = true @@ -831,6 +832,7 @@ MACHINES["NS32081"] = true MACHINES["NS32202"] = true MACHINES["NS32082"] = true MACHINES["BITMAP_PRINTER"] = true +MACHINES["NS32382"] = true -------------------------------------------------- -- specify available bus cores @@ -1061,6 +1063,7 @@ FORMATS["CD90_640_DSK"] = true FORMATS["CGENIE_DSK"] = true FORMATS["CGEN_CAS"] = true FORMATS["COCO_CAS"] = true +FORMATS["COCO_RAWDSK"] = true FORMATS["COMX35_DSK"] = true FORMATS["CONCEPT_DSK"] = true FORMATS["COUPEDSK"] = true @@ -2176,6 +2179,7 @@ files { createMESSProjects(_target, _subtarget, "conic") files { MAME_DIR .. "src/mame/drivers/conic_cchess2.cpp", + MAME_DIR .. "src/mame/drivers/conic_cchess3.cpp", } createMESSProjects(_target, _subtarget, "consumenta") @@ -2366,6 +2370,7 @@ files { MAME_DIR .. "src/mame/machine/ms7004.h", MAME_DIR .. "src/mame/drivers/mk85.cpp", MAME_DIR .. "src/mame/drivers/mk90.cpp", + MAME_DIR .. "src/mame/drivers/mk98.cpp", MAME_DIR .. "src/mame/drivers/ms6102.cpp", MAME_DIR .. "src/mame/machine/kr1601rr1.cpp", MAME_DIR .. "src/mame/machine/kr1601rr1.h", @@ -3549,6 +3554,7 @@ files { MAME_DIR .. "src/mame/drivers/roland_sc55.cpp", MAME_DIR .. "src/mame/drivers/roland_sc88.cpp", MAME_DIR .. "src/mame/drivers/roland_tb303.cpp", + MAME_DIR .. "src/mame/drivers/roland_tnsc1.cpp", MAME_DIR .. "src/mame/drivers/roland_tr505.cpp", MAME_DIR .. "src/mame/drivers/roland_tr606.cpp", MAME_DIR .. "src/mame/drivers/roland_tr707.cpp", @@ -3585,6 +3591,7 @@ files { MAME_DIR .. "src/mame/machine/aim65.cpp", MAME_DIR .. "src/mame/drivers/aim65_40.cpp", MAME_DIR .. "src/mame/drivers/hh_pps41.cpp", + MAME_DIR .. "src/mame/drivers/hh_rw5000.cpp", } createMESSProjects(_target, _subtarget, "rtpc") @@ -4630,6 +4637,7 @@ files { MAME_DIR .. "src/mame/drivers/fanucspmg.cpp", MAME_DIR .. "src/mame/drivers/fc100.cpp", MAME_DIR .. "src/mame/drivers/fk1.cpp", + MAME_DIR .. "src/mame/drivers/freedom120.cpp", MAME_DIR .. "src/mame/drivers/fs3216.cpp", MAME_DIR .. "src/mame/drivers/ft68m.cpp", MAME_DIR .. "src/mame/drivers/gameking.cpp", |