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