237596 - Need to get official artwork into nightly builds

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Ben Goodger (use ben at mozilla dot org for email)]

Official artwork needs to be available to nightly builds, via a configure flag
--enable-official-branding.

Comment 1

[Ben Goodger (use ben at mozilla dot org for email)]

Attachment: patch to add --enable-official-branding

Comment 2

[Ben Goodger (use ben at mozilla dot org for email)]

Attachment: better patch

bryner says "r=bryner" with the changes in this patch (test for
browser/app/macbuild in the official branding makefile rather than add a new
makefile for it and use += instead of := in client.mk to add the other-licenses
dir to the checkout rather than duplicate mozilla/browser)

Comment 3

[Ben Goodger (use ben at mozilla dot org for email)]

Attachment: bryner also said I should always pull this dir

Comment 4

[Pierre Chanial]

there's a typo in mozilla/Makefile.in:
tire_99_dirs  += other-licenses/branding/firefox

should be tier_99_dirs.

Comment 5

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 144011 [details] [diff] [review]
bryner also said I should always pull this dir

>Index: other-licenses/branding/firefox/Makefile.in
>+export::
>+	cp $(srcdir)/firefox.ico $(DEPTH)/browser/app/firefox.ico
>+	cp $(srcdir)/firefox.ico $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/browser.ico
>+	if [ ! -d $(DEPTH)/browser/app/macbuild ] ; then \
>+		mkdir $(DEPTH)/browser/app/macbuild; \
>+	fi
>+	cp $(srcdir)/firefox.icns $(DEPTH)/browser/app/macbuild/firefox.icns
>+	cp $(srcdir)/document.icns $(DEPTH)/browser/app/macbuild/document.icns
>+	cp $(srcdir)/document.ico $(DEPTH)/browser/app/document.ico
>+	cp $(srcdir)/Header.bmp $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/Header.bmp
>+	cp $(srcdir)/Watermrk.bmp $(DEPTH)/toolkit/mozapps/installer/windows/wizard/setuprsc/Watermrk.bmp


So this stuff only works in srcdir builds, not objdir builds, since in objdir
builds it copies into the objdir when the makefiles in question copy use the
files from the srcdir.

It's also rather risky, since by overwriting other files in the source tree,
you risk those files being accidentally checked in.

Comment 6

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

(Maybe that's not really why it doesn't work in objdir builds, but tainting the
srcdir in srcdir builds is bad anyway.)

Comment 7

[Bradley Chapman (not reading bugmail, still gone but not forever)]

http://scragz.com/tech/mozilla/firefox-unofficial-branding.php

Are there any plans to use this libre artwork, to avoid any issues between the
unofficial builders and the Mozilla Foundation over its new stance on branding
trademarks?

Comment 8

[Ben Goodger (use ben at mozilla dot org for email)]

bug 237725 has been filed on the creation of a staging area in dist for branded
resources. mscott will be working on this shortly. 

unofficial artwork has been checked into the MPL'ed sections of the tree. 

Comment 9

[Ben Goodger (use ben at mozilla dot org for email)]

this should now work.

Comment 10

[Bradley Chapman (not reading bugmail, still gone but not forever)]

Whose unofficial artwork?