|
1 diff --git a/calendar/installer/Makefile.in b/calendar/installer/Makefile.in |
|
2 --- a/calendar/installer/Makefile.in |
|
3 +++ b/calendar/installer/Makefile.in |
|
4 @@ -53,17 +53,17 @@ NO_PKG_FILES = \ |
|
5 xpt_link* \ |
|
6 nspr-config \ |
|
7 $(NULL) |
|
8 |
|
9 include $(topsrcdir)/config/rules.mk |
|
10 |
|
11 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in |
|
12 |
|
13 -ifdef BUILD_STATIC_LIBS |
|
14 +ifneq (,$(BUILD_STATIC_LIBS)$(MOZ_ENABLE_LIBXUL)) |
|
15 ifeq (WINNT,$(OS_ARCH)) |
|
16 MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static |
|
17 # XXX Enable when landing unix installer |
|
18 # else |
|
19 # ifneq (,$(filter-out OS2 Darwin,$(OS_ARCH))) |
|
20 # MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages-static |
|
21 # endif |
|
22 endif |
|
23 diff --git a/calendar/locales/Makefile.in b/calendar/locales/Makefile.in |
|
24 --- a/calendar/locales/Makefile.in |
|
25 +++ b/calendar/locales/Makefile.in |
|
26 @@ -107,17 +107,19 @@ endif |
|
27 endif |
|
28 endif |
|
29 |
|
30 clobber-%: |
|
31 $(RM) -rf $(DIST)/xpi-stage/locale-$* |
|
32 |
|
33 libs-%: |
|
34 $(NSINSTALL) -D $(DIST)/install |
|
35 +ifndef LIBXUL_SDK |
|
36 @$(MAKE) -C ../../mozilla/toolkit/locales libs-$* BOTH_MANIFESTS=1 |
|
37 +endif |
|
38 ifdef MOZ_SUNBIRD |
|
39 @$(MAKE) -C ../sunbird/locales libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 |
|
40 endif |
|
41 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 |
|
42 ifdef MOZ_BRANDING_DIRECTORY |
|
43 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
|
44 endif |
|
45 @$(MAKE) tests AB_CD=$* |
|
46 diff --git a/calendar/sunbird/app/Makefile.in b/calendar/sunbird/app/Makefile.in |
|
47 --- a/calendar/sunbird/app/Makefile.in |
|
48 +++ b/calendar/sunbird/app/Makefile.in |
|
49 @@ -74,17 +74,19 @@ ifdef SOURCE_STAMP |
|
50 DEFINES += -DMOZ_SOURCE_STAMP="$(SOURCE_STAMP)" |
|
51 endif |
|
52 |
|
53 SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/") |
|
54 ifdef SOURCE_REPO |
|
55 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" |
|
56 endif |
|
57 |
|
58 -ifndef LIBXUL_SDK |
|
59 +ifdef LIBXUL_SDK |
|
60 +include $(topsrcdir)/config/rules.mk |
|
61 +else |
|
62 # Build a binary bootstrapping with XRE_main |
|
63 |
|
64 MOZILLA_INTERNAL_API = 1 |
|
65 |
|
66 ifeq ($(USE_SHORT_LIBNAME), 1) |
|
67 PROGRAM = sunbird$(BIN_SUFFIX) |
|
68 else |
|
69 PROGRAM = sunbird-bin$(BIN_SUFFIX) |
|
70 @@ -219,22 +221,16 @@ RCFLAGS += -DDEBUG |
|
71 endif |
|
72 RCFLAGS += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\" |
|
73 endif |
|
74 |
|
75 LIBS += $(JEMALLOC_LIBS) |
|
76 |
|
77 include $(topsrcdir)/config/rules.mk |
|
78 |
|
79 -ifdef MOZILLA_OFFICIAL |
|
80 -DEFINES += -DMOZILLA_OFFICIAL |
|
81 -endif |
|
82 - |
|
83 -DEFINES += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\" |
|
84 - |
|
85 ifdef BUILD_STATIC_LIBS |
|
86 include $(topsrcdir)/config/static-rules.mk |
|
87 endif |
|
88 |
|
89 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) |
|
90 ifdef BUILD_STATIC_LIBS |
|
91 LIBS += -framework QuickTime -framework IOKit |
|
92 endif |
|
93 @@ -275,66 +271,16 @@ libs:: sunbird |
|
94 install:: sunbird |
|
95 $(SYSINSTALL) $< $(DESTDIR)$(bindir) |
|
96 |
|
97 GARBAGE += sunbird |
|
98 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, sunbird.js) |
|
99 |
|
100 endif |
|
101 |
|
102 -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) |
|
103 -ICON_FILES = \ |
|
104 - $(DIST)/branding/mozicon128.png \ |
|
105 - $(DIST)/branding/mozicon50.xpm \ |
|
106 - $(DIST)/branding/mozicon16.xpm \ |
|
107 - $(NULL) |
|
108 - |
|
109 -libs:: $(ICON_FILES) |
|
110 - $(INSTALL) $^ $(DIST)/bin/icons |
|
111 - |
|
112 -install:: |
|
113 - $(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons |
|
114 -endif |
|
115 - |
|
116 -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
|
117 -libs:: |
|
118 - $(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default |
|
119 - |
|
120 -install:: |
|
121 - $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default |
|
122 -endif |
|
123 - |
|
124 -export:: |
|
125 -ifndef MOZ_BRANDING_DIRECTORY |
|
126 - $(NSINSTALL) -D $(DIST)/branding |
|
127 -ifeq ($(OS_ARCH),WINNT) |
|
128 - cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico |
|
129 - cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico |
|
130 - cp $(srcdir)/sunbird.ico $(DIST)/branding/document.ico |
|
131 -endif |
|
132 -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) |
|
133 - cp $(srcdir)/macbuild/sunbird.icns $(DIST)/branding/sunbird.icns |
|
134 - cp $(srcdir)/macbuild/sb_ICS.icns $(DIST)/branding/sb_ICS.icns |
|
135 - cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore |
|
136 - cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png |
|
137 - cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns |
|
138 -endif |
|
139 -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) |
|
140 - cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png |
|
141 - cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm |
|
142 - cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm |
|
143 -endif |
|
144 -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
|
145 - cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm |
|
146 -endif |
|
147 -ifeq ($(OS_ARCH),OS2) |
|
148 - cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico |
|
149 -endif |
|
150 -endif |
|
151 - |
|
152 libs:: |
|
153 touch $(DIST)/bin/.autoreg |
|
154 |
|
155 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) |
|
156 |
|
157 APP_NAME = $(MOZ_APP_DISPLAYNAME) |
|
158 |
|
159 ifdef MOZ_DEBUG |
|
160 @@ -373,16 +319,77 @@ libs repackage:: $(PROGRAM) |
|
161 printf APPL$(MAC_CREATOR_CODE) > $(DIST)/$(APP_NAME).app/Contents/PkgInfo |
|
162 # remove CVS dirs from packaged app |
|
163 find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \; |
|
164 |
|
165 endif |
|
166 |
|
167 endif # LIBXUL_SDK |
|
168 |
|
169 +ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) |
|
170 +ICON_FILES = \ |
|
171 + $(DIST)/branding/mozicon128.png \ |
|
172 + $(DIST)/branding/mozicon50.xpm \ |
|
173 + $(DIST)/branding/mozicon16.xpm \ |
|
174 + $(NULL) |
|
175 + |
|
176 +libs:: $(ICON_FILES) |
|
177 + $(INSTALL) $^ $(DIST)/bin/chrome/icons/default |
|
178 + |
|
179 +install:: |
|
180 + $(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/chrome/icons/default |
|
181 +endif |
|
182 + |
|
183 +export:: |
|
184 +ifndef MOZ_BRANDING_DIRECTORY |
|
185 + $(NSINSTALL) -D $(DIST)/branding |
|
186 +ifeq ($(OS_ARCH),WINNT) |
|
187 + cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico |
|
188 + cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico |
|
189 + cp $(srcdir)/sunbird.ico $(DIST)/branding/document.ico |
|
190 +endif |
|
191 +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) |
|
192 + cp $(srcdir)/macbuild/sunbird.icns $(DIST)/branding/sunbird.icns |
|
193 + cp $(srcdir)/macbuild/sb_ICS.icns $(DIST)/branding/sb_ICS.icns |
|
194 + cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore |
|
195 + cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png |
|
196 + cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns |
|
197 +endif |
|
198 +ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) |
|
199 + cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png |
|
200 + cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm |
|
201 + cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm |
|
202 +endif |
|
203 +ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
|
204 + cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm |
|
205 +endif |
|
206 +ifeq ($(OS_ARCH),OS2) |
|
207 + cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico |
|
208 +endif |
|
209 +endif |
|
210 + |
|
211 +ifdef MOZILLA_OFFICIAL |
|
212 +DEFINES += -DMOZILLA_OFFICIAL |
|
213 +endif |
|
214 + |
|
215 +DEFINES += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\" |
|
216 + |
|
217 +ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
|
218 +libs:: |
|
219 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default |
|
220 + |
|
221 +install:: |
|
222 + $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default |
|
223 +endif |
|
224 + |
|
225 +ifdef LIBXUL_SDK |
|
226 +libs:: |
|
227 + cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/sunbird$(BIN_SUFFIX) |
|
228 +endif |
|
229 + |
|
230 libs:: |
|
231 ifeq ($(OS_ARCH),WINNT) |
|
232 $(EXIT_ON_ERROR) \ |
|
233 $(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(MOZILLA_SRCDIR)/LICENSE > $(DIST)/bin/LICENSE |
|
234 else |
|
235 $(INSTALL) $(MOZILLA_SRCDIR)/LICENSE $(DIST)/bin |
|
236 endif |
|
237 |
|
238 diff --git a/calendar/sunbird/app/application.ini b/calendar/sunbird/app/application.ini |
|
239 --- a/calendar/sunbird/app/application.ini |
|
240 +++ b/calendar/sunbird/app/application.ini |
|
241 @@ -47,18 +47,18 @@ SourceRepository=@MOZ_SOURCE_REPO@ |
|
242 #endif |
|
243 #ifdef MOZ_SOURCE_STAMP |
|
244 SourceStamp=@MOZ_SOURCE_STAMP@ |
|
245 #endif |
|
246 Copyright=Copyright (c) 1998 - 2009 mozilla.org |
|
247 ID={718e30fb-e89b-41dd-9da7-e25a45638b28} |
|
248 |
|
249 [Gecko] |
|
250 -MinVersion=@GRE_MILESTONE@ |
|
251 -MaxVersion=@GRE_MILESTONE@ |
|
252 +MinVersion=1.9.1 |
|
253 +MaxVersion=1.9.1.* |
|
254 |
|
255 [XRE] |
|
256 EnableProfileMigrator=1 |
|
257 EnableExtensionManager=1 |
|
258 |
|
259 [Crash Reporter] |
|
260 #if MOZILLA_OFFICIAL |
|
261 Enabled=1 |