From 8792aa7fc0630927302b2039698051f7e01fc190 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Wed, 2 Sep 2015 15:16:44 -0400 Subject: Allow 'script' component to enter a 'built' state After this pull request merged: https://github.com/servo/servo/pull/7209 the 'script' component would never enter a 'built' state. In other words, if one calls `mach build`, lets it complete, then calls `mach build` again, the 'script' component would rebuild even though we supposedly just built it. This was due to the `ParserResults.pkl` getting placed in the `components/script` directory instead of the output directory, causing cargo to think that there were unbuilt files. --- components/script/dom/bindings/codegen/BindingGen.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'components/script/dom/bindings/codegen/BindingGen.py') diff --git a/components/script/dom/bindings/codegen/BindingGen.py b/components/script/dom/bindings/codegen/BindingGen.py index 810f52db566..0649db6f1f9 100644 --- a/components/script/dom/bindings/codegen/BindingGen.py +++ b/components/script/dom/bindings/codegen/BindingGen.py @@ -26,20 +26,22 @@ def generate_binding_rs(config, outputprefix, webidlfile): def main(): # Parse arguments. from optparse import OptionParser - usagestring = "usage: %prog configFile outputPrefix webIDLFile" + usagestring = "usage: %prog configFile outputdir outputPrefix webIDLFile" o = OptionParser(usage=usagestring) o.add_option("--verbose-errors", action='store_true', default=False, help="When an error happens, display the Python traceback.") (options, args) = o.parse_args() - if len(args) != 3: + if len(args) != 4: o.error(usagestring) configFile = os.path.normpath(args[0]) - outputPrefix = args[1] - webIDLFile = os.path.normpath(args[2]) + outputdir = args[1] + outputPrefix = args[2] + webIDLFile = os.path.normpath(args[3]) # Load the parsing results - with open('ParserResults.pkl', 'rb') as f: + resultsPath = os.path.join(outputdir, 'ParserResults.pkl') + with open(resultsPath, 'rb') as f: parserData = cPickle.load(f) # Create the configuration data. -- cgit v1.2.3