Closed
Bug 555351
Opened 14 years ago
Closed 14 years ago
fennec branding is broken for qt builds.
Categories
(Firefox for Android Graveyard :: General, defect)
Firefox for Android Graveyard
General
Tracking
(Not tracked)
RESOLVED
FIXED
People
(Reporter: jhford, Assigned: blassey)
References
Details
Attachments
(1 file)
649 bytes,
patch
|
mfinkle
:
review+
|
Details | Diff | Splinter Review |
I have tried many times now on different changesets. I run make deb in the objdir, and I get the output below. I am currently doing QT builds sans deb files. /home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/config/nsinstall -D ../../dist/ cd ../../dist && tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f - fennec | gzip -vf9 > fennec-1.1a2pre.en-US.linux-gnueabi-arm.tar.gz 62.2% make[2]: Leaving directory `/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/mobile/installer' make tools make[2]: Entering directory `/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/mobile/installer' make[2]: Nothing to be done for `tools'. make[2]: Leaving directory `/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/mobile/installer' make[1]: Leaving directory `/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/mobile/installer' make[1]: Entering directory `/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/mobile/installer' /home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/mobile/installer/debian/control.in > debian/control Traceback (most recent call last): File "/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/config/Preprocessor.py", line 477, in <module> main() File "/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/config/Preprocessor.py", line 462, in main pp.handleCommandLine(None, True) File "/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/config/Preprocessor.py", line 168, in handleCommandLine self.do_include(f) File "/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/config/Preprocessor.py", line 447, in do_include self.handleLine(l) File "/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/config/Preprocessor.py", line 227, in handleLine cmd(args) File "/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/config/Preprocessor.py", line 456, in do_includesubst self.do_include(args) File "/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/config/Preprocessor.py", line 430, in do_include raise Preprocessor.Error(self, 'FILE_NOT_FOUND', str(args)) __main__.Error: ('/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/mobile/installer/debian/control.in', 16, 'FILE_NOT_FOUND', '/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/dist/branding/fennec_maemo_icon26.txt') make[1]: *** [debian/control] Error 1 make[1]: *** Deleting file `debian/control' make[1]: Leaving directory `/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/mobile/installer' make: *** [installer] Error 2 [cltbld@moz2-linux-slave17 objdir]$ cd mobile/branding/ [cltbld@moz2-linux-slave17 branding]$ find . ./nightly ./nightly/content ./nightly/content/Makefile ./nightly/Makefile ./nightly/locales ./nightly/locales/Makefile
Reporter | ||
Updated•14 years ago
|
OS: Mac OS X → All
Hardware: x86 → All
Comment 1•14 years ago
|
||
This blocks debs for Maemo 5 QT builds, which blocks l10n repacks, release debs, release repos.
Severity: normal → major
Comment 2•14 years ago
|
||
(In reply to comment #1) > This blocks debs for Maemo 5 QT builds, which blocks l10n repacks, release > debs, release repos. Raising priority - who can help unblock us?
Severity: major → critical
Comment 3•14 years ago
|
||
cc'ing Doug to make sure he knows this blocks Maemo QT debs/repacks/updates/releases.
Comment 4•14 years ago
|
||
mark, can we just copy over the gtk bits for this?
Comment 5•14 years ago
|
||
(In reply to comment #0) > 16, 'FILE_NOT_FOUND', > '/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/dist/branding/fennec_maemo_icon26.txt') > make[1]: *** [debian/control] Error 1 > make[1]: *** Deleting file `debian/control' > make[1]: Leaving directory > `/home/cltbld/build/mobile-trunk-maemo5-qt/mozilla-central/objdir/mobile/installer' > make: *** [installer] Error 2 > > > [cltbld@moz2-linux-slave17 objdir]$ cd mobile/branding/ > [cltbld@moz2-linux-slave17 branding]$ find > . > ./nightly > ./nightly/content > ./nightly/content/Makefile > ./nightly/Makefile > ./nightly/locales > ./nightly/locales/Makefile objdir/mobile/branding looks good to me. The file you need (fennec_maemo_icon26.txt), is in objdir/dist/branding and should be copied there by: http://mxr.mozilla.org/mobile-browser/source/branding/official/content/Makefile.in#25 But that code is wrapped in a gtk2 check. You need to expand that code to allow the copy for qt too. Try using: ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
Comment 6•14 years ago
|
||
ping - any update on this?
Comment 7•14 years ago
|
||
(In reply to comment #6) > ping - any update on this? ping - any update on this?
Assignee | ||
Comment 8•14 years ago
|
||
John (Ford) did you try Finkle's suggestion?
Comment 9•14 years ago
|
||
I can make a patch for this, but not today. If you want it sooner, someone else can make the patch and I'll review!
Assignee | ||
Comment 10•14 years ago
|
||
Attachment #449719 -
Flags: review?(mark.finkle)
Comment 11•14 years ago
|
||
Should make sure to keep both branding dirs in sync (nightly/ and official/).
Comment 12•14 years ago
|
||
Comment on attachment 449719 [details] [diff] [review] patch Make the same change to the "nightly" Makefile.in too. r+ with that change
Attachment #449719 -
Flags: review?(mark.finkle) → review+
Assignee | ||
Comment 13•14 years ago
|
||
pushed http://hg.mozilla.org/mobile-browser/rev/282c9ae8c32b John, can you confirm that this fixes the problem you're seeing and close this bug?
Reporter | ||
Comment 14•14 years ago
|
||
This isn't working with a dep build. Going to try on a clobber build. Error Msg: make[1]: Entering directory `/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/objdir/mobile/installer' /home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/mobile/installer/debian/control.in > debian/control Traceback (most recent call last): File "/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/config/Preprocessor.py", line 483, in <module> main() File "/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/config/Preprocessor.py", line 468, in main pp.handleCommandLine(None, True) File "/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/config/Preprocessor.py", line 168, in handleCommandLine self.do_include(f) File "/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/config/Preprocessor.py", line 453, in do_include self.handleLine(l) File "/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/config/Preprocessor.py", line 233, in handleLine cmd(args) File "/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/config/Preprocessor.py", line 462, in do_includesubst self.do_include(args) File "/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/config/Preprocessor.py", line 436, in do_include raise Preprocessor.Error(self, 'FILE_NOT_FOUND', str(args)) __main__.Error: ('/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/mobile/installer/debian/control.in', 16, 'FILE_NOT_FOUND', '/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/objdir/dist/branding/fennec_maemo_icon26.txt') make[1]: *** [debian/control] Error 1 make[1]: *** Deleting file `debian/control' make[1]: Leaving directory `/home/cltbld/build/mozilla-central-mobile-browser-maemo5-qt/mozilla-central/objdir/mobile/installer' make: *** [installer] Error 2
Reporter | ||
Comment 15•14 years ago
|
||
The tree has been permanently red since June 10 at least so I don't know which revisions to test with. If you can tell me a mozilla-central and mobile-browser revision that are known to work with this patch, I can test it on our machines. Alternately, I could enable generating debs on QT and the builds will continue to be red until the current bustage is fixed and 'make deb' works for qt builds.
Updated•14 years ago
|
Status: NEW → RESOLVED
Closed: 14 years ago
Resolution: --- → FIXED
Updated•13 years ago
|
Assignee: nobody → blassey.bugs
You need to log in
before you can comment on or make changes to this bug.
Description
•