Closed Bug 514519 Opened 10 years ago Closed 10 years ago

make --enable-official-branding app-agnostic

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(status1.9.2 beta1-fixed)

RESOLVED FIXED
mozilla1.9.3a1
Tracking Status
status1.9.2 --- beta1-fixed

People

(Reporter: Gavin, Assigned: Gavin)

References

Details

(Whiteboard: [fixed mozilla1.9.2a2 on m-1.9.2])

Attachments

(3 files, 1 obsolete file)

... so that we can use it for Fennec.
Requires settings MOZ_OFFICIAL_BRANDING_DIRECTORY in your confvars.sh if you want to use --enable-official-branding. Also moves the Firefox-specific setting of MOZ_BRANDING_DIRECTORY to its confvars.sh.
Assignee: nobody → gavin.sharp
Status: NEW → ASSIGNED
Attachment #398456 - Flags: review?(ted.mielczarek)
Comment on attachment 398456 [details] [diff] [review]
patch
[Checkin: Comment 5]

Looks good, actually cleaner than the original.
Attachment #398456 - Flags: review?(ted.mielczarek) → review+
Different MOZ_BRANDING_DIRECTORY default here (since its a branch), otherwise its the same patch.
Comment on attachment 398460 [details] [diff] [review]
192 patch
[Checkin: Comment 6]

Need this on the branch for Fennec (see dependent bug) - build only change, very low risk!
Attachment #398460 - Flags: approval1.9.2?
http://hg.mozilla.org/mozilla-central/rev/53c42b6f8311
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Target Milestone: --- → mozilla1.9.3a1
Attachment #398460 - Flags: approval1.9.2? → approval1.9.2+
Flags: in-testsuite-
Whiteboard: [fixed mozilla1.9.2a2 on m-1.9.2]
Attached patch (Cv1-CC) Port it to comm-central (obsolete) — Splinter Review
I made a guess about MOZ_BRANDING_DIRECTORY in TB, please double-check.

Fwiw,
http://mxr.mozilla.org/comm-central/search?string=MOZ_BRANDING_DIRECTORY&case=1&find=%2Fmail%2F
Attachment #428430 - Flags: review?(bugzilla)
Comment on attachment 428430 [details] [diff] [review]
(Cv1-CC) Port it to comm-central

Looks good but a couple of bits missing.

- mail/build.mk needs updating
- mail/makefiles.sh can have the check for the variable not being specified removed.
Attachment #428430 - Flags: review?(bugzilla) → review-
Cv1-CC, with comment 8 suggestion(s).

I must have missed to do that part :-<
Attachment #428430 - Attachment is obsolete: true
Attachment #431108 - Flags: review?(bugzilla)
Comment on attachment 431108 [details] [diff] [review]
(Cv2-CC) Port it to comm-central
[Checkin: See comment 11]

>diff --git a/mail/makefiles.sh b/mail/makefiles.sh

> if [ "$COMM_BUILD" ]; then
> add_makefiles "
> mail/Makefile
...
>-mail/test/mozmill/Makefile
> "
> 
>-if test -n "$MOZ_BRANDING_DIRECTORY"; then
>-  add_makefiles "
>-    $MOZ_BRANDING_DIRECTORY/Makefile
>-    $MOZ_BRANDING_DIRECTORY/locales/Makefile
>-  "
>+add_makefiles "
>+$MOZ_BRANDING_DIRECTORY/Makefile
>+$MOZ_BRANDING_DIRECTORY/locales/Makefile
>+"

nit: these don't need to be in a separate block, they can just be merged into the first.

r=Standard8 with that fixed.
Attachment #431108 - Flags: review?(bugzilla) → review+
Comment on attachment 431108 [details] [diff] [review]
(Cv2-CC) Port it to comm-central
[Checkin: See comment 11]


http://hg.mozilla.org/comm-central/rev/aa53ff82623b
Cv2-CC, with comment 10 suggestion(s).
Attachment #431108 - Attachment description: (Cv2-CC) Port it to comm-central → (Cv2-CC) Port it to comm-central [Checkin: See comment 11]
Attachment #398456 - Attachment description: patch → patch [Checkin: Comment 5]
Attachment #398460 - Attachment description: 192 patch → 192 patch [Checkin: Comment 6]
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.