| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Sat, 14 Mar 2015 15:56:15 +0100 | |
| changeset 841 | d8a3e976dfba |
| parent 828 | 59013b3a51f5 |
| child 868 | 284da266ec46 |
| permissions | -rw-r--r-- |
| 252 | 1 |
# HG changeset patch |
| 828 | 2 |
# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
| 259 | 3 |
|
| 252 | 4 |
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
5 |
--- a/browser/app/Makefile.in |
|
6 |
+++ b/browser/app/Makefile.in |
|
| 828 | 7 |
@@ -62,16 +62,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
| 612 | 8 |
endif |
| 252 | 9 |
|
| 659 | 10 |
ifdef MOZ_WIDGET_GTK |
| 252 | 11 |
libs:: |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
12 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
|
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
13 |
$(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
|
14 |
$(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
|
15 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default |
| 252 | 16 |
+ifdef MOZ_OFFICIAL_BRANDING |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
484
diff
changeset
|
17 |
+ $(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
|
18 |
+ $(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
|
19 |
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default |
| 252 | 20 |
+endif |
21 |
endif |
|
22 |
||
| 484 | 23 |
ifndef LIBXUL_SDK |
|
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) |
|
28 |
endif |
|
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
29 |
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in |
|
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
30 |
--- a/browser/branding/official/Makefile.in |
|
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
31 |
+++ b/browser/branding/official/Makefile.in |
| 738 | 32 |
@@ -35,18 +35,21 @@ BRANDING_FILES := \ |
| 252 | 33 |
document.icns \ |
34 |
dsstore \ |
|
35 |
$(NULL) |
|
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
36 |
endif |
| 252 | 37 |
|
| 738 | 38 |
ifdef MOZ_WIDGET_GTK |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
39 |
BRANDING_FILES := \ |
| 252 | 40 |
default16.png \ |
41 |
+ default22.png \ |
|
42 |
+ default24.png \ |
|
43 |
default32.png \ |
|
44 |
default48.png \ |
|
45 |
+ default256.png \ |
|
46 |
mozicon128.png \ |
|
47 |
$(NULL) |
|
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
48 |
endif |
| 252 | 49 |
|
| 718 | 50 |
BRANDING_DEST := $(DIST)/branding |
51 |
BRANDING_TARGET := export |
|
52 |
INSTALL_TARGETS += BRANDING |
|
53 |
||
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
54 |
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
|
55 |
--- a/browser/installer/package-manifest.in |
|
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
56 |
+++ b/browser/installer/package-manifest.in |
| 828 | 57 |
@@ -654,18 +654,21 @@ |
58 |
@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@ |
|
61 |
@RESPATH@/chrome/toolkit.manifest |
|
62 |
@RESPATH@/chrome/recording.manifest |
|
63 |
@RESPATH@/chrome/recording/* |
|
| 659 | 64 |
#ifdef MOZ_GTK |
| 828 | 65 |
@RESPATH@/browser/chrome/icons/default/default16.png |
66 |
+@RESPATH@/browser/chrome/icons/default/default22.png |
|
67 |
+@RESPATH@/browser/chrome/icons/default/default24.png |
|
68 |
@RESPATH@/browser/chrome/icons/default/default32.png |
|
69 |
@RESPATH@/browser/chrome/icons/default/default48.png |
|
70 |
+@RESPATH@/browser/chrome/icons/default/default256.png |
|
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
71 |
#endif |
|
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
72 |
|
|
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
73 |
; [Webide Files] |
| 828 | 74 |
@RESPATH@/browser/chrome/webide@JAREXT@ |
75 |
@RESPATH@/browser/chrome/webide.manifest |
|
76 |
@RESPATH@/browser/@PREF_DIR@/webide-prefs.js |
|
| 766 | 77 |
|
78 |
; shell icons |