736770 - --disable-updater packaging errors

Status: RESOLVED FIXED

Description

[Serge Gautherie (:sgautherie)]

Per bug 713132 comment 12.

http://khuey.pastebin.mozilla.org/1524056
{
Error: package error or possible missing or unnecessary file: bin/update.locale (package-manifest, 27).
Error: package error or possible missing or unnecessary file: bin/updater.ini (package-manifest, 28).

Error: package error or possible missing or unnecessary file: bin/updater (package-manifest, 415).
}

Comment 1

[Chris Coulson]

Created attachment 606907 [details] [diff] [review]
Fix stage-package with --disable-updater and  MOZ_PKG_FATAL_WARNINGS

This broke our builds in Ubuntu too. The attached patch seems to be sufficient

Comment 2

[Chris Coulson]

Urgh, not sure where the extra diff came from there

Comment 3

[Chris Coulson]

Created attachment 606908 [details] [diff] [review]
Fix stage-package with --disable-updater and MOZ_PKG_FATAL_WARNINGS

There we go, that's better

Comment 4

[Serge Gautherie (:sgautherie)]

Comment on attachment 606908 [details] [diff] [review]
Fix stage-package with --disable-updater and MOZ_PKG_FATAL_WARNINGS

This is the idea, but partly wrong and not that simple.

Comment 5

[Serge Gautherie (:sgautherie)]

Comment on attachment 606908 [details] [diff] [review]
Fix stage-package with --disable-updater and MOZ_PKG_FATAL_WARNINGS

(In reply to Serge Gautherie (:sgautherie) from comment #4)
> This is the idea, but partly wrong and not that simple.

My mistake, probably not wrong.
But I believe we should update removed-files.in too.

I'm currently Try_ing to work around bug 558180 regression (at least to some extent) :-/

Comment 6

[Serge Gautherie (:sgautherie)]

Reproduced in
https://tbpl.mozilla.org/php/getParsedLog.php?id=10154929&tree=Try&full=1
Linux x86-64 try build on 2012-03-17 13:49:14 PDT for push 368e09fdd313

Comment 7

[Serge Gautherie (:sgautherie)]

Created attachment 606942 [details] [diff] [review]
(Bv1) packaging: Add 'MOZ_UPDATER' condition for 3 files, Sort '[@AB_CD@]' files, Sync' removed-files.in
[Checked in: Comment 8]

Succeeded as
https://tbpl.mozilla.org/?tree=Try&rev=90c71ec03977

Comment 8

[Serge Gautherie (:sgautherie)]

Comment on attachment 606942 [details] [diff] [review]
(Bv1) packaging: Add 'MOZ_UPDATER' condition for 3 files, Sort '[@AB_CD@]' files, Sync' removed-files.in
[Checked in: Comment 8]

https://hg.mozilla.org/mozilla-central/rev/4a6a529aeec9


[Approval Request Comment]
Regression caused by (bug #): (old)
User impact if declined: None, but blocks landing bug 713132.
Testing completed (on m-c, etc.): Try, this comment.
Risk to taking this patch (and alternatives if risky): None, buildtime (+ install) only.
String changes made by this patch: None.

Comment 9

[Serge Gautherie (:sgautherie)]

Ftr,

"updater" application is built in
http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/update/updater/Makefile.in

update.locale in
http://mxr.mozilla.org/mozilla-central/source/toolkit/locales/Makefile.in

updater.ini in
http://mxr.mozilla.org/mozilla-central/source/browser/locales/Makefile.in

Comment 10

[Mike Pesce (:By-Tor)]

make installer on windows is failing again with the following: 

bin/components/pipboot.xpt
bin/components/pipnss.xpt
bin/components/pippki.xpt
Error: found error(s) while packaging, see above for details.
d:\build\mozilla-central\toolkit\mozapps\installer\packager.mk:759:0: command '/
bin/sh /d/build/mozilla-central/build/msys-perl-wrapper -Id:/build/mozilla-centr
al/toolkit/mozapps/installer -e 'use Packager; Packager::Copy( "d:/build/mozilla
-central/obj-i686-pc-mingw32/browser/installer/../../dist", "d:/build/mozilla-ce
ntral/obj-i686-pc-mingw32/browser/installer/../../dist/firefox", "package-manife
st", "dos", 1,1, 0, 1);'' failed, return code 9
d:\build\mozilla-central\obj-i686-pc-mingw32\browser\installer\windows\Makefile:
98:0: command 'c:/mozilla-build/python/python.exe d:/build/mozilla-central/build
/pymake/pymake/../make.py -C .. installer-stage' failed, return code 2
d:\build\mozilla-central\obj-i686-pc-mingw32\browser\installer\Makefile:163:0: c
ommand 'c:/mozilla-build/python/python.exe d:/build/mozilla-central/build/pymake
/pymake/../make.py -C windows' failed, return code 2
d:\build\mozilla-central\browser\build.mk:75:0: command 'c:/mozilla-build/python
/python.exe d:/build/mozilla-central/build/pymake/pymake/../make.py -C browser/i
nstaller installer' failed, return code 2

Comment 11

[Serge Gautherie (:sgautherie)]

(In reply to Mike Pesce (:By-Tor) from comment #10)
> make installer on windows is failing again with the following: 

That log is unhelpful, per bug 736544 and irc.