820053 - Theme's icon.png is not installed properly

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Comment 1

[Mike Hommey [:glandium]]

Attachment: Properly install browser theme's icon

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 690473 [details] [diff] [review]
Properly install browser theme's icon

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

::: browser/themes/gnomestripe/Makefile.in
@@ +13,5 @@
>  
>  include $(topsrcdir)/config/rules.mk
>  
> +ICON_FILES := icon.png
> +ICON_DEST := $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}

$(MOZ_APP_ID) would probably be more readable here.

Comment 3

[Mike Hommey [:glandium]]

(In reply to Ted Mielczarek [:ted.mielczarek] from comment #2)
> Comment on attachment 690473 [details] [diff] [review]
> Properly install browser theme's icon
> 
> Review of attachment 690473 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: browser/themes/gnomestripe/Makefile.in
> @@ +13,5 @@
> >  
> >  include $(topsrcdir)/config/rules.mk
> >  
> > +ICON_FILES := icon.png
> > +ICON_DEST := $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
> 
> $(MOZ_APP_ID) would probably be more readable here.

MOZ_APP_ID is ec8030f7-c20a-464f-9b0e-13a3a9e97384. 972ce4c6-7e08-4474-a285-3208198ce6fd is the theme id.

Comment 4

[(not currently active) Ted Mielczarek]

Apparently I didn't read that well. :)

Comment 5

[Mike Hommey [:glandium]]

Attachment: Properly install browser theme's icon.

This version actually works. Required changes: move the definition before including rules.mk, and replace := with = for ICON_DEST because it uses FINAL_TARGET which is only defined in config.mk (included from rules.mk).

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 690771 [details] [diff] [review]
Properly install browser theme's icon.

Carrying over r+

Comment 7

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e602d45eef10

Comment 8

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/e602d45eef10