1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
3 # Parent a5764b0a088418fdbf4b774a8ff2745cc99f6706 |
3 # Parent 2bffb52e07b587a6c755d67c6fc971fed6509783 |
4 |
4 |
5 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
|
6 --- a/browser/app/Makefile.in |
|
7 +++ b/browser/app/Makefile.in |
|
8 @@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
|
9 endif |
|
10 |
|
11 ifdef MOZ_WIDGET_GTK |
|
12 libs:: |
|
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
|
14 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default |
|
15 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default |
|
16 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default |
|
17 +ifdef MOZ_OFFICIAL_BRANDING |
|
18 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default |
|
19 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default |
|
20 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default |
|
21 +endif |
|
22 endif |
|
23 |
|
24 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
|
25 libs:: $(srcdir)/profile/channel-prefs.js |
|
26 $(NSINSTALL) -D $(DIST)/bin/defaults/pref |
|
27 $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) |
|
28 |
|
29 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
|
30 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
5 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
31 --- a/browser/branding/branding-common.mozbuild |
6 --- a/browser/branding/branding-common.mozbuild |
32 +++ b/browser/branding/branding-common.mozbuild |
7 +++ b/browser/branding/branding-common.mozbuild |
33 @@ -34,12 +34,15 @@ def FirefoxBranding(): |
8 @@ -34,18 +34,24 @@ def FirefoxBranding(): |
34 'disk.icns', |
9 'disk.icns', |
35 'document.icns', |
10 'document.icns', |
36 'dsstore', |
11 'dsstore', |
37 'firefox.icns', |
12 'firefox.icns', |
38 ] |
13 ] |
39 elif CONFIG['MOZ_WIDGET_GTK']: |
14 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
40 BRANDING_FILES += [ |
15 BRANDING_FILES += [ |
41 'default16.png', |
16 'default16.png', |
42 + 'default22.png', |
17 + 'default22.png', |
43 + 'default24.png', |
18 + 'default24.png', |
44 + 'default256.png', |
19 + 'default256.png', |
45 'default32.png', |
20 'default32.png', |
46 'default48.png', |
21 'default48.png', |
47 'mozicon128.png', |
22 'mozicon128.png', |
48 ] |
23 ] |
|
24 FINAL_TARGET_FILES.icons += ['mozicon128.png'] |
|
25 FINAL_TARGET_FILES.chrome.icons.default += [ |
|
26 'default16.png', |
|
27 + 'default22.png', |
|
28 + 'default24.png', |
|
29 + 'default256.png', |
|
30 'default32.png', |
|
31 'default48.png', |
|
32 ] |
49 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
33 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
50 --- a/browser/installer/package-manifest.in |
34 --- a/browser/installer/package-manifest.in |
51 +++ b/browser/installer/package-manifest.in |
35 +++ b/browser/installer/package-manifest.in |
52 @@ -664,18 +664,21 @@ |
36 @@ -650,18 +650,21 @@ |
53 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
37 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
54 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
38 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
55 @RESPATH@/chrome/toolkit@JAREXT@ |
39 @RESPATH@/chrome/toolkit@JAREXT@ |
56 @RESPATH@/chrome/toolkit.manifest |
40 @RESPATH@/chrome/toolkit.manifest |
57 @RESPATH@/chrome/recording.manifest |
41 @RESPATH@/chrome/recording.manifest |