Auto merge of #7209 - frewsxcv:codegen-build-cleanup, r=metajack

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.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7209)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-09-01 13:53:49 -06:00
commit 493da96cae
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] 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)
@ -59,22 +60,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()