Prepare related files to make it easier to split up the Mako template #10749

SimonSapin · 2016-04-20T13:39:14Z

This change is


        Merge list_properties.py into build_properties_rs.py


        Move Mako-related files into a new sub-directory.

There’s gonna be more of them.


        Re-run the geckolib build script if components/style/properties changes.


        Extract some Python code from properties.mako.rs into a separate file.

highfive · 2016-04-20T13:39:17Z

Heads up! This PR modifies the following files:

@bholley: components/style/generate_properties_rs.py, components/style/properties.html.mako, components/style/properties/data.py, components/style/build.rs, components/style/properties.mako.rs, components/style/properties/build.py, components/style/Mako-0.9.1.zip, components/style/list_properties.py, components/style/properties/Mako-0.9.1.zip, components/style/properties/properties.mako.rs, components/style/properties/properties.html.mako
@wafflespeanut: python/servo/testing_commands.py

highfive · 2016-04-20T13:39:18Z

Warning

These commits modify unsafe code. Please review it carefully!
These commits modify style code, but no tests are modified. Please consider adding a test!


        Be sligthly more verbose about css-properties.json in test-unit

nox · 2016-04-20T13:53:34Z

Looks fine to me.

@bors-servo r+

Reviewed 5 of 6 files at r1, 12 of 12 files at r2, 1 of 1 files at r3, 6 of 6 files at r4, 1 of 1 files at r5.
Review status: all files reviewed at latest revision, 1 unresolved discussion.

components/style/build.rs, line 31 [r1] (raw file):
Nit: Result::unwrap_or_else exists too, but shrug.

Comments from Reviewable

bors-servo · 2016-04-20T13:53:35Z

📌 Commit bf8edd1 has been approved by nox

SimonSapin · 2016-04-20T13:57:16Z

Review status: all files reviewed at latest revision, 1 unresolved discussion.

components/style/build.rs, line 31 [r1] (raw file):
That one wants a callable that takes the error value as a parameter.

Comments from Reviewable

bors-servo · 2016-04-20T14:56:28Z

⌛ Testing commit bf8edd1 with merge 572d828...


        Auto merge of #10749 - servo:split-mako, r=nox

@nox

Prepare related files to make it easier to split up the Mako template #10586 (comment) r? @nox  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10749)

bors-servo · 2016-04-20T15:10:23Z

💔 Test failed - linux-dev


        Tidy

SimonSapin · 2016-04-20T15:26:15Z

@bors-servo r=nox

(self-approving the tidy commit)

bors-servo · 2016-04-20T15:26:30Z

📌 Commit 515c5ef has been approved by nox

bors-servo · 2016-04-20T19:58:18Z

⌛ Testing commit 515c5ef with merge f3a2d34...


        Auto merge of #10749 - servo:split-mako, r=nox

@nox

Prepare related files to make it easier to split up the Mako template #10586 (comment) r? @nox  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10749)

bors-servo · 2016-04-20T20:44:40Z

💔 Test failed - linux-rel


        Auto merge of #10749 - servo:split-mako, r=nox

@nox

Prepare related files to make it easier to split up the Mako template #10586 (comment) r? @nox  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10749)

bors-servo · 2016-04-21T01:27:11Z

💔 Test failed - linux-rel

jdm · 2016-04-21T01:28:43Z

@bors-servo: retry
#10753

bors-servo · 2016-04-21T02:16:38Z

⚡ Previous build results for android, arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css are reusable. Rebuilding only linux-rel, mac-rel-wpt...

bors-servo · 2016-04-21T03:07:19Z

💔 Test failed - mac-rel-wpt

wafflespeanut · 2016-04-21T04:06:11Z

@bors-servo retry

#10656 #10772

bors-servo · 2016-04-21T05:08:10Z

⌛ Testing commit 515c5ef with merge 3bfa4cc...


        Auto merge of #10749 - servo:split-mako, r=nox

@nox

Prepare related files to make it easier to split up the Mako template #10586 (comment) r? @nox  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10749)

perlun · 2016-04-21T05:25:00Z

Gha, I hate those intermittent errors. 😢

bors-servo · 2016-04-21T05:54:13Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt


        Improve properties.mako.rs file structure, take 2

This is a new attempt of servo#10586, after Simon Sapin's great cleanups in servo#10749 has landed. I have adjusted the changes to the new structure that was introduced, and also only done a few of the longhand ones. Will certainly continue on this as soon as we have a basic agreement that this style is reasonable.


        Improve properties.mako.rs file structure, take 2

This is a new attempt of servo#10586, after Simon Sapin's great cleanups in servo#10749 has landed. I have adjusted the changes to the new structure that was introduced, and also only done a few of the longhand ones. Will certainly continue on this as soon as we have a basic agreement that this style is reasonable.


        Auto merge of #10774 - perlun:improve-mako-file-structure-v2, r=Simon…

…Sapin Improve properties.mako.rs file structure, take 2 This is a new attempt of #10586, after Simon Sapin's great cleanups in #10749 has landed. I have adjusted the changes to the new structure that was introduced, and also only done a few of the longhand ones. Will certainly continue on this as soon as we have a basic agreement that this style is reasonable.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10774)


        Improve properties.mako.rs file structure, take 2

This is a new attempt of servo#10586, after Simon Sapin's great cleanups in servo#10749 has landed. I have adjusted the changes to the new structure that was introduced, and also only done a few of the longhand ones. Will certainly continue on this as soon as we have a basic agreement that this style is reasonable.


        Remove obsolete geckolib/generate_properties_rs.py

It is unused since #10749


        Remove obsolete geckolib/generate_properties_rs.py

It is unused since #10749

SimonSapin added 4 commits Apr 18, 2016

Merge list_properties.py into build_properties_rs.py

b7eb720

Move Mako-related files into a new sub-directory.

7787b21

There’s gonna be more of them.

Re-run the geckolib build script if components/style/properties changes.

ff5478c

Extract some Python code from properties.mako.rs into a separate file.

Loading status checks…

2d8c17e

highfive assigned nox Apr 20, 2016

highfive added the S-awaiting-review label Apr 20, 2016

Be sligthly more verbose about css-properties.json in test-unit

Loading status checks…

bf8edd1

highfive added S-awaiting-merge and removed S-awaiting-review labels Apr 20, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels Apr 20, 2016

Tidy

Loading status checks…

515c5ef

highfive added S-awaiting-review and removed S-tests-failed labels Apr 20, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Apr 20, 2016

highfive removed the S-awaiting-merge label Apr 20, 2016

highfive added the S-awaiting-merge label Apr 21, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels Apr 21, 2016

highfive added the S-tests-failed label Apr 21, 2016

highfive added S-awaiting-merge and removed S-tests-failed labels Apr 21, 2016

bors-servo merged commit 515c5ef into master Apr 21, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Apr 21, 2016

This was referenced Apr 21, 2016

Adding sync method to update atrr from inline style updates #9410

Closed

Implement enough of geckolib to cascade the first node #10697

Merged

SimonSapin deleted the split-mako branch Apr 21, 2016

perlun mentioned this pull request Apr 21, 2016

Improve properties.mako.rs file structure, take 2 #10774

Merged

jdm mentioned this pull request Apr 21, 2016

Appveyor build is broken #10789

Closed

jdm mentioned this pull request Apr 21, 2016

Add a method for dumping profiles as self-contained HTML w/ timeline visualization #10694

Merged

SimonSapin added a commit that referenced this pull request Jul 19, 2016

Remove obsolete geckolib/generate_properties_rs.py

80da9a4

It is unused since #10749

SimonSapin added a commit that referenced this pull request Jul 20, 2016

Remove obsolete geckolib/generate_properties_rs.py

e945d11

It is unused since #10749

servo / servo

Prepare related files to make it easier to split up the Mako template #10749

Prepare related files to make it easier to split up the Mako template #10749

SimonSapin commented Apr 20, 2016

highfive commented Apr 20, 2016

highfive commented Apr 20, 2016

nox commented Apr 20, 2016

bors-servo commented Apr 20, 2016

SimonSapin commented Apr 20, 2016

bors-servo commented Apr 20, 2016

bors-servo commented Apr 20, 2016

SimonSapin commented Apr 20, 2016

bors-servo commented Apr 20, 2016

bors-servo commented Apr 20, 2016

bors-servo commented Apr 20, 2016

bors-servo commented Apr 21, 2016

jdm commented Apr 21, 2016

bors-servo commented Apr 21, 2016

bors-servo commented Apr 21, 2016

wafflespeanut commented Apr 21, 2016

bors-servo commented Apr 21, 2016

perlun commented Apr 21, 2016

bors-servo commented Apr 21, 2016

servo / servo

Join GitHub today

Prepare related files to make it easier to split up the Mako template #10749

Prepare related files to make it easier to split up the Mako template #10749

Conversation

SimonSapin commented Apr 20, 2016

highfive commented Apr 20, 2016

highfive commented Apr 20, 2016

nox commented Apr 20, 2016

bors-servo commented Apr 20, 2016

SimonSapin commented Apr 20, 2016

bors-servo commented Apr 20, 2016

bors-servo commented Apr 20, 2016

SimonSapin commented Apr 20, 2016

bors-servo commented Apr 20, 2016

bors-servo commented Apr 20, 2016

bors-servo commented Apr 20, 2016

bors-servo commented Apr 21, 2016

jdm commented Apr 21, 2016

bors-servo commented Apr 21, 2016

bors-servo commented Apr 21, 2016

wafflespeanut commented Apr 21, 2016

bors-servo commented Apr 21, 2016

perlun commented Apr 21, 2016

bors-servo commented Apr 21, 2016