Closed Bug 1219147 Opened 4 years ago Closed 4 years ago

Move resource chrome.manifest line for webapprt to jar.mn

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(firefox45 fixed)

RESOLVED FIXED
mozilla45
Tracking Status
firefox45 --- fixed

People

(Reporter: glandium, Assigned: glandium)

Details

Attachments

(2 files, 1 obsolete file)

No description provided.
Assignee: nobody → mh+mozilla
Attachment #8679848 - Flags: review?(mshal)
Attachment #8679848 - Attachment is obsolete: true
Attachment #8679848 - Flags: review?(mshal)
Attachment #8679877 - Flags: review?(mshal)
Attachment #8679877 - Flags: review?(mshal) → review+
Backed out to hopefully fix the Win PGO bustage so I can merge inbound.
https://hg.mozilla.org/integration/mozilla-inbound/rev/5d7835c1e572
So, the reason this failed on Windows PGO builds is subtle:
- the jar maker doesn't actually overwrite the manifests it writes out: it reads it, then seek(0), then write(), but it doesn't truncate, so if there's less to write than there was originally in the file, the old content is still there (and in the case of webapprt/chrome.manifest, that content looked like "./", which isn't a valid manifest entry on its own).
- parts of the jar maker are printing out CRLF in those files, and others are printing out CR.

It turns out the updateManifest method is essentially doing the same as addEntriesToListFile from buildlist.py (which, in fact, is used in other parts of the jar maker, but doesn't have the lack-of-truncate problem), so we can just use that instead.

Also, there is no reason to print out CRLF instead of CR on Windows, so let's settle on the latter.
Attachment #8682325 - Flags: review?(mshal)
Comment on attachment 8682325 [details] [diff] [review]
Use addEntriesToListFile in mozbuild.jar.JarMaker.updateManifest

LGTM.
Attachment #8682325 - Flags: review?(mshal) → review+
https://hg.mozilla.org/mozilla-central/rev/7542f43c6a5f
https://hg.mozilla.org/mozilla-central/rev/a4b4bd83536e
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla45
removing the b2g 2.5 flag since this commit has been reverted due to an incorrect merge, sorry for the confusion
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.