532656 - Fix Sunbird official branding on Mac.

Status: RESOLVED FIXED

(Calendar :: Build Config, defect)

Description

[Mark Banner (:standard8)]

Attachment: The fix

As diagnosed during the building of Sunbird 1.0b1, the build fails with official branding doing make -C objdir-tb/ppc/mozilla/tools/update-packaging as follows:

MAR=../../dist/host/bin/mar \
	  /builds/buildbot/macosx_build/build/mozilla/tools/update-packaging/make_full_update.sh \
	  "../../dist/update/mac/en-US//calendar-1.0b1.complete.mar" \
	  "../../dist/universal/Calendar/Calendar.app"
/builds/buildbot/macosx_build/build/mozilla/tools/update-packaging/make_full_update.sh: line 42: pushd: ../../dist/universal/Calendar/Calendar.app: No such file or directory

This is because the mozilla-central part of the build system has got "Calendar" as its MOZ_APP_DISPLAYNAME rather than "Sunbird".

The basic issue is that both our configure.in files import confvars.sh, then work out what to do with branding. In the comm-central part of the build system, the configure.in file explicitly sets MOZ_APP_DISPLAYNAME to Sunbird. In the mozilla-central part of the build system, it doesn't know about Sunbird, so doesn't set it, but does try to call configure.sh in the branding directory.

The patch I'm attaching is porting across some of the changes I did for Thunderbird to support official branding - these changes use configure.sh to set the branding name, and drop the use in confvars.sh.

At the moment, the patch is completely untested.

Comment 1

[Mark Banner (:standard8)]

Attachment: The fix v2

This should now work - I've checked config/autoconf.mk after running configure for both branded & non-branded and it sets MOZ_APP_DISPLAYNAME correctly in both cases.

The issue was that I'd placed the sunbird nightly branding in calendar/sunbird/branding/nightly, but configure.in wants it in calendar/branding/nightly (due to the MOZ_BUILD_APP being calendar).

Comment 2

[Mark Banner (:standard8)]

Attachment: The fix v3

Puts the nightly branding back into calendar/sunbird/branding/nightly with a tweak in confvars.sh to the MOZ_BRANDING_DIRECTORY value.

Comment 3

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 415864 [details] [diff] [review]
The fix v3

r=philipp

Comment 4

[Mark Banner (:standard8)]

Checked in:
http://hg.mozilla.org/releases/comm-1.9.1/rev/1f62f95fd8fb (relbranch)
http://hg.mozilla.org/releases/comm-1.9.1/rev/6becdf0e3122 (default)
http://hg.mozilla.org/comm-central/rev/d61c957030ee

Comment 5

[Stefan Sitter [:ssitter]]

Looks like this patch broke Linux, Mac OS X and Windows builds <http://tinderbox.mozilla.org/showbuilds.cgi?tree=Calendar1.0>:

make[4]: *** No rule to make target `/e/buildbot/comm-1.9.1-sunbird-win32/build/calendar/sunbird/branding/nightly/Makefile.in', needed by `calendar/sunbird/branding/nightly/Makefile'.  Stop.

make[3]: *** [export_tier_app] Error 2
make[2]: *** [tier_app] Error 2
make[1]: Leaving directory `/e/buildbot/comm-1.9.1-sunbird-win32/build/objdir-tb'
make[1]: *** [default] Error 2
make: *** [build] Error 2

Comment 6

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

These bugs are likely targeted at Lightning 1.0b1, not Lightning 1.0. If this change was done in error, please adjust the target milestone to its correct value. To filter on this bugspam, you can use "lightning-10-target-move".