1534381 - Fix jarlog re-ordering for macos pgo

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Chris Manchester (limited bugmail, email directly)]

Bug 1530600 results in our macos-pgo builds failing to package. The jarlog from the profile generate step contains entries like:

browser/omni.ja chrome/browser/skin/classic/browser/back.svg
browser/omni.ja chrome/browser/skin/classic/browser/forward.svg
browser/omni.ja chrome/browser/skin/classic/browser/reload.svg
browser/omni.ja chrome/browser/skin/classic/browser/home.svg

...and the packaging step fails with:

ERROR -  package> Traceback (most recent call last):
 INFO -  package>   File "/builds/worker/workspace/build/src/toolkit/mozapps/installer/packager.py", line 345, in <module>
 INFO -  package>     main()
 INFO -  package>   File "/builds/worker/workspace/build/src/toolkit/mozapps/installer/packager.py", line 337, in main
 INFO -  package>     raise Exception('No jar log data for %s' % p)
 INFO -  package> Exception: No jar log data for Firefox Nightly.app/Contents/Resources/omni.ja
 INFO -  package> /builds/worker/workspace/build/src/toolkit/mozapps/installer/packager.mk:23: recipe for target 'stage-package' failed
ERROR -  package> make[5]: *** [stage-package] Error 1

Comment 1

[Mike Hommey [:glandium]]

The real cause is bug 1529894, which changed the contents of the log. Bug 1530600 only made it a non-silent error that mac pgo jarlog has been broken.

Comment 2

[Mike Hommey [:glandium]]

Attachment: Bug 1534381 - Adjust paths to match the jarlog on mac.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/af754eae9658
Adjust paths to match the jarlog on mac. r=chmanchester

Comment 4

[Narcis Beleuzu [:NarcisB]]

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