| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Thu, 28 Apr 2016 17:08:03 +0200 | |
| branch | firefox46 |
| changeset 909 | c6717354928b |
| parent 904 | 6a889427cd4f |
| child 923 | 3cc9f17ca9bb |
| permissions | -rw-r--r-- |
| 252 | 1 |
# HG changeset patch |
| 828 | 2 |
# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
| 909 | 3 |
# Parent a5764b0a088418fdbf4b774a8ff2745cc99f6706 |
| 259 | 4 |
|
| 252 | 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 |
|
| 868 | 8 |
@@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
| 612 | 9 |
endif |
| 252 | 10 |
|
| 659 | 11 |
ifdef MOZ_WIDGET_GTK |
| 252 | 12 |
libs:: |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
13 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
|
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
14 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default |
|
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
15 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default |
|
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
16 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default |
| 252 | 17 |
+ifdef MOZ_OFFICIAL_BRANDING |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
18 |
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default |
|
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
19 |
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default |
|
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
20 |
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default |
| 252 | 21 |
+endif |
22 |
endif |
|
23 |
||
|
462
2d86bdb4277f
14.0b6 (Aurora->Beta)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
24 |
# channel-prefs.js is handled separate from other prefs due to bug 756325 |
|
2d86bdb4277f
14.0b6 (Aurora->Beta)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
25 |
libs:: $(srcdir)/profile/channel-prefs.js |
| 828 | 26 |
$(NSINSTALL) -D $(DIST)/bin/defaults/pref |
27 |
$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) |
|
| 899 | 28 |
|
29 |
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
|
| 868 | 30 |
diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
31 |
--- a/browser/branding/branding-common.mozbuild |
|
32 |
+++ b/browser/branding/branding-common.mozbuild |
|
| 909 | 33 |
@@ -34,12 +34,15 @@ def FirefoxBranding(): |
34 |
'disk.icns', |
|
35 |
'document.icns', |
|
36 |
'dsstore', |
|
37 |
'firefox.icns', |
|
38 |
] |
|
39 |
elif CONFIG['MOZ_WIDGET_GTK']: |
|
40 |
BRANDING_FILES += [ |
|
41 |
'default16.png', |
|
42 |
+ 'default22.png', |
|
43 |
+ 'default24.png', |
|
44 |
+ 'default256.png', |
|
45 |
'default32.png', |
|
46 |
'default48.png', |
|
47 |
'mozicon128.png', |
|
48 |
] |
|
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
49 |
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
|
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
50 |
--- a/browser/installer/package-manifest.in |
|
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
51 |
+++ b/browser/installer/package-manifest.in |
| 909 | 52 |
@@ -664,18 +664,21 @@ |
| 868 | 53 |
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
|
| 828 | 54 |
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
|
55 |
@RESPATH@/chrome/toolkit@JAREXT@ |
|
56 |
@RESPATH@/chrome/toolkit.manifest |
|
57 |
@RESPATH@/chrome/recording.manifest |
|
58 |
@RESPATH@/chrome/recording/* |
|
| 659 | 59 |
#ifdef MOZ_GTK |
| 828 | 60 |
@RESPATH@/browser/chrome/icons/default/default16.png |
61 |
+@RESPATH@/browser/chrome/icons/default/default22.png |
|
62 |
+@RESPATH@/browser/chrome/icons/default/default24.png |
|
63 |
@RESPATH@/browser/chrome/icons/default/default32.png |
|
64 |
@RESPATH@/browser/chrome/icons/default/default48.png |
|
65 |
+@RESPATH@/browser/chrome/icons/default/default256.png |
|
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
66 |
#endif |
| 904 | 67 |
@RESPATH@/browser/features/* |
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
68 |
|
|
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
69 |
; [Webide Files] |
| 828 | 70 |
@RESPATH@/browser/chrome/webide@JAREXT@ |
71 |
@RESPATH@/browser/chrome/webide.manifest |
|
72 |
@RESPATH@/browser/@PREF_DIR@/webide-prefs.js |
|
| 766 | 73 |