diff options
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/bindings/codegen/GlobalGen.py | 34 | ||||
| -rw-r--r-- | components/script/dom/bindings/codegen/pythonpath.py | 61 | ||||
| -rw-r--r-- | components/script/makefile.cargo | 23 |
3 files changed, 28 insertions, 90 deletions
diff --git a/components/script/dom/bindings/codegen/GlobalGen.py b/components/script/dom/bindings/codegen/GlobalGen.py index b3ed1e25b12..537883fae57 100644 --- a/components/script/dom/bindings/codegen/GlobalGen.py +++ b/components/script/dom/bindings/codegen/GlobalGen.py @@ -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') - - # 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') + to_generate = [ + ('PrototypeList', 'PrototypeList.rs'), + ('RegisterBindings', 'RegisterBindings.rs'), + ('InterfaceTypes', 'InterfaceTypes.rs'), + ('InheritTypes', 'InheritTypes.rs'), + ('Bindings', 'Bindings/mod.rs'), + ('UnionTypes', 'UnionTypes.rs'), + ] + + for name, filename in to_generate: + generate_file(config, name, os.path.join(outputdir, filename)) if __name__ == '__main__': main() diff --git a/components/script/dom/bindings/codegen/pythonpath.py b/components/script/dom/bindings/codegen/pythonpath.py deleted file mode 100644 index 793089551b5..00000000000 --- a/components/script/dom/bindings/codegen/pythonpath.py +++ /dev/null @@ -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:]) diff --git a/components/script/makefile.cargo b/components/script/makefile.cargo index 9fc604382fc..fbc8533ee57 100644 --- a/components/script/makefile.cargo +++ b/components/script/makefile.cargo @@ -10,6 +10,8 @@ WEBIDLS = $(call rwildcard,$(WEBIDLS_SRC),*.webidl) BINDINGS = $(patsubst %.webidl,%Binding.rs,$(WEBIDLS)) AUTOGEN_SRC = $(foreach var,$(BINDINGS),$(subst $(WEBIDLS_SRC),$(OUT_DIR)/Bindings,$(var))) +export PYTHONPATH := $(BINDINGS_SRC)/parser:$(BINDINGS_SRC)/ply:$(PYTHONPATH) + CACHE_DIR = $(OUT_DIR)/_cache bindinggen_dependencies := $(addprefix $(BINDINGS_SRC)/,BindingGen.py Bindings.conf Configuration.py CodegenRust.py parser/WebIDL.py) $(OUT_DIR)/ParserResults.pkl $(OUT_DIR)/Bindings/.done @@ -28,18 +30,19 @@ $(CACHE_DIR)/.done: touch $@ $(OUT_DIR)/ParserResults.pkl: $(globalgen_dependencies) $(WEBIDLS) - $(PYTHON) -B $(BINDINGS_SRC)/pythonpath.py \ - -I$(BINDINGS_SRC)/parser -I$(BINDINGS_SRC)/ply \ - -D$(OUT_DIR) \ - $(BINDINGS_SRC)/GlobalGen.py $(BINDINGS_SRC)/Bindings.conf . \ - --cachedir=$(CACHE_DIR) \ - $(WEBIDLS) + $(PYTHON) \ + $(BINDINGS_SRC)/GlobalGen.py \ + --cachedir=$(CACHE_DIR) \ + $(BINDINGS_SRC)/Bindings.conf \ + $(OUT_DIR) \ + . \ + $(WEBIDLS) $(AUTOGEN_SRC): $(OUT_DIR)/Bindings/%Binding.rs: $(bindinggen_dependencies) \ $(addprefix $(WEBIDLS_SRC)/,%.webidl) - $(PYTHON) -B $(BINDINGS_SRC)/pythonpath.py \ - -I$(BINDINGS_SRC)/parser -I$(BINDINGS_SRC)/ply \ - -D$(OUT_DIR) \ + $(PYTHON) \ $(BINDINGS_SRC)/BindingGen.py \ - $(BINDINGS_SRC)/Bindings.conf Bindings/$*Binding $(addprefix $(WEBIDLS_SRC)/,$*.webidl) + $(BINDINGS_SRC)/Bindings.conf \ + $(OUT_DIR)/Bindings/$*Binding \ + $(addprefix $(WEBIDLS_SRC)/,$*.webidl) touch $@ |