1164580 - Use #slashslash preprocessor directive instead of sed for ua-update.json.in

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::Build, defect)

Description

[Mike Taylor [:miketaylr]]

See https://bugzilla.mozilla.org/show_bug.cgi?id=1162099#c14.

Basically, we can remove the invocation to sed and let the preprocessor do the (same) work here.

Comment 1

[Mike Taylor [:miketaylr]]

Attachment: 1164580-Preprocess-ua-update.json-via-slashslash.patch

So it took more than a few days to get a working local build environment, but here we go.

Ricky, can you review this?

For context, we're using the same slashslash filter to remove comments from ua-update.json in Fennec (with thumbs up from gps) and want to do the same thing here for consistency.

Comment 2

[Mike Taylor [:miketaylr]]

Note: I've verified this does what we want locally, with files preprocessed and in the right place. I'll run it through Try once it gets r+ to be sure nothing unexpected explodes.

mike@b2g-dev:~/B2G$ find . -name ua-update.json
./gaia/b2g_sdk/39.0a1-2015-03-05-16-02-02/b2g/ua-update.json
./backup-flame/system/b2g/ua-update.json
./objdir-gecko/dist/b2g/ua-update.json
./objdir-gecko/dist/bin/ua-update.json
./objdir-gecko/b2g/app/ua-update.json
./out/target/product/flame/system/b2g/ua-update.json

Comment 3

[Ricky Chien [:rickychien] (inactive)]

Comment on attachment 8609540 [details] [diff] [review]
1164580-Preprocess-ua-update.json-via-slashslash.patch

It seems that B2G build patch doesn't belong to Gaia:build, I think mwu is the best  reviewer for this.

Comment 4

[Mike Taylor [:miketaylr]]

Thanks Ricky and Michael.

Comment 5

[[:fabrice] Fabrice Desré]

Comment on attachment 8609540 [details] [diff] [review]
1164580-Preprocess-ua-update.json-via-slashslash.patch

Review of attachment 8609540 [details] [diff] [review]:
-----------------------------------------------------------------

lgtm, thanks!

Comment 6

[Mike Taylor [:miketaylr]]

Attachment: 1164580-Preprocess-ua-update.json-via-slashslash.patch

Thanks! Updated commit message with r=fabrice.

https://treeherder.mozilla.org/#/jobs?repo=try&revision=dc0ea05e3e08

Comment 7

[Mike Taylor [:miketaylr]]

OK, try looks good. -> checkin-needed.

Comment 8

[Pulsebot]

https://hg.mozilla.org/integration/b2g-inbound/rev/f29008cd1e01

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/f29008cd1e01