]>
Commit | Line | Data |
---|---|---|
534550cc | 1 | diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-release/browser/installer/package-manifest.in |
82f4f456 JB |
2 | --- mozilla-release.orig/browser/installer/package-manifest.in 2015-04-03 04:30:05.000000000 +0200 |
3 | +++ mozilla-release/browser/installer/package-manifest.in 2015-04-12 16:46:15.409547636 +0200 | |
4 | @@ -44,14 +44,18 @@ | |
c5cd9be2 | 5 | [@AB_CD@] |
82f4f456 JB |
6 | @RESPATH@/browser/chrome/@AB_CD@@JAREXT@ |
7 | @RESPATH@/browser/chrome/@AB_CD@.manifest | |
c5cd9be2 | 8 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
9 | @RESPATH@/chrome/@AB_CD@@JAREXT@ |
10 | @RESPATH@/chrome/@AB_CD@.manifest | |
c5cd9be2 | 11 | +#endif |
82f4f456 JB |
12 | @RESPATH@/browser/defaults/profile/bookmarks.html |
13 | @RESPATH@/browser/defaults/profile/chrome/* | |
14 | @RESPATH@/browser/defaults/profile/localstore.rdf | |
15 | @RESPATH@/browser/defaults/profile/mimeTypes.rdf | |
c5cd9be2 | 16 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
17 | @RESPATH@/dictionaries/* |
18 | @RESPATH@/hyphenation/* | |
c5cd9be2 | 19 | +#endif |
82f4f456 JB |
20 | @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js |
21 | @RESPATH@/browser/searchplugins/* | |
c5cd9be2 | 22 | #ifdef XP_WIN32 |
82f4f456 | 23 | @@ -63,7 +67,9 @@ |
96ef4151 JB |
24 | #endif |
25 | ||
26 | [xpcom] | |
27 | +#ifndef LIBXUL_SDK | |
82f4f456 | 28 | @RESPATH@/dependentlibs.list |
96ef4151 | 29 | +#endif |
a9334f16 | 30 | #ifdef GKMEDIAS_SHARED_LIBRARY |
96ef4151 JB |
31 | @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ |
32 | #endif | |
82f4f456 JB |
33 | @@ -72,8 +78,10 @@ |
34 | @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ | |
a86b0951 | 35 | #endif |
96ef4151 | 36 | #ifndef MOZ_STATIC_JS |
c5cd9be2 | 37 | +#ifndef LIBXUL_SDK |
96ef4151 JB |
38 | @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ |
39 | #endif | |
534550cc | 40 | +#endif |
a86b0951 | 41 | #ifdef MOZ_DMD |
82f4f456 JB |
42 | @BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@ |
43 | #endif | |
44 | @@ -84,17 +92,23 @@ | |
45 | @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ | |
46 | #endif | |
47 | #endif | |
48 | +#ifndef LIBXUL_SDK | |
a86b0951 | 49 | #ifdef XP_MACOSX |
82f4f456 | 50 | @BINPATH@/XUL |
96ef4151 | 51 | #else |
c5cd9be2 | 52 | +#ifndef LIBXUL_SDK |
96ef4151 JB |
53 | @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ |
54 | #endif | |
82f4f456 | 55 | +#endif |
96ef4151 JB |
56 | +#endif |
57 | #ifdef XP_MACOSX | |
82f4f456 JB |
58 | @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/ |
59 | @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@ | |
96ef4151 JB |
60 | #else |
61 | +#ifndef LIBXUL_SDK | |
62 | @BINPATH@/@MOZ_CHILD_PROCESS_NAME@ | |
63 | #endif | |
64 | +#endif | |
65 | #ifdef XP_WIN32 | |
c5cd9be2 | 66 | @BINPATH@/plugin-hang-ui@BIN_SUFFIX@ |
534550cc | 67 | #if MOZ_PACKAGE_MSVC_DLLS |
82f4f456 | 68 | @@ -141,7 +155,9 @@ |
96ef4151 | 69 | #ifdef MOZ_UPDATER |
82f4f456 | 70 | @RESPATH@/update-settings.ini |
96ef4151 JB |
71 | #endif |
72 | +#ifndef LIBXUL_SDK | |
82f4f456 | 73 | @RESPATH@/platform.ini |
96ef4151 | 74 | +#endif |
96ef4151 | 75 | #ifndef MOZ_NATIVE_SQLITE |
c5cd9be2 | 76 | #ifndef MOZ_FOLD_LIBS |
08ccc3c5 | 77 | @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ |
82f4f456 | 78 | @@ -156,6 +172,7 @@ |
96ef4151 JB |
79 | |
80 | ; [Components] | |
82f4f456 | 81 | @RESPATH@/browser/components/components.manifest |
96ef4151 | 82 | +#ifndef LIBXUL_SDK |
82f4f456 | 83 | @RESPATH@/components/alerts.xpt |
96ef4151 JB |
84 | #ifdef ACCESSIBILITY |
85 | #ifdef XP_WIN32 | |
82f4f456 JB |
86 | @@ -167,10 +184,12 @@ |
87 | @RESPATH@/components/appstartup.xpt | |
88 | @RESPATH@/components/autocomplete.xpt | |
89 | @RESPATH@/components/autoconfig.xpt | |
96ef4151 | 90 | +#endif |
82f4f456 JB |
91 | @RESPATH@/components/browser-element.xpt |
92 | @RESPATH@/browser/components/browsercompsbase.xpt | |
93 | @RESPATH@/browser/components/browser-feeds.xpt | |
94 | @RESPATH@/browser/components/browsermodules.manifest | |
96ef4151 | 95 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
96 | @RESPATH@/components/caps.xpt |
97 | @RESPATH@/components/chrome.xpt | |
98 | @RESPATH@/components/commandhandler.xpt | |
99 | @@ -249,7 +268,9 @@ | |
100 | @RESPATH@/components/filepicker.xpt | |
96ef4151 | 101 | #endif |
82f4f456 | 102 | @RESPATH@/components/find.xpt |
96ef4151 | 103 | +#endif |
82f4f456 | 104 | @RESPATH@/browser/components/fuel.xpt |
96ef4151 | 105 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
106 | @RESPATH@/components/gfx.xpt |
107 | @RESPATH@/components/html5.xpt | |
108 | @RESPATH@/components/htmlparser.xpt | |
109 | @@ -270,7 +291,9 @@ | |
110 | @RESPATH@/components/layout_xul.xpt | |
111 | @RESPATH@/components/locale.xpt | |
112 | @RESPATH@/components/lwbrk.xpt | |
96ef4151 | 113 | +#endif |
82f4f456 | 114 | @RESPATH@/browser/components/migration.xpt |
96ef4151 | 115 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
116 | @RESPATH@/components/mimetype.xpt |
117 | @RESPATH@/components/mozfind.xpt | |
118 | @RESPATH@/components/necko_about.xpt | |
119 | @@ -307,12 +330,16 @@ | |
120 | @RESPATH@/components/rdf.xpt | |
121 | @RESPATH@/components/satchel.xpt | |
122 | @RESPATH@/components/saxparser.xpt | |
96ef4151 | 123 | +#endif |
82f4f456 | 124 | @RESPATH@/browser/components/sessionstore.xpt |
96ef4151 | 125 | +#ifndef LIBXUL_SDK |
82f4f456 | 126 | @RESPATH@/components/services-crypto-component.xpt |
c5cd9be2 | 127 | #ifdef MOZ_CAPTIVEDETECT |
82f4f456 | 128 | @RESPATH@/components/captivedetect.xpt |
c5cd9be2 | 129 | #endif |
08ccc3c5 | 130 | +#endif |
82f4f456 | 131 | @RESPATH@/browser/components/shellservice.xpt |
96ef4151 | 132 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
133 | @RESPATH@/components/shistory.xpt |
134 | @RESPATH@/components/spellchecker.xpt | |
135 | @RESPATH@/components/storage.xpt | |
136 | @@ -354,8 +381,10 @@ | |
137 | @RESPATH@/components/xultmpl.xpt | |
138 | @RESPATH@/components/zipwriter.xpt | |
139 | @RESPATH@/components/telemetry.xpt | |
c5cd9be2 | 140 | +#endif |
08ccc3c5 JB |
141 | |
142 | ; JavaScript components | |
c5cd9be2 | 143 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
144 | @RESPATH@/components/ChromeNotifications.js |
145 | @RESPATH@/components/ChromeNotifications.manifest | |
146 | @RESPATH@/components/ConsoleAPI.manifest | |
147 | @@ -364,6 +393,7 @@ | |
148 | @RESPATH@/components/BrowserElementParent.js | |
149 | @RESPATH@/components/FeedProcessor.manifest | |
150 | @RESPATH@/components/FeedProcessor.js | |
96ef4151 | 151 | +#endif |
82f4f456 JB |
152 | @RESPATH@/browser/components/BrowserFeeds.manifest |
153 | @RESPATH@/browser/components/FeedConverter.js | |
154 | @RESPATH@/browser/components/FeedWriter.js | |
155 | @@ -385,6 +415,7 @@ | |
156 | @RESPATH@/browser/components/Experiments.manifest | |
157 | @RESPATH@/browser/components/ExperimentsService.js | |
158 | @RESPATH@/browser/components/translation.manifest | |
96ef4151 | 159 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
160 | @RESPATH@/components/Downloads.manifest |
161 | @RESPATH@/components/DownloadLegacy.js | |
162 | @RESPATH@/components/BrowserPageThumbs.manifest | |
163 | @@ -414,8 +445,10 @@ | |
164 | @RESPATH@/components/nsHelperAppDlg.js | |
165 | @RESPATH@/components/NetworkGeolocationProvider.manifest | |
166 | @RESPATH@/components/NetworkGeolocationProvider.js | |
96ef4151 | 167 | +#endif |
82f4f456 JB |
168 | @RESPATH@/browser/components/nsSidebar.manifest |
169 | @RESPATH@/browser/components/nsSidebar.js | |
96ef4151 | 170 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
171 | @RESPATH@/components/extensions.manifest |
172 | @RESPATH@/components/addonManager.js | |
173 | @RESPATH@/components/amContentHandler.js | |
174 | @@ -436,12 +469,16 @@ | |
175 | @RESPATH@/components/ProcessSingleton.manifest | |
176 | @RESPATH@/components/MainProcessSingleton.js | |
177 | @RESPATH@/components/ContentProcessSingleton.js | |
96ef4151 | 178 | +#endif |
82f4f456 JB |
179 | @RESPATH@/browser/components/nsSessionStore.manifest |
180 | @RESPATH@/browser/components/nsSessionStartup.js | |
181 | @RESPATH@/browser/components/nsSessionStore.js | |
96ef4151 | 182 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
183 | @RESPATH@/components/nsURLFormatter.manifest |
184 | @RESPATH@/components/nsURLFormatter.js | |
96ef4151 | 185 | +#endif |
82f4f456 | 186 | @RESPATH@/browser/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@ |
96ef4151 | 187 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
188 | @RESPATH@/components/txEXSLTRegExFunctions.manifest |
189 | @RESPATH@/components/txEXSLTRegExFunctions.js | |
190 | @RESPATH@/components/toolkitplaces.manifest | |
191 | @@ -452,7 +489,9 @@ | |
192 | @RESPATH@/components/UnifiedComplete.manifest | |
193 | @RESPATH@/components/UnifiedComplete.js | |
194 | @RESPATH@/components/nsPlacesExpiration.js | |
96ef4151 | 195 | +#endif |
82f4f456 | 196 | @RESPATH@/browser/components/PlacesProtocolHandler.js |
96ef4151 | 197 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
198 | @RESPATH@/components/PlacesCategoriesStarter.js |
199 | @RESPATH@/components/ColorAnalyzer.js | |
200 | @RESPATH@/components/PageThumbsProtocol.js | |
201 | @@ -476,6 +515,7 @@ | |
202 | @RESPATH@/components/FormAutofillStartup.js | |
203 | @RESPATH@/components/contentAreaDropListener.manifest | |
204 | @RESPATH@/components/contentAreaDropListener.js | |
96ef4151 | 205 | +#endif |
82f4f456 JB |
206 | @RESPATH@/browser/components/BrowserProfileMigrators.manifest |
207 | @RESPATH@/browser/components/ProfileMigrator.js | |
208 | @RESPATH@/browser/components/ChromeProfileMigrator.js | |
209 | @@ -487,6 +527,7 @@ | |
08ccc3c5 | 210 | #ifdef XP_MACOSX |
82f4f456 | 211 | @RESPATH@/browser/components/SafariProfileMigrator.js |
96ef4151 | 212 | #endif |
c5cd9be2 | 213 | +#ifndef LIBXUL_SDK |
08ccc3c5 | 214 | #ifdef MOZ_ENABLE_DBUS |
82f4f456 | 215 | @RESPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@ |
96ef4151 | 216 | #endif |
82f4f456 JB |
217 | @@ -612,19 +653,24 @@ |
218 | @RESPATH@/components/TestInterfaceJS.js | |
219 | @RESPATH@/components/TestInterfaceJS.manifest | |
96ef4151 | 220 | #endif |
96ef4151 | 221 | +#endif |
c5cd9be2 | 222 | |
96ef4151 | 223 | ; Modules |
82f4f456 | 224 | @RESPATH@/browser/modules/* |
c5cd9be2 | 225 | +#ifndef LIBXUL_SDK |
82f4f456 | 226 | @RESPATH@/modules/* |
c5cd9be2 | 227 | +#endif |
96ef4151 | 228 | |
96ef4151 JB |
229 | ; Safe Browsing |
230 | #ifdef MOZ_URL_CLASSIFIER | |
c5cd9be2 | 231 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
232 | @RESPATH@/components/nsURLClassifier.manifest |
233 | @RESPATH@/components/nsUrlClassifierHashCompleter.js | |
234 | @RESPATH@/components/nsUrlClassifierListManager.js | |
235 | @RESPATH@/components/nsUrlClassifierLib.js | |
236 | @RESPATH@/components/url-classifier.xpt | |
96ef4151 JB |
237 | #endif |
238 | +#endif | |
239 | ||
240 | ; ANGLE GLES-on-D3D rendering library | |
241 | #ifdef MOZ_ANGLE_RENDERER | |
82f4f456 | 242 | @@ -652,10 +698,12 @@ |
08ccc3c5 | 243 | #endif |
82f4f456 JB |
244 | @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
245 | @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png | |
96ef4151 | 246 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
247 | @RESPATH@/chrome/toolkit@JAREXT@ |
248 | @RESPATH@/chrome/toolkit.manifest | |
249 | @RESPATH@/chrome/recording.manifest | |
250 | @RESPATH@/chrome/recording/* | |
96ef4151 | 251 | +#endif |
c5cd9be2 | 252 | #ifdef MOZ_GTK |
82f4f456 JB |
253 | @RESPATH@/browser/chrome/icons/default/default16.png |
254 | @RESPATH@/browser/chrome/icons/default/default32.png | |
255 | @@ -683,9 +731,11 @@ | |
c5cd9be2 | 256 | ; All the pref files must be part of base to prevent migration bugs |
82f4f456 JB |
257 | @RESPATH@/browser/@PREF_DIR@/firefox.js |
258 | @RESPATH@/browser/@PREF_DIR@/firefox-branding.js | |
96ef4151 | 259 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
260 | @RESPATH@/greprefs.js |
261 | @RESPATH@/defaults/autoconfig/platform.js | |
262 | @RESPATH@/defaults/autoconfig/prefcalls.js | |
c5cd9be2 | 263 | +#endif |
82f4f456 | 264 | @RESPATH@/browser/defaults/profile/prefs.js |
c5cd9be2 JB |
265 | |
266 | #ifndef LIBXUL_SDK | |
82f4f456 JB |
267 | @@ -695,7 +745,7 @@ |
268 | @RESPATH@/defaults/pref/channel-prefs.js | |
96ef4151 | 269 | #else |
c5cd9be2 | 270 | ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) |
82f4f456 JB |
271 | -@RESPATH@/@PREF_DIR@/channel-prefs.js |
272 | +@RESPATH@/browser/@PREF_DIR@/channel-prefs.js | |
c5cd9be2 | 273 | #endif |
96ef4151 | 274 | |
c5cd9be2 | 275 | ; Services (gre) prefs |
82f4f456 JB |
276 | @@ -703,11 +753,14 @@ |
277 | @RESPATH@/defaults/pref/services-notifications.js | |
96ef4151 | 278 | #endif |
c5cd9be2 | 279 | #ifdef MOZ_SERVICES_SYNC |
96ef4151 | 280 | +#ifndef LIBXUL_SDK |
82f4f456 | 281 | @RESPATH@/defaults/pref/services-sync.js |
96ef4151 | 282 | #endif |
c5cd9be2 | 283 | +#endif |
96ef4151 | 284 | |
c5cd9be2 JB |
285 | ; [Layout Engine Resources] |
286 | ; Style Sheets, Graphics and other Resources used by the layout engine. | |
96ef4151 | 287 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
288 | @RESPATH@/res/EditorOverride.css |
289 | @RESPATH@/res/contenteditable.css | |
290 | @RESPATH@/res/designmode.css | |
291 | @@ -745,11 +798,14 @@ | |
08ccc3c5 | 292 | #ifdef XP_MACOSX |
82f4f456 | 293 | @RESPATH@/res/MainMenu.nib/ |
08ccc3c5 JB |
294 | #endif |
295 | +#endif | |
296 | ||
297 | ; svg | |
298 | +#ifndef LIBXUL_SDK | |
82f4f456 JB |
299 | @RESPATH@/res/svg.css |
300 | @RESPATH@/components/dom_svg.xpt | |
301 | @RESPATH@/components/dom_smil.xpt | |
96ef4151 JB |
302 | +#endif |
303 | ||
304 | ; [Personal Security Manager] | |
305 | ; | |
82f4f456 | 306 | @@ -770,11 +826,13 @@ |
96ef4151 | 307 | #endif |
82f4f456 | 308 | @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ |
534550cc | 309 | #endif |
96ef4151 | 310 | +#ifndef LIBXUL_SDK |
82f4f456 JB |
311 | @RESPATH@/chrome/pippki@JAREXT@ |
312 | @RESPATH@/chrome/pippki.manifest | |
313 | @RESPATH@/components/pipboot.xpt | |
314 | @RESPATH@/components/pipnss.xpt | |
315 | @RESPATH@/components/pippki.xpt | |
96ef4151 JB |
316 | +#endif |
317 | ||
534550cc JB |
318 | ; For process sandboxing |
319 | #if defined(MOZ_SANDBOX) | |
82f4f456 JB |
320 | @@ -887,9 +945,11 @@ |
321 | @RESPATH@/metro/modules | |
a9334f16 JB |
322 | #endif |
323 | ||
324 | +#ifndef LIBXUL_SDK | |
82f4f456 JB |
325 | @RESPATH@/components/DataStore.manifest |
326 | @RESPATH@/components/DataStoreImpl.js | |
327 | @RESPATH@/components/dom_datastore.xpt | |
a9334f16 JB |
328 | +#endif |
329 | ||
82f4f456 JB |
330 | ; Shutdown Terminator |
331 | @RESPATH@/components/nsTerminatorTelemetry.js |