diff options
Diffstat (limited to 'docs/release/scripts')
23 files changed, 235 insertions, 159 deletions
diff --git a/docs/release/scripts/build/complay.py b/docs/release/scripts/build/complay.py index 445d25fe8ab..81516bc3ee7 100644 --- a/docs/release/scripts/build/complay.py +++ b/docs/release/scripts/build/complay.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 ## ## license:BSD-3-Clause ## copyright-holders:Vas Crabb @@ -12,11 +12,6 @@ import xml.sax.saxutils import zlib -# workaround for version incompatibility -if sys.version_info > (3, ): - long = int - - class ErrorHandler(object): def __init__(self, **kwargs): super(ErrorHandler, self).__init__(**kwargs) @@ -347,7 +342,7 @@ class LayoutChecker(Minifyer): self.handleError('Element mamelayout missing attribute version') else: try: - long(attrs['version']) + int(attrs['version']) except: self.handleError('Element mamelayout attribute version "%s" is not an integer' % (attrs['version'], )) self.have_script = None diff --git a/docs/release/scripts/build/msgfmt.py b/docs/release/scripts/build/msgfmt.py index 4147d5becb9..3f731e941ea 100644 --- a/docs/release/scripts/build/msgfmt.py +++ b/docs/release/scripts/build/msgfmt.py @@ -1,12 +1,12 @@ -#! /usr/bin/env python -# -*- coding: utf-8 -*- +#! /usr/bin/env python3 # Written by Martin v. Löwis <loewis@informatik.hu-berlin.de> """Generate binary message catalog from textual translation description. This program converts a textual Uniforum-style message catalog (.po file) into a binary GNU catalog (.mo file). This is essentially the same function as the -GNU msgfmt program, however, it is a simpler implementation. +GNU msgfmt program, however, it is a simpler implementation. Currently it +does not handle plural forms but it does handle message contexts. Usage: msgfmt.py [OPTIONS] filename.po @@ -25,14 +25,12 @@ Options: Display version information and exit. """ -from __future__ import print_function import os import sys +import ast import getopt import struct import array -import re -import codecs from email.parser import HeaderParser __version__ = "1.2" @@ -40,7 +38,6 @@ __version__ = "1.2" MESSAGES = {} - def usage(code, msg=''): print(__doc__, file=sys.stderr) if msg: @@ -48,33 +45,14 @@ def usage(code, msg=''): sys.exit(code) - -def add(id, str, fuzzy): +def add(ctxt, id, str, fuzzy): "Add a non-fuzzy translation to the dictionary." global MESSAGES if not fuzzy and str: - MESSAGES[id] = str - -def dequote(s): - if (s[0] == s[-1]) and s.startswith(("'", '"')): - return s[1:-1] - return s - -# decode_escapes from http://stackoverflow.com/a/24519338 -ESCAPE_SEQUENCE_RE = re.compile(r''' - ( \\U........ # 8-digit hex escapes - | \\u.... # 4-digit hex escapes - | \\x.. # 2-digit hex escapes - | \\[0-7]{1,3} # Octal escapes - | \\N\{[^}]+\} # Unicode characters by name - | \\[\\'"abfnrtv] # Single-character escapes - )''', re.UNICODE | re.VERBOSE) - -def decode_escapes(s): - def decode_match(match): - return codecs.decode(match.group(0), 'unicode-escape') - - return ESCAPE_SEQUENCE_RE.sub(decode_match, s) + if ctxt is None: + MESSAGES[id] = str + else: + MESSAGES[b"%b\x04%b" % (ctxt, id)] = str def generate(): @@ -112,17 +90,16 @@ def generate(): 7*4, # start of key index 7*4+len(keys)*8, # start of value index 0, 0) # size and offset of hash table - offsdata = array.array("i", offsets) - output += offsdata.tobytes() if hasattr(offsdata, "tobytes") else offsdata.tostring() + output += array.array("i", offsets).tobytes() output += ids output += strs return output - def make(filename, outfile): ID = 1 STR = 2 + CTXT = 3 # Compute .mo name from .po name and arguments if filename.endswith('.po'): @@ -133,31 +110,28 @@ def make(filename, outfile): outfile = os.path.splitext(infile)[0] + '.mo' try: - lines = open(infile, 'rb').readlines() + with open(infile, 'rb') as f: + lines = f.readlines() except IOError as msg: print(msg, file=sys.stderr) sys.exit(1) - section = None + section = msgctxt = None fuzzy = 0 - empty = 0 - header_attempted = False - - # Start off assuming Latin-1, so everything decodes without failure, - # until we know the exact encoding - encoding = 'latin-1' # Start off assuming Latin-1, so everything decodes without failure, # until we know the exact encoding encoding = 'latin-1' # Parse the catalog - for lno, l in enumerate(lines): + lno = 0 + for l in lines: l = l.decode(encoding) + lno += 1 # If we get a comment line after a msgstr, this is a new entry if l[0] == '#' and section == STR: - add(msgid, msgstr, fuzzy) - section = None + add(msgctxt, msgid, msgstr, fuzzy) + section = msgctxt = None fuzzy = 0 # Record a fuzzy mark if l[:2] == '#,' and 'fuzzy' in l: @@ -165,10 +139,16 @@ def make(filename, outfile): # Skip comments if l[0] == '#': continue - # Now we are in a msgid section, output previous section - if l.startswith('msgid') and not l.startswith('msgid_plural'): + # Now we are in a msgid or msgctxt section, output previous section + if l.startswith('msgctxt'): if section == STR: - add(msgid, msgstr, fuzzy) + add(msgctxt, msgid, msgstr, fuzzy) + section = CTXT + l = l[7:] + msgctxt = b'' + elif l.startswith('msgid') and not l.startswith('msgid_plural'): + if section == STR: + add(msgctxt, msgid, msgstr, fuzzy) if not msgid: # See whether there is an encoding declaration p = HeaderParser() @@ -179,14 +159,6 @@ def make(filename, outfile): l = l[5:] msgid = msgstr = b'' is_plural = False - if l.strip() == '""': - # Check if next line is msgstr. If so, this is a multiline msgid. - if lines[lno+1].decode(encoding).startswith('msgstr'): - # If this is the first empty msgid and is followed by msgstr, this is the header, which may contain the encoding declaration. - # Otherwise this file is not valid - if empty > 1: - print("Found multiple empty msgids on line " + str(lno) + ", not valid!") - empty += 1 # This is a message with plural forms elif l.startswith('msgid_plural'): if section != ID: @@ -208,26 +180,6 @@ def make(filename, outfile): if msgstr: msgstr += b'\0' # Separator of the various plural forms else: - if (l[6:].strip() == '""') and (empty == 1) and (not header_attempted): - header = "" - # parse up until next empty line = end of header - hdrno = lno - while(hdrno < len(lines)-1): - # This is a roundabout way to strip non-ASCII unicode characters from the header. - # As we are only parsing out the encoding, we don't need any unicode chars in it. - l = lines[hdrno+1].decode('unicode_escape').encode('ascii','ignore').decode(encoding) - if l.strip(): - header += decode_escapes(dequote(l.strip())) - else: - break - hdrno += 1 - # See whether there is an encoding declaration - if(hdrno > lno): - p = HeaderParser() - charset = p.parsestr(str(header)).get_content_charset() - header_attempted = True - if charset: - encoding = charset if is_plural: print('indexed msgstr required for plural on %s:%d' % (infile, lno), file=sys.stderr) @@ -237,8 +189,10 @@ def make(filename, outfile): l = l.strip() if not l: continue - l = decode_escapes(dequote(l)) # strip quotes and replace newlines if present - if section == ID: + l = ast.literal_eval(l) + if section == CTXT: + msgctxt += l.encode(encoding) + elif section == ID: msgid += l.encode(encoding) elif section == STR: msgstr += l.encode(encoding) @@ -249,18 +203,18 @@ def make(filename, outfile): sys.exit(1) # Add last entry if section == STR: - add(msgid, msgstr, fuzzy) + add(msgctxt, msgid, msgstr, fuzzy) # Compute output output = generate() try: - open(outfile,"wb").write(output) + with open(outfile,"wb") as f: + f.write(output) except IOError as msg: print(msg, file=sys.stderr) - def main(): try: opts, args = getopt.getopt(sys.argv[1:], 'hVo:', diff --git a/docs/release/scripts/build/png2bdc.py b/docs/release/scripts/build/png2bdc.py index a1be5c552d0..adc4b185f44 100644 --- a/docs/release/scripts/build/png2bdc.py +++ b/docs/release/scripts/build/png2bdc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ## ## license:BSD-3-Clause ## copyright-holders:Aaron Giles, Andrew Gardner @@ -59,12 +59,8 @@ import os import png import sys -if sys.version_info >= (3,): - def b2p(v): - return bytes([v]) -else: - def b2p(v): - return chr(v) +def b2p(v): + return bytes([v]) ######################################## diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index 4f443116ebb..2d53bda770b 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -435,7 +435,7 @@ else LIBTYPE = "StaticLib" end -PYTHON = "python" +PYTHON = "python3" if _OPTIONS["PYTHON_EXECUTABLE"]~=nil then PYTHON = _OPTIONS["PYTHON_EXECUTABLE"] diff --git a/docs/release/scripts/minimaws/lib/assets/common.js b/docs/release/scripts/minimaws/lib/assets/common.js index baedcf3940d..7439aaa5a21 100644 --- a/docs/release/scripts/minimaws/lib/assets/common.js +++ b/docs/release/scripts/minimaws/lib/assets/common.js @@ -37,6 +37,13 @@ function make_collapsible(heading, section) } } }); + + return function () + { + hidden = true; + icon.setAttribute('src', assetsurl + '/discloseup.svg'); + section.style.display = 'none'; + }; } diff --git a/docs/release/scripts/minimaws/lib/assets/disclosedown.svg b/docs/release/scripts/minimaws/lib/assets/disclosedown.svg index ddf75e25f0f..bb66c7f5de9 100644 --- a/docs/release/scripts/minimaws/lib/assets/disclosedown.svg +++ b/docs/release/scripts/minimaws/lib/assets/disclosedown.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="16"> - <path d="m 0,0 h 16 l -8,16 z" /> + <path d="m 0,5 h 16 l -8,10 z" /> </svg> diff --git a/docs/release/scripts/minimaws/lib/assets/discloseup.svg b/docs/release/scripts/minimaws/lib/assets/discloseup.svg index 51e2bea9863..010065a446b 100644 --- a/docs/release/scripts/minimaws/lib/assets/discloseup.svg +++ b/docs/release/scripts/minimaws/lib/assets/discloseup.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="16"> - <path d="m 0,0 v 16 l 16,-8 z" /> + <path d="m 5,0 v 16 l 10,-8 z" /> </svg> diff --git a/docs/release/scripts/minimaws/lib/dbaccess.py b/docs/release/scripts/minimaws/lib/dbaccess.py index c22b7c318fa..3cfbec0c508 100644 --- a/docs/release/scripts/minimaws/lib/dbaccess.py +++ b/docs/release/scripts/minimaws/lib/dbaccess.py @@ -33,6 +33,11 @@ class SchemaQueries(object): ' shortname TEXT NOT NULL,\n' \ ' description TEXT NOT NULL,\n' \ ' UNIQUE (shortname ASC))' + CREATE_SOFTWARELISTNOTES = \ + 'CREATE TABLE softwarelistnotes (\n' \ + ' softwarelist INTEGER PRIMARY KEY,\n' \ + ' notes TEXT NOT NULL,\n' \ + ' FOREIGN KEY (softwarelist) REFERENCES softwarelist (id))' CREATE_SOFTWARE = \ 'CREATE TABLE software (\n' \ ' id INTEGER PRIMARY KEY,\n' \ @@ -50,6 +55,11 @@ class SchemaQueries(object): ' parent INTEGER NOT NULL,\n' \ ' FOREIGN KEY (id) REFERENCES software (id),\n' \ ' FOREIGN KEY (parent) REFERENCES software (id))' + CREATE_SOFTWARENOTES = \ + 'CREATE TABLE softwarenotes (\n' \ + ' software INTEGER PRIMARY KEY,\n' \ + ' notes TEXT NOT NULL,\n' \ + ' FOREIGN KEY (software) REFERENCES software (id))' CREATE_SOFTWAREINFO = \ 'CREATE TABLE softwareinfo (\n' \ ' id INTEGER PRIMARY KEY,\n' \ @@ -390,8 +400,10 @@ class SchemaQueries(object): CREATE_SOFTWARESHAREDFEATTYPE, CREATE_SOFTWAREPARTFEATURETYPE, CREATE_SOFTWARELIST, + CREATE_SOFTWARELISTNOTES, CREATE_SOFTWARE, CREATE_SOFTWARECLONEOF, + CREATE_SOFTWARENOTES, CREATE_SOFTWAREINFO, CREATE_SOFTWARESHAREDFEAT, CREATE_SOFTWAREPART, @@ -500,7 +512,9 @@ class UpdateQueries(object): ADD_SOFTWARESHAREDFEATTYPE = 'INSERT OR IGNORE INTO softwaresharedfeattype (name) VALUES (?)' ADD_SOFTWAREPARTFEATURETYPE = 'INSERT OR IGNORE INTO softwarepartfeaturetype (name) VALUES(?)' ADD_SOFTWARELIST = 'INSERT INTO softwarelist (shortname, description) VALUES (?, ?)' + ADD_SOFTWARELISTNOTES = 'INSERT INTO softwarelistnotes (softwarelist, notes) VALUES (?, ?)' ADD_SOFTWARE = 'INSERT INTO software (softwarelist, shortname, supported, description, year, publisher) VALUES (?, ?, ?, ?, ?, ?)' + ADD_SOFTWARENOTES = 'INSERT INTO softwarenotes (software, notes) VALUES (?, ?)' ADD_SOFTWAREINFO = 'INSERT INTO softwareinfo (software, infotype, value) SELECT ?, id, ? FROM softwareinfotype WHERE name = ?' ADD_SOFTWARESHAREDFEAT = 'INSERT INTO softwaresharedfeat (software, sharedfeattype, value) SELECT ?, id, ? FROM softwaresharedfeattype WHERE name = ?' ADD_SOFTWAREPART = 'INSERT INTO softwarepart (software, shortname, interface) VALUES (?, ?, ?)' @@ -785,15 +799,15 @@ class QueryCursor(object): def get_softwarelist_details(self, shortname, pattern): if pattern is not None: return self.dbcurs.execute( - 'SELECT softwarelist.id AS id, softwarelist.shortname AS shortname, softwarelist.description AS description, COUNT(software.id) AS total, COUNT(CASE software.supported WHEN 0 THEN 1 ELSE NULL END) AS supported, COUNT(CASE software.supported WHEN 1 THEN 1 ELSE NULL END) AS partiallysupported, COUNT(CASE software.supported WHEN 2 THEN 1 ELSE NULL END) AS unsupported ' \ - 'FROM softwarelist LEFT JOIN software ON softwarelist.id = software.softwarelist ' \ + 'SELECT softwarelist.id AS id, softwarelist.shortname AS shortname, softwarelist.description AS description, softwarelistnotes.notes AS notes, COUNT(software.id) AS total, COUNT(CASE software.supported WHEN 0 THEN 1 ELSE NULL END) AS supported, COUNT(CASE software.supported WHEN 1 THEN 1 ELSE NULL END) AS partiallysupported, COUNT(CASE software.supported WHEN 2 THEN 1 ELSE NULL END) AS unsupported ' \ + 'FROM softwarelist LEFT JOIN softwarelistnotes ON softwarelist.id = softwarelistnotes.softwarelist LEFT JOIN software ON softwarelist.id = software.softwarelist ' \ 'WHERE softwarelist.shortname = ? AND software.shortname GLOB ? ' \ 'GROUP BY softwarelist.id', (shortname, pattern)) else: return self.dbcurs.execute( - 'SELECT softwarelist.id AS id, softwarelist.shortname AS shortname, softwarelist.description AS description, COUNT(software.id) AS total, COUNT(CASE software.supported WHEN 0 THEN 1 ELSE NULL END) AS supported, COUNT(CASE software.supported WHEN 1 THEN 1 ELSE NULL END) AS partiallysupported, COUNT(CASE software.supported WHEN 2 THEN 1 ELSE NULL END) AS unsupported ' \ - 'FROM softwarelist LEFT JOIN software ON softwarelist.id = software.softwarelist ' \ + 'SELECT softwarelist.id AS id, softwarelist.shortname AS shortname, softwarelist.description AS description, softwarelistnotes.notes AS notes, COUNT(software.id) AS total, COUNT(CASE software.supported WHEN 0 THEN 1 ELSE NULL END) AS supported, COUNT(CASE software.supported WHEN 1 THEN 1 ELSE NULL END) AS partiallysupported, COUNT(CASE software.supported WHEN 2 THEN 1 ELSE NULL END) AS unsupported ' \ + 'FROM softwarelist LEFT JOIN softwarelistnotes ON softwarelist.id = softwarelistnotes.softwarelist LEFT JOIN software ON softwarelist.id = software.softwarelist ' \ 'WHERE softwarelist.shortname = ? ' \ 'GROUP BY softwarelist.id', (shortname, )) @@ -836,8 +850,8 @@ class QueryCursor(object): def get_software_details(self, softwarelist, software): return self.dbcurs.execute( - 'SELECT software.id AS id, software.shortname AS shortname, software.supported AS supported, software.description AS description, software.year AS year, software.publisher AS publisher, softwarelist.shortname AS softwarelist, softwarelist.description AS softwarelistdescription, parent.shortname AS parent, parent.description AS parentdescription, parentsoftwarelist.shortname AS parentsoftwarelist, parentsoftwarelist.description AS parentsoftwarelistdescription ' \ - 'FROM software LEFT JOIN softwarelist ON software.softwarelist = softwarelist.id LEFT JOIN softwarecloneof ON software.id = softwarecloneof.id LEFT JOIN software AS parent ON softwarecloneof.parent = parent.id LEFT JOIN softwarelist AS parentsoftwarelist ON parent.softwarelist = parentsoftwarelist.id ' \ + 'SELECT software.id AS id, software.shortname AS shortname, software.supported AS supported, software.description AS description, software.year AS year, software.publisher AS publisher, softwarelist.shortname AS softwarelist, softwarelist.description AS softwarelistdescription, parent.shortname AS parent, parent.description AS parentdescription, parentsoftwarelist.shortname AS parentsoftwarelist, parentsoftwarelist.description AS parentsoftwarelistdescription, softwarenotes.notes AS notes ' \ + 'FROM software LEFT JOIN softwarelist ON software.softwarelist = softwarelist.id LEFT JOIN softwarecloneof ON software.id = softwarecloneof.id LEFT JOIN software AS parent ON softwarecloneof.parent = parent.id LEFT JOIN softwarelist AS parentsoftwarelist ON parent.softwarelist = parentsoftwarelist.id LEFT JOIN softwarenotes ON softwarenotes.software = software.id ' \ 'WHERE software.softwarelist = (SELECT id FROM softwarelist WHERE shortname = ?) AND software.shortname = ?', (softwarelist, software)) @@ -912,6 +926,9 @@ class UpdateCursor(object): self.dbcurs.execute(UpdateQueries.ADD_SOFTWARELIST, (shortname, description)) return self.dbcurs.lastrowid + def add_softwarelistnotes(self, softwarelist, notes): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWARELISTNOTES, (softwarelist, notes)) + def add_softwareinfotype(self, name): self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREINFOTYPE, (name, )) @@ -929,6 +946,9 @@ class UpdateCursor(object): self.dbcurs.execute(UpdateQueries.ADD_TEMPORARY_SOFTWARECLONEOF, (software, parent)) return self.dbcurs.lastrowid + def add_softwarenotes(self, software, notes): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWARENOTES, (software, notes)) + def add_softwareinfo(self, software, infotype, value): self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREINFO, (software, value, infotype)) return self.dbcurs.lastrowid diff --git a/docs/release/scripts/minimaws/lib/htmltmpl.py b/docs/release/scripts/minimaws/lib/htmltmpl.py index a80b4099787..62e1bbcf1ea 100644 --- a/docs/release/scripts/minimaws/lib/htmltmpl.py +++ b/docs/release/scripts/minimaws/lib/htmltmpl.py @@ -281,11 +281,27 @@ SOFTWARE_CLONES_ROW = string.Template( ' <td>${supported}</td>\n' \ ' </tr>\n') +SOFTWARE_NOTES_PROLOGUE = string.Template( + '<h2 id="heading-notes">Notes</h2>\n' \ + '<div id="div-notes">\n') + +SOFTWARE_NOTES_EPILOGUE = string.Template( + '</div>\n' \ + '<script>make_collapsible(document.getElementById("heading-notes"), document.getElementById("div-notes"))();</script>\n\n') + +SOFTWARE_PARTS_PROLOGUE = string.Template( + '<h2 id="heading-parts">Parts</h2>\n' \ + '<div id="div-parts">\n\n') + +SOFTWARE_PARTS_EPILOGUE = string.Template( + '</div>\n' \ + '<script>make_collapsible(document.getElementById("heading-parts"), document.getElementById("div-parts"));</script>\n\n') + SOFTWARE_PART_PROLOGUE = string.Template( - '<h3>${heading}</h3>\n' \ - '<table class="sysinfo">\n' \ - ' <tr><th>Short name:</th><td>${shortname}</td></tr>\n' \ - ' <tr><th>Interface:</th><td>${interface}</td></tr>\n') + ' <h3>${heading}</h3>\n' \ + ' <table class="sysinfo">\n' \ + ' <tr><th>Short name:</th><td>${shortname}</td></tr>\n' \ + ' <tr><th>Interface:</th><td>${interface}</td></tr>\n') SOFTWARELIST_PROLOGUE = string.Template( @@ -328,6 +344,14 @@ SOFTWARELIST_PROLOGUE = string.Template( ' </tr>\n' \ '</table>\n') +SOFTWARELIST_NOTES_PROLOGUE = string.Template( + '<h2 id="heading-notes">Notes</h2>\n' \ + '<div id="div-notes">\n') + +SOFTWARELIST_NOTES_EPILOGUE = string.Template( + '</div>\n' \ + '<script>make_collapsible(document.getElementById("heading-notes"), document.getElementById("div-notes"))();</script>\n\n') + SOFTWARELIST_MACHINE_TABLE_HEADER = string.Template( '<h2 id="heading-machines">Machines</h2>\n' \ '<table id="tbl-machines">\n' \ diff --git a/docs/release/scripts/minimaws/lib/lxparse.py b/docs/release/scripts/minimaws/lib/lxparse.py index 46737ef438a..e773669080d 100644 --- a/docs/release/scripts/minimaws/lib/lxparse.py +++ b/docs/release/scripts/minimaws/lib/lxparse.py @@ -352,6 +352,7 @@ class SoftwareHandler(ElementHandler): 'description': TextAccumulator, 'year': TextAccumulator, 'publisher': TextAccumulator, + 'notes': TextAccumulator, 'part': SoftwarePartHandler } def __init__(self, parent, **kwargs): @@ -389,9 +390,15 @@ class SoftwareHandler(ElementHandler): self.id = self.dbcurs.add_software(self.softwarelist, self.shortname, self.supported, self.description, self.year, self.publisher) if self.cloneof is not None: self.dbcurs.add_softwarecloneof(self.id, self.cloneof) + elif name == 'notes': + self.dbcurs.add_softwarenotes(self.id, handler.text) class SoftwareListHandler(ElementHandler): + CHILD_HANDLERS = { + 'notes': TextAccumulator, + 'software': SoftwareHandler } + def __init__(self, dbconn, **kwargs): super(SoftwareListHandler, self).__init__(parent=None, **kwargs) self.dbconn = dbconn @@ -419,15 +426,20 @@ class SoftwareListHandler(ElementHandler): self.dbconn.commit() def startChildElement(self, name, attrs): - if name != 'software': + if name in self.CHILD_HANDLERS: + self.setChildHandler(name, attrs, self.CHILD_HANDLERS[name](self)) + else: raise xml.sax.SAXParseException( - msg=('Expected "software" element but found "%s"' % (name, )), + msg=('Found unexpected element "%s"' % (name, )), exception=None, locator=self.locator) - self.setChildHandler(name, attrs, SoftwareHandler(self)) def endChildHandler(self, name, handler): - if name == 'software': + if name == 'notes': + dbcurs = self.dbconn.cursor() + dbcurs.add_softwarelistnotes(self.id, handler.text) + dbcurs.close() + elif name == 'software': if self.entries >= 1023: self.dbconn.commit() self.entries = 0 diff --git a/docs/release/scripts/minimaws/lib/wsgiserve.py b/docs/release/scripts/minimaws/lib/wsgiserve.py index 43d5dbc1253..1158528d954 100644 --- a/docs/release/scripts/minimaws/lib/wsgiserve.py +++ b/docs/release/scripts/minimaws/lib/wsgiserve.py @@ -661,6 +661,20 @@ class SoftwareListHandler(QueryPageHandler): unsupported=htmlescape('%d' % (softwarelist_info['unsupported'], )), unsupportedpc=htmlescape('%.1f' % (softwarelist_info['unsupported'] * 100.0 / (softwarelist_info['total'] or 1), ))).encode('utf-8') + if softwarelist_info['notes'] is not None: + yield htmltmpl.SOFTWARELIST_NOTES_PROLOGUE.substitute().encode('utf-8') + first = True + for line in softwarelist_info['notes'].strip().splitlines(): + if line: + yield (('<p>%s' if first else '<br />\n%s') % (htmlescape(line), )).encode('utf-8') + first = False + elif not first: + yield '</p>\n'.encode('utf-8') + first = True + if not first: + yield '</p>\n'.encode('utf-8') + yield htmltmpl.SOFTWARELIST_NOTES_EPILOGUE.substitute().encode('utf-8') + first = True for machine_info in self.dbcurs.get_softwarelist_machines(softwarelist_info['id']): if first: @@ -719,19 +733,35 @@ class SoftwareListHandler(QueryPageHandler): yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-clones').encode('utf-8') yield '<script>make_collapsible(document.getElementById("heading-clones"), document.getElementById("tbl-clones"));</script>\n'.encode('utf-8') + if software_info['notes'] is not None: + yield htmltmpl.SOFTWARE_NOTES_PROLOGUE.substitute().encode('utf-8') + first = True + for line in software_info['notes'].strip().splitlines(): + if line: + yield (('<p>%s' if first else '<br />\n%s') % (htmlescape(line), )).encode('utf-8') + first = False + elif not first: + yield '</p>\n'.encode('utf-8') + first = True + if not first: + yield '</p>\n'.encode('utf-8') + yield htmltmpl.SOFTWARE_NOTES_EPILOGUE.substitute().encode('utf-8') + parts = self.dbcurs.get_software_parts(software_info['id']).fetchall() first = True for id, partname, interface, part_id in parts: if first: - yield '<h2>Parts</h2>\n'.encode('utf-8') + yield htmltmpl.SOFTWARE_PARTS_PROLOGUE.substitute().encode('utf-8') first = False yield htmltmpl.SOFTWARE_PART_PROLOGUE.substitute( heading=htmlescape(('%s (%s)' % (part_id, partname)) if part_id is not None else partname), shortname=htmlescape(partname), interface=htmlescape(interface)).encode('utf-8') for name, value in self.dbcurs.get_softwarepart_features(id): - yield (' <tr><th>%s:</th><td>%s</td>\n' % (htmlescape(name), htmlescape(value))).encode('utf-8') - yield '</table>\n\n'.encode('utf-8') + yield (' <tr><th>%s:</th><td>%s</td>\n' % (htmlescape(name), htmlescape(value))).encode('utf-8') + yield ' </table>\n\n'.encode('utf-8') + if not first: + yield htmltmpl.SOFTWARE_PARTS_EPILOGUE.substitute().encode('utf-8') yield '</body>\n</html>\n'.encode('utf-8') diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 8d43705345a..fff3b94f0c8 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -1445,6 +1445,7 @@ end MAME_DIR .. "3rdparty/bgfx/src/glcontext_html5.cpp", MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp", MAME_DIR .. "3rdparty/bgfx/src/nvapi.cpp", + MAME_DIR .. "3rdparty/bgfx/src/renderer_agc.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d12.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d9.cpp", @@ -2208,7 +2209,7 @@ project "utf8proc" kind "StaticLib" defines { - "UTF8PROC_DLLEXPORT=" + "UTF8PROC_STATIC", } configuration "Debug" @@ -2222,9 +2223,6 @@ project "utf8proc" } configuration { } - defines { - "ZLIB_CONST", - } files { MAME_DIR .. "3rdparty/utf8proc/utf8proc.c" diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index 3a02f3559c1..cb898a2a4c9 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -2689,36 +2689,38 @@ end if (BUSES["RS232"]~=null) then files { + MAME_DIR .. "src/devices/bus/rs232/exorterm.cpp", + MAME_DIR .. "src/devices/bus/rs232/exorterm.h", + MAME_DIR .. "src/devices/bus/rs232/hlemouse.cpp", + MAME_DIR .. "src/devices/bus/rs232/hlemouse.h", + MAME_DIR .. "src/devices/bus/rs232/ie15.cpp", + MAME_DIR .. "src/devices/bus/rs232/ie15.h", MAME_DIR .. "src/devices/bus/rs232/keyboard.cpp", MAME_DIR .. "src/devices/bus/rs232/keyboard.h", MAME_DIR .. "src/devices/bus/rs232/loopback.cpp", MAME_DIR .. "src/devices/bus/rs232/loopback.h", + MAME_DIR .. "src/devices/bus/rs232/mboardd.cpp", + MAME_DIR .. "src/devices/bus/rs232/mboardd.h", MAME_DIR .. "src/devices/bus/rs232/null_modem.cpp", MAME_DIR .. "src/devices/bus/rs232/null_modem.h", + MAME_DIR .. "src/devices/bus/rs232/patchbox.cpp", + MAME_DIR .. "src/devices/bus/rs232/patchbox.h", MAME_DIR .. "src/devices/bus/rs232/printer.cpp", MAME_DIR .. "src/devices/bus/rs232/printer.h", - MAME_DIR .. "src/devices/bus/rs232/rs232.cpp", - MAME_DIR .. "src/devices/bus/rs232/rs232.h", MAME_DIR .. "src/devices/bus/rs232/pty.cpp", MAME_DIR .. "src/devices/bus/rs232/pty.h", - MAME_DIR .. "src/devices/bus/rs232/hlemouse.cpp", - MAME_DIR .. "src/devices/bus/rs232/hlemouse.h", + MAME_DIR .. "src/devices/bus/rs232/rs232.cpp", + MAME_DIR .. "src/devices/bus/rs232/rs232.h", + MAME_DIR .. "src/devices/bus/rs232/rs232_sync_io.cpp", + MAME_DIR .. "src/devices/bus/rs232/rs232_sync_io.h", MAME_DIR .. "src/devices/bus/rs232/sun_kbd.cpp", MAME_DIR .. "src/devices/bus/rs232/sun_kbd.h", + MAME_DIR .. "src/devices/bus/rs232/swtpc8212.cpp", + MAME_DIR .. "src/devices/bus/rs232/swtpc8212.h", MAME_DIR .. "src/devices/bus/rs232/terminal.cpp", MAME_DIR .. "src/devices/bus/rs232/terminal.h", MAME_DIR .. "src/devices/bus/rs232/xvd701.cpp", MAME_DIR .. "src/devices/bus/rs232/xvd701.h", - MAME_DIR .. "src/devices/bus/rs232/ie15.cpp", - MAME_DIR .. "src/devices/bus/rs232/ie15.h", - MAME_DIR .. "src/devices/bus/rs232/swtpc8212.cpp", - MAME_DIR .. "src/devices/bus/rs232/swtpc8212.h", - MAME_DIR .. "src/devices/bus/rs232/exorterm.cpp", - MAME_DIR .. "src/devices/bus/rs232/exorterm.h", - MAME_DIR .. "src/devices/bus/rs232/rs232_sync_io.cpp", - MAME_DIR .. "src/devices/bus/rs232/rs232_sync_io.h", - MAME_DIR .. "src/devices/bus/rs232/mboardd.cpp", - MAME_DIR .. "src/devices/bus/rs232/mboardd.h", } end @@ -2882,6 +2884,8 @@ if (BUSES["NES"]~=null) then MAME_DIR .. "src/devices/bus/nes/tengen.h", MAME_DIR .. "src/devices/bus/nes/txc.cpp", MAME_DIR .. "src/devices/bus/nes/txc.h", + MAME_DIR .. "src/devices/bus/nes/vrc_clones.cpp", + MAME_DIR .. "src/devices/bus/nes/vrc_clones.h", MAME_DIR .. "src/devices/bus/nes/waixing.cpp", MAME_DIR .. "src/devices/bus/nes/waixing.h", MAME_DIR .. "src/devices/bus/nes/zemina.cpp", diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index 0252aef5bc6..9c612457313 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -700,6 +700,8 @@ if CPUS["H8"] then MAME_DIR .. "src/devices/cpu/h8/h8_sci.h", MAME_DIR .. "src/devices/cpu/h8/h8_watchdog.cpp", MAME_DIR .. "src/devices/cpu/h8/h8_watchdog.h", + MAME_DIR .. "src/devices/cpu/h8/gt913.cpp", + MAME_DIR .. "src/devices/cpu/h8/gt913.h", } dependency { @@ -707,6 +709,7 @@ if CPUS["H8"] then { MAME_DIR .. "src/devices/cpu/h8/h8h.cpp", GEN_DIR .. "emu/cpu/h8/h8h.hxx" }, { MAME_DIR .. "src/devices/cpu/h8/h8s2000.cpp", GEN_DIR .. "emu/cpu/h8/h8s2000.hxx" }, { MAME_DIR .. "src/devices/cpu/h8/h8s2600.cpp", GEN_DIR .. "emu/cpu/h8/h8s2600.hxx" }, + { MAME_DIR .. "src/devices/cpu/h8/gt913.cpp", GEN_DIR .. "emu/cpu/h8/gt913.hxx" }, } custombuildtask { @@ -714,19 +717,22 @@ if CPUS["H8"] then { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8h.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300H source file...", PYTHON .. " $(1) $(<) s h $(@)" }}, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 source file...", PYTHON .. " $(1) $(<) s s20 $(@)" }}, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 source file...", PYTHON .. " $(1) $(<) s s26 $(@)" }}, + { MAME_DIR .. "src/devices/cpu/h8/gt913.lst" , GEN_DIR .. "emu/cpu/h8/gt913.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating GT913 source file...", PYTHON .. " $(1) $(<) s g $(@)" }}, } end if opt_tool(CPUS, "H8") then - table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8d.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300 disassembler source file...", PYTHON .. " $(1) $(<) d o $(@)" }}) - table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8hd.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300H disassembler source file...", PYTHON .. " $(1) $(<) d h $(@)" }}) - table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000d.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 disassembler source file...", PYTHON .. " $(1) $(<) d s20 $(@)" }}) - table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600d.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 disassembler source file...", PYTHON .. " $(1) $(<) d s26 $(@)" }}) + table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8d.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300 disassembler source file...", PYTHON .. " $(1) $(<) d o $(@)" }}) + table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8hd.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300H disassembler source file...", PYTHON .. " $(1) $(<) d h $(@)" }}) + table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000d.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 disassembler source file...", PYTHON .. " $(1) $(<) d s20 $(@)" }}) + table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600d.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 disassembler source file...", PYTHON .. " $(1) $(<) d s26 $(@)" }}) + table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/h8/gt913.lst" , GEN_DIR .. "emu/cpu/h8/gt913d.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating GT913 disassembler source file...", PYTHON .. " $(1) $(<) d g $(@)" }}) table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/h8/h8d.cpp", GEN_DIR .. "emu/cpu/h8/h8d.hxx" }) table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/h8/h8hd.cpp", GEN_DIR .. "emu/cpu/h8/h8hd.hxx" }) table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/h8/h8s2000d.cpp", GEN_DIR .. "emu/cpu/h8/h8s2000d.hxx" }) table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/h8/h8s2600d.cpp", GEN_DIR .. "emu/cpu/h8/h8s2600d.hxx" }) + table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/h8/gt913d.cpp", GEN_DIR .. "emu/cpu/h8/gt913d.hxx" }) table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/h8/h8d.cpp") table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/h8/h8d.h") @@ -736,6 +742,8 @@ if opt_tool(CPUS, "H8") then table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/h8/h8s2000d.h") table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/h8/h8s2600d.cpp") table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/h8/h8s2600d.h") + table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/h8/gt913d.cpp") + table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/h8/gt913d.h") end -------------------------------------------------- @@ -2701,8 +2709,12 @@ if (CPUS["Z80"]~=null or CPUS["KC80"]~=null) then MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.h", MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.cpp", MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.h", + MAME_DIR .. "src/devices/cpu/z80/ez80.cpp", + MAME_DIR .. "src/devices/cpu/z80/ez80.h", MAME_DIR .. "src/devices/cpu/z80/lz8420m.cpp", MAME_DIR .. "src/devices/cpu/z80/lz8420m.h", + MAME_DIR .. "src/devices/cpu/z80/r800.cpp", + MAME_DIR .. "src/devices/cpu/z80/r800.h", } end diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua index dd24030e72d..06b92469c25 100644 --- a/docs/release/scripts/src/emu.lua +++ b/docs/release/scripts/src/emu.lua @@ -238,6 +238,8 @@ files { MAME_DIR .. "src/emu/debug/dvmemory.h", MAME_DIR .. "src/emu/debug/dvbpoints.cpp", MAME_DIR .. "src/emu/debug/dvbpoints.h", + MAME_DIR .. "src/emu/debug/dvrpoints.cpp", + MAME_DIR .. "src/emu/debug/dvrpoints.h", MAME_DIR .. "src/emu/debug/dvwpoints.cpp", MAME_DIR .. "src/emu/debug/dvwpoints.h", MAME_DIR .. "src/emu/debug/dvstate.cpp", diff --git a/docs/release/scripts/src/lib.lua b/docs/release/scripts/src/lib.lua index fd8c5be2c27..6b1bd29e3ea 100644 --- a/docs/release/scripts/src/lib.lua +++ b/docs/release/scripts/src/lib.lua @@ -25,10 +25,14 @@ project "utils" ext_includedir("utf8proc"), } +if not _OPTIONS["with-system-utf8proc"] then + defines { + "UTF8PROC_STATIC", + } +end + files { - MAME_DIR .. "src/lib/util/bitstream.h", - MAME_DIR .. "src/lib/util/coretmpl.h", - MAME_DIR .. "src/lib/util/lrucache.h", + MAME_DIR .. "src/lib/util/abi.h", MAME_DIR .. "src/lib/util/avhuff.cpp", MAME_DIR .. "src/lib/util/avhuff.h", MAME_DIR .. "src/lib/util/aviio.cpp", @@ -36,6 +40,7 @@ project "utils" MAME_DIR .. "src/lib/util/base64.hpp", MAME_DIR .. "src/lib/util/bitmap.cpp", MAME_DIR .. "src/lib/util/bitmap.h", + MAME_DIR .. "src/lib/util/bitstream.h", MAME_DIR .. "src/lib/util/cdrom.cpp", MAME_DIR .. "src/lib/util/cdrom.h", MAME_DIR .. "src/lib/util/chd.cpp", @@ -54,6 +59,7 @@ project "utils" MAME_DIR .. "src/lib/util/corefile.h", MAME_DIR .. "src/lib/util/corestr.cpp", MAME_DIR .. "src/lib/util/corestr.h", + MAME_DIR .. "src/lib/util/coretmpl.h", MAME_DIR .. "src/lib/util/coreutil.cpp", MAME_DIR .. "src/lib/util/coreutil.h", MAME_DIR .. "src/lib/util/crypto.hpp", @@ -61,6 +67,9 @@ project "utils" MAME_DIR .. "src/lib/util/delegate.h", MAME_DIR .. "src/lib/util/disasmintf.cpp", MAME_DIR .. "src/lib/util/disasmintf.h", + MAME_DIR .. "src/lib/util/dynamicclass.cpp", + MAME_DIR .. "src/lib/util/dynamicclass.h", + MAME_DIR .. "src/lib/util/dynamicclass.ipp", MAME_DIR .. "src/lib/util/endianness.h", MAME_DIR .. "src/lib/util/flac.cpp", MAME_DIR .. "src/lib/util/flac.h", @@ -80,6 +89,7 @@ project "utils" MAME_DIR .. "src/lib/util/ioprocsvec.h", MAME_DIR .. "src/lib/util/jedparse.cpp", MAME_DIR .. "src/lib/util/jedparse.h", + MAME_DIR .. "src/lib/util/lrucache.h", MAME_DIR .. "src/lib/util/md5.cpp", MAME_DIR .. "src/lib/util/md5.h", MAME_DIR .. "src/lib/util/msdib.cpp", diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 0d28fbb5d67..1dd90ed1a59 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -1393,6 +1393,22 @@ end --------------------------------------------------- -- +--@src/devices/machine/gt913.h,MACHINES["GT913"] = true +--------------------------------------------------- + +if (MACHINES["GT913"]~=null) then + files { + MAME_DIR .. "src/devices/machine/gt913_io.cpp", + MAME_DIR .. "src/devices/machine/gt913_io.h", + MAME_DIR .. "src/devices/machine/gt913_kbd.cpp", + MAME_DIR .. "src/devices/machine/gt913_kbd.h", + MAME_DIR .. "src/devices/machine/gt913_snd.cpp", + MAME_DIR .. "src/devices/machine/gt913_snd.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/hd63450.h,MACHINES["HD63450"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua index 766909efc56..91d60cf6587 100644 --- a/docs/release/scripts/src/mame/frontend.lua +++ b/docs/release/scripts/src/mame/frontend.lua @@ -159,13 +159,14 @@ files { MAME_DIR .. "src/frontend/mame/ui/slotopt.h", MAME_DIR .. "src/frontend/mame/ui/sndmenu.cpp", MAME_DIR .. "src/frontend/mame/ui/sndmenu.h", - MAME_DIR .. "src/frontend/mame/ui/starimg.ipp", MAME_DIR .. "src/frontend/mame/ui/state.cpp", MAME_DIR .. "src/frontend/mame/ui/state.h", MAME_DIR .. "src/frontend/mame/ui/submenu.cpp", MAME_DIR .. "src/frontend/mame/ui/submenu.h", MAME_DIR .. "src/frontend/mame/ui/swlist.cpp", MAME_DIR .. "src/frontend/mame/ui/swlist.h", + MAME_DIR .. "src/frontend/mame/ui/systemlist.cpp", + MAME_DIR .. "src/frontend/mame/ui/systemlist.h", MAME_DIR .. "src/frontend/mame/ui/tapectrl.cpp", MAME_DIR .. "src/frontend/mame/ui/tapectrl.h", MAME_DIR .. "src/frontend/mame/ui/text.cpp", diff --git a/docs/release/scripts/src/osd/mac.lua b/docs/release/scripts/src/osd/mac.lua index 8a57b4ab4a3..4b3967b8c3d 100644 --- a/docs/release/scripts/src/osd/mac.lua +++ b/docs/release/scripts/src/osd/mac.lua @@ -108,6 +108,8 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.h", MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.mm", MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.h", + MAME_DIR .. "src/osd/modules/debugger/osx/registerpointsview.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/registerpointsview.h", MAME_DIR .. "src/osd/modules/debugger/osx/registersview.mm", MAME_DIR .. "src/osd/modules/debugger/osx/registersview.h", MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.mm", diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index 31dafbbeb20..fc8fab036d4 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -420,6 +420,8 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.h", MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.mm", MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.h", + MAME_DIR .. "src/osd/modules/debugger/osx/registerpointsview.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/registerpointsview.h", MAME_DIR .. "src/osd/modules/debugger/osx/registersview.mm", MAME_DIR .. "src/osd/modules/debugger/osx/registersview.h", MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.mm", diff --git a/docs/release/scripts/target/hbmame/hbmame.lua b/docs/release/scripts/target/hbmame/hbmame.lua index f825d886af8..e6d3c67f597 100644 --- a/docs/release/scripts/target/hbmame/hbmame.lua +++ b/docs/release/scripts/target/hbmame/hbmame.lua @@ -357,12 +357,6 @@ createHBMAMEProjects(_target, _subtarget, "atari") files { MAME_DIR .. "src/hbmame/drivers/asteroid.cpp", MAME_DIR .. "src/mame/machine/asteroid.cpp", - MAME_DIR .. "src/hbmame/drivers/atarig42.cpp", - MAME_DIR .. "src/mame/video/atarig42.cpp", - MAME_DIR .. "src/mame/machine/atariscom.cpp", - MAME_DIR .. "src/mame/machine/asic65.cpp", - MAME_DIR .. "src/mame/video/atarirle.cpp", - MAME_DIR .. "src/mame/audio/atarijsa.cpp", MAME_DIR .. "src/hbmame/drivers/atarisy1.cpp", MAME_DIR .. "src/mame/video/atarisy1.cpp", MAME_DIR .. "src/mame/audio/asteroid.cpp", @@ -472,7 +466,6 @@ files { MAME_DIR .. "src/mame/audio/decobsmt.cpp", -- deco32 MAME_DIR .. "src/mame/video/deco_ace.cpp", -- deco32 MAME_DIR .. "src/mame/machine/deco156.cpp", -- deco32 - MAME_DIR .. "src/mame/video/deco_zoomspr.cpp", -- deco32 MAME_DIR .. "src/hbmame/drivers/rohga.cpp", MAME_DIR .. "src/mame/video/rohga.cpp", MAME_DIR .. "src/mame/video/decocomn.cpp", -- rohga @@ -962,7 +955,6 @@ files { MAME_DIR .. "src/mame/machine/arkanoid.cpp", MAME_DIR .. "src/mame/video/arkanoid.cpp", MAME_DIR .. "src/hbmame/drivers/asuka.cpp", - MAME_DIR .. "src/mame/video/asuka.cpp", MAME_DIR .. "src/hbmame/drivers/bublbobl.cpp", MAME_DIR .. "src/mame/machine/bublbobl.cpp", MAME_DIR .. "src/mame/video/bublbobl.cpp", @@ -1097,8 +1089,6 @@ files { MAME_DIR .. "src/hbmame/drivers/schaser.cpp", MAME_DIR .. "src/hbmame/drivers/spacmiss.cpp", MAME_DIR .. "src/hbmame/drivers/monaco.cpp", --- MAME_DIR .. "src/hbmame/drivers/atari_s1.cpp", --- MAME_DIR .. "src/mame/machine/genpin.cpp", MAME_DIR .. "src/hbmame/drivers/kyugo.cpp", MAME_DIR .. "src/mame/video/kyugo.cpp", MAME_DIR .. "src/hbmame/drivers/mcatadv.cpp", diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index 1cdc722090a..f339007eeb0 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -1754,8 +1754,6 @@ files { MAME_DIR .. "src/mame/video/dvi.cpp", MAME_DIR .. "src/mame/video/deco_ace.cpp", MAME_DIR .. "src/mame/video/deco_ace.h", - MAME_DIR .. "src/mame/video/deco_zoomspr.cpp", - MAME_DIR .. "src/mame/video/deco_zoomspr.h", MAME_DIR .. "src/mame/drivers/decocass.cpp", MAME_DIR .. "src/mame/includes/decocass.h", MAME_DIR .. "src/mame/machine/decocass.cpp", @@ -1764,8 +1762,6 @@ files { MAME_DIR .. "src/mame/video/decocass.cpp", MAME_DIR .. "src/mame/drivers/deshoros.cpp", MAME_DIR .. "src/mame/drivers/dietgo.cpp", - MAME_DIR .. "src/mame/includes/dietgo.h", - MAME_DIR .. "src/mame/video/dietgo.cpp", MAME_DIR .. "src/mame/drivers/dreambal.cpp", MAME_DIR .. "src/mame/drivers/exprraid.cpp", MAME_DIR .. "src/mame/includes/exprraid.h", @@ -1776,8 +1772,6 @@ files { MAME_DIR .. "src/mame/video/firetrap.cpp", MAME_DIR .. "src/mame/drivers/funkyjet.cpp", MAME_DIR .. "src/mame/drivers/karnov.cpp", - MAME_DIR .. "src/mame/includes/karnov.h", - MAME_DIR .. "src/mame/video/karnov.cpp", MAME_DIR .. "src/mame/drivers/kchamp.cpp", MAME_DIR .. "src/mame/includes/kchamp.h", MAME_DIR .. "src/mame/video/kchamp.cpp", @@ -3634,6 +3628,7 @@ files { MAME_DIR .. "src/mame/video/segaybd.cpp", MAME_DIR .. "src/mame/includes/segaipt.h", MAME_DIR .. "src/mame/drivers/sg1000a.cpp", + MAME_DIR .. "src/mame/drivers/speedbsk.cpp", MAME_DIR .. "src/mame/drivers/stactics.cpp", MAME_DIR .. "src/mame/includes/stactics.h", MAME_DIR .. "src/mame/video/stactics.cpp", @@ -4006,8 +4001,6 @@ files { MAME_DIR .. "src/mame/includes/ashnojoe.h", MAME_DIR .. "src/mame/video/ashnojoe.cpp", MAME_DIR .. "src/mame/drivers/asuka.cpp", - MAME_DIR .. "src/mame/includes/asuka.h", - MAME_DIR .. "src/mame/video/asuka.cpp", MAME_DIR .. "src/mame/drivers/bigevglf.cpp", MAME_DIR .. "src/mame/includes/bigevglf.h", MAME_DIR .. "src/mame/video/bigevglf.cpp", diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index 2a5405dfb74..580e9460a3f 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -530,6 +530,7 @@ MACHINES["ER2055"] = true MACHINES["EXORTERM"] = true MACHINES["F3853"] = true MACHINES["F4702"] = true +MACHINES["GT913"] = true MACHINES["HD63450"] = true MACHINES["HD64610"] = true MACHINES["HP_DC100_TAPE"] = true @@ -1345,6 +1346,7 @@ function linkProjects_mame_mess(_target, _subtarget) "olivetti", "olympia", "omnibyte", + "omron", "openuni", "orion", "osborne", @@ -2023,6 +2025,7 @@ files { MAME_DIR .. "src/mame/drivers/fp6000.cpp", MAME_DIR .. "src/mame/machine/fp6000_kbd.cpp", MAME_DIR .. "src/mame/machine/fp6000_kbd.h", + MAME_DIR .. "src/mame/drivers/ctk551.cpp", MAME_DIR .. "src/mame/drivers/ht6000.cpp", MAME_DIR .. "src/mame/drivers/pb1000.cpp", MAME_DIR .. "src/mame/drivers/pv1000.cpp", @@ -3279,6 +3282,11 @@ files { MAME_DIR .. "src/mame/includes/ob68k1a.h", } +createMESSProjects(_target, _subtarget, "omron") +files { + MAME_DIR .. "src/mame/drivers/luna_68k.cpp", +} + createMESSProjects(_target, _subtarget, "openuni") files { MAME_DIR .. "src/mame/drivers/hektor.cpp", |