diff --git a/components/style/build.rs b/components/style/build.rs index 4f7eaf76013..c33d3aaf6cb 100644 --- a/components/style/build.rs +++ b/components/style/build.rs @@ -43,19 +43,7 @@ fn main() { .env("PYTHONPATH", &mako) .env("TEMPLATE", &template) .env("PRODUCT", product) - .arg("-c") - .arg(r#" -import os -import sys -from mako.template import Template -from mako import exceptions -try: - template = Template(open(os.environ['TEMPLATE'], 'rb').read(), input_encoding='utf8') - print(template.render(PRODUCT=os.environ['PRODUCT']).encode('utf8')) -except: - sys.stderr.write(exceptions.text_error_template().render().encode('utf8')) - sys.exit(1) -"#) + .arg("generate_properties_rs.py") .stderr(Stdio::inherit()) .output() .unwrap(); diff --git a/components/style/generate_properties_rs.py b/components/style/generate_properties_rs.py new file mode 100644 index 00000000000..eceae10c28c --- /dev/null +++ b/components/style/generate_properties_rs.py @@ -0,0 +1,17 @@ +# 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/. + +import os +import sys + +from mako import exceptions +from mako.template import Template + +try: + template = Template(open(os.environ['TEMPLATE'], 'rb').read(), + input_encoding='utf8') + print(template.render(PRODUCT=os.environ['PRODUCT']).encode('utf8')) +except: + sys.stderr.write(exceptions.text_error_template().render().encode('utf8')) + sys.exit(1) diff --git a/ports/geckolib/build.rs b/ports/geckolib/build.rs index b9f1a4d3676..0e19e988884 100644 --- a/ports/geckolib/build.rs +++ b/ports/geckolib/build.rs @@ -50,25 +50,7 @@ fn main() { .env("PYTHONPATH", &mako) .env("STYLE_TEMPLATE", &style_template) .env("GECKOLIB_TEMPLATE", &geckolib_template) - .arg("-c") - .arg(r#" -import json -import os -import sys -from mako.template import Template -from mako import exceptions -try: - style_template = Template(filename=os.environ['STYLE_TEMPLATE'], input_encoding='utf8') - style_template.render(PRODUCT='gecko') - - geckolib_template = Template(filename=os.environ['GECKOLIB_TEMPLATE'], input_encoding='utf8') - output = geckolib_template.render(STYLE_STRUCTS = style_template.module.STYLE_STRUCTS, - to_rust_ident = style_template.module.to_rust_ident) - print(output.encode('utf8')) -except: - sys.stderr.write(exceptions.text_error_template().render().encode('utf8')) - sys.exit(1) -"#) + .arg("ports/geckolib/generate_properties_rs.py") .stderr(Stdio::inherit()) .output() .unwrap(); diff --git a/ports/geckolib/generate_properties_rs.py b/ports/geckolib/generate_properties_rs.py new file mode 100644 index 00000000000..1dc9824540d --- /dev/null +++ b/ports/geckolib/generate_properties_rs.py @@ -0,0 +1,22 @@ +# 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/. + +import os +import sys + +from mako import exceptions +from mako.template import Template + +try: + style_template = Template(filename=os.environ['STYLE_TEMPLATE'], + input_encoding='utf8') + style_template.render(PRODUCT='gecko') + + geckolib_template = Template(filename=os.environ['GECKOLIB_TEMPLATE'], input_encoding='utf8') + output = geckolib_template.render(STYLE_STRUCTS=style_template.module.STYLE_STRUCTS, + to_rust_ident=style_template.module.to_rust_ident) + print(output.encode('utf8')) +except: + sys.stderr.write(exceptions.text_error_template().render().encode('utf8')) + sys.exit(1)