Cleanup/refactor build scripts for DOM codegen

Prior to this commit, the script codegen makefile relied on an
intermediary pythonpath.py file that handled python dependencies and
incorporated a couple hacks to get the codegen building working. This
commit removes that intermediary file and attempts to make the script
codegen build process cleaner.
This commit is contained in:
Corey Farwell 2015-08-14 00:24:38 -04:00
parent ad02092b12
commit 447fbdcb49
3 changed files with 27 additions and 89 deletions

View file

@ -28,7 +28,7 @@ def generate_file(config, name, filename):
def main():
# Parse arguments.
from optparse import OptionParser
usageString = "usage: %prog [options] configFile webidldir [files]"
usageString = "usage: %prog [options] configFile outputdir webidldir [files]"
o = OptionParser(usage=usageString)
o.add_option("--cachedir", dest='cachedir', default=None,
help="Directory in which to cache lex/parse tables.")
@ -40,8 +40,9 @@ def main():
o.error(usageString)
configFile = args[0]
baseDir = args[1]
fileList = args[2:]
outputdir = args[1]
baseDir = args[2]
fileList = args[3:]
# Parse the WebIDL.
parser = WebIDL.Parser(options.cachedir)
@ -61,22 +62,17 @@ def main():
# Load the configuration.
config = Configuration(configFile, parserResults)
# Generate the prototype list.
generate_file(config, 'PrototypeList', 'PrototypeList.rs')
to_generate = [
('PrototypeList', 'PrototypeList.rs'),
('RegisterBindings', 'RegisterBindings.rs'),
('InterfaceTypes', 'InterfaceTypes.rs'),
('InheritTypes', 'InheritTypes.rs'),
('Bindings', 'Bindings/mod.rs'),
('UnionTypes', 'UnionTypes.rs'),
]
# Generate the common code.
generate_file(config, 'RegisterBindings', 'RegisterBindings.rs')
# Generate the type list.
generate_file(config, 'InterfaceTypes', 'InterfaceTypes.rs')
# Generate the type list.
generate_file(config, 'InheritTypes', 'InheritTypes.rs')
# Generate the module declarations.
generate_file(config, 'Bindings', 'Bindings/mod.rs')
generate_file(config, 'UnionTypes', 'UnionTypes.rs')
for name, filename in to_generate:
generate_file(config, name, os.path.join(outputdir, filename))
if __name__ == '__main__':
main()

View file

@ -1,61 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
"""
Run a python script, adding extra directories to the python path.
"""
def main(args):
def usage():
print >>sys.stderr, "pythonpath.py -I directory script.py [args...]"
sys.exit(150)
paths = []
while True:
try:
arg = args[0]
except IndexError:
usage()
if arg == '-I':
args.pop(0)
try:
path = args.pop(0)
except IndexError:
usage()
paths.append(os.path.abspath(path))
continue
if arg.startswith('-I'):
paths.append(os.path.abspath(args.pop(0)[2:]))
continue
if arg.startswith('-D'):
os.chdir(args.pop(0)[2:])
continue
break
script = args[0]
sys.path[0:0] = [os.path.abspath(os.path.dirname(script))] + paths
sys.argv = args
sys.argc = len(args)
frozenglobals['__name__'] = '__main__'
frozenglobals['__file__'] = script
execfile(script, frozenglobals)
# Freeze scope here ... why this makes things work I have no idea ...
frozenglobals = globals()
import sys
import os
if __name__ == '__main__':
main(sys.argv[1:])