Skip to content

Improve properties.mako.rs file structure #10586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
perlun wants to merge 7 commits into from
Closed

Improve properties.mako.rs file structure #10586

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd8b550
Added a TemplateLookup, so we can use %include.
perlun Apr 17, 2016
43d051f
Step 1: Convert new_style_struct into a proper %def function.
perlun Apr 17, 2016
29202c4
Extracted out a bunch of the style structs into separate files.
perlun Apr 18, 2016
4ed43e5
Fixed geckolib to compile again with the changes in the style Mako file.
perlun Apr 18, 2016
f40678b
Use absolute includes, to get it working w/ list_properties.py
perlun Apr 18, 2016
9563de8
Added a TemplateLookup.
perlun Apr 18, 2016
83716e4
Sorted out tidiness issues.
perlun Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion components/style/generate_properties_rs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
import sys

from mako import exceptions
from mako.lookup import TemplateLookup
from mako.template import Template

try:
lookup = TemplateLookup(directories=['.'])
template = Template(open(os.environ['TEMPLATE'], 'rb').read(),
input_encoding='utf8')
input_encoding='utf8',
lookup=lookup)
print(template.render(PRODUCT=os.environ['PRODUCT']).encode('utf8'))
except:
sys.stderr.write(exceptions.text_error_template().render().encode('utf8'))
Expand Down
7 changes: 6 additions & 1 deletion components/style/list_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@

style = os.path.dirname(__file__)
sys.path.insert(0, os.path.join(style, "Mako-0.9.1.zip"))

from mako.lookup import TemplateLookup
from mako.template import Template

template = Template(filename=os.path.join(style, "properties.mako.rs"), input_encoding='utf8')
lookup = TemplateLookup(directories=[style])
template = Template(filename=os.path.join(style, "properties.mako.rs"),
input_encoding='utf8',
lookup=lookup)
Copy link
Contributor Author

@perlun perlun Apr 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are needed to be able to use %include. It was significantly harder to be able to use it from list_properties.py, so in that sense your (Simon) change in the other branch where you refactor list_properties.py away is kind of nice.

template.render(PRODUCT='servo')
properties = dict(
(p.name, {
Expand Down
Loading