Closed Bug 1160666 Opened 9 years ago Closed 9 years ago

Add horizon branding in larch

Categories

(Firefox OS Graveyard :: General, defect)

ARM
Gonk (Firefox OS)
defect
Not set
normal

Tracking

(firefox40 fixed)

RESOLVED FIXED
2.2 S12 (15may)
Tracking Status
firefox40 --- fixed

People

(Reporter: kgrandon, Assigned: kgrandon)

References

Details

(Whiteboard: graphene-larch [horizon])

Attachments

(3 files, 4 obsolete files)

      No description provided.
Whiteboard: [horizon]
Blocks: 1160717
Attachment #8600563 - Attachment is obsolete: true
Comment on attachment 8600564 [details] [diff] [review]
[larch] Patch - Implement horizon branding

Review of attachment 8600564 [details] [diff] [review]:
-----------------------------------------------------------------

Fabrice - I'd like to go ahead and get this merged into the larch branch if possible. This will allow us to specify a new branding path using the --with-branding=b2g/branding/horizon flag. It could also be used as an example of how to make a branding folder for the Graphene project.

Could you take a look to make sure you are ok getting this merged in? I'm also not 100% sure of *how* to get this landed into larch, is there any combination of component + checkin-needed that will work?
Attachment #8600564 - Flags: review?(fabrice)
This is mainly just a copy of the original b2g desktop branding folder, with some changes for what's necessary. It seems that there's some extra files in there that we could probably remove, but I'm not sure what was necessary and what wasn't. Maybe we should go through and clean up the b2g desktop branding stuff, but I would prefer to do that in the future.
Comment on attachment 8600564 [details] [diff] [review]
[larch] Patch - Implement horizon branding

New patch on the way.
Attachment #8600564 - Attachment is obsolete: true
Attachment #8600564 - Flags: review?(fabrice)
Here is a new patch which removes the android changes, and also uses the same style Makefile.in for b2g official and unofficial branding packages. This is necessary to package the .ico and .icns files.
Attachment #8601022 - Flags: review?(fabrice)
Comment on attachment 8601022 [details] [diff] [review]
[larch] Patch - Implement horizon branding

Review of attachment 8601022 [details] [diff] [review]:
-----------------------------------------------------------------

I'd like that to be split up in to parts:
- the generic Makefile.in changes to official/ and unofficial/, that can land on m-c.
- the horizon specific changes.

::: b2g/branding/horizon/Makefile.in
@@ +16,5 @@
> +	$(NULL)
> +endif
> +
> +ifdef MOZ_WIDGET_GTK
> +BRANDING_FILES := \

no icon on linux? why?

::: b2g/branding/horizon/configure.sh
@@ +2,5 @@
> +# License, v. 2.0. If a copy of the MPL was not distributed with this
> +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
> +
> +MOZ_APP_DISPLAYNAME=Horizon
> +ANDROID_PACKAGE_NAME=org.mozilla.b2g

remove that, we don't support android.
Attachment #8601022 - Flags: review?(fabrice) → review-
Attachment #8601022 - Attachment is obsolete: true
Comment on attachment 8601749 [details] [diff] [review]
[larch] Part 1 - Implement horizon branding

Review of attachment 8601749 [details] [diff] [review]:
-----------------------------------------------------------------

Hey Fabrice - I think these are ready for another look. This is the first part - creating the horizon brand.
Attachment #8601749 - Flags: review?(fabrice)
Comment on attachment 8601750 [details] [diff] [review]
Part 2 - Allow per product b2g branding

Review of attachment 8601750 [details] [diff] [review]:
-----------------------------------------------------------------

This is part 2 - implementing per-product branding for b2g.
Attachment #8601750 - Flags: review?(fabrice)
Comment on attachment 8601750 [details] [diff] [review]
Part 2 - Allow per product b2g branding

Review of attachment 8601750 [details] [diff] [review]:
-----------------------------------------------------------------

::: b2g/branding/official/Makefile.in
@@ +5,5 @@
> +include $(topsrcdir)/config/config.mk
> +
> +ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
> +BRANDING_FILES := \
> +	app.ico \

the files you added are b2g.ico, b2g.icns, etc. So I guess this doesn't work? Did you test it?
Attachment #8601750 - Flags: review?(fabrice) → review-
Attachment #8601749 - Flags: review?(fabrice) → review+
My bad. I'm building b2g desktop now to verify that this works. Will re-flag assuming it works.
Attachment #8601750 - Attachment is obsolete: true
Comment on attachment 8602219 [details] [diff] [review]
Part 2 - Allow per product b2g branding

Review of attachment 8602219 [details] [diff] [review]:
-----------------------------------------------------------------

Updated asset names and tested with a b2g desktop build. Everything seems to work fine, can you take another look Fabrice?
Attachment #8602219 - Flags: review?(fabrice)
Comment on attachment 8602219 [details] [diff] [review]
Part 2 - Allow per product b2g branding

Review of attachment 8602219 [details] [diff] [review]:
-----------------------------------------------------------------

Let's land this one on m-c
Attachment #8602219 - Flags: review?(fabrice) → review+
https://hg.mozilla.org/mozilla-central/rev/3879588db690
Status: NEW → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
Target Milestone: --- → 2.2 S12 (15may)
Fabrice - could you help me get both of these patches into larch? Thanks!
Flags: needinfo?(fabrice)
I landed the graphene specific patch at https://hg.mozilla.org/projects/larch/rev/831dcdd45360 along with a m-c merge. You should be all set!
Flags: needinfo?(fabrice)
Whiteboard: [horizon] → graphene-larch [horizon]
You need to log in before you can comment on or make changes to this bug.