mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Backout 91710a945b44 (bug 737821) due to r-. r=mybad
This commit is contained in:
Ryan VanderMeulen
parent
7f6c66e7df
commit
2ef0142f86
@ -42,7 +42,6 @@
|
||||
#endif
|
||||
|
||||
[xpcom]
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/dependentlibs.list
|
||||
#ifdef XP_WIN32
|
||||
@BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
|
||||
@ -90,43 +89,35 @@
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
[browser]
|
||||
; [Base Browser Files]
|
||||
#ifndef XP_UNIX
|
||||
@BINPATH@/@MOZ_APP_NAME@.exe
|
||||
#else
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/@MOZ_APP_NAME@-bin
|
||||
#endif
|
||||
@BINPATH@/@MOZ_APP_NAME@
|
||||
#endif
|
||||
@BINPATH@/application.ini
|
||||
#ifdef MOZ_UPDATER
|
||||
@BINPATH@/update-settings.ini
|
||||
#endif
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/platform.ini
|
||||
#ifndef XP_OS2
|
||||
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
|
||||
#else
|
||||
@BINPATH@/mozsqlt3@DLL_SUFFIX@
|
||||
#endif
|
||||
#endif
|
||||
@BINPATH@/blocklist.xml
|
||||
#ifdef XP_UNIX
|
||||
@BINPATH@/run-mozilla.sh
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
#ifndef XP_MACOSX
|
||||
@BINPATH@/mozilla-xremote-client
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
; [Components]
|
||||
@BINPATH@/components/components.manifest
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/alerts.xpt
|
||||
#ifdef ACCESSIBILITY
|
||||
#ifdef XP_WIN32
|
||||
@ -139,10 +130,8 @@
|
||||
@BINPATH@/components/appstartup.xpt
|
||||
@BINPATH@/components/autocomplete.xpt
|
||||
@BINPATH@/components/autoconfig.xpt
|
||||
#endif
|
||||
@BINPATH@/components/browsercompsbase.xpt
|
||||
@BINPATH@/components/browser-feeds.xpt
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/caps.xpt
|
||||
@BINPATH@/components/chrome.xpt
|
||||
@BINPATH@/components/commandhandler.xpt
|
||||
@ -206,9 +195,7 @@
|
||||
@BINPATH@/components/filepicker.xpt
|
||||
#endif
|
||||
@BINPATH@/components/find.xpt
|
||||
#endif
|
||||
@BINPATH@/components/fuel.xpt
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/gfx.xpt
|
||||
@BINPATH@/components/html5.xpt
|
||||
@BINPATH@/components/htmlparser.xpt
|
||||
@ -231,9 +218,7 @@
|
||||
@BINPATH@/components/layout_xul.xpt
|
||||
@BINPATH@/components/locale.xpt
|
||||
@BINPATH@/components/lwbrk.xpt
|
||||
#endif
|
||||
@BINPATH@/components/migration.xpt
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/mimetype.xpt
|
||||
@BINPATH@/components/mozfind.xpt
|
||||
@BINPATH@/components/necko_about.xpt
|
||||
@ -265,13 +250,9 @@
|
||||
@BINPATH@/components/rdf.xpt
|
||||
@BINPATH@/components/satchel.xpt
|
||||
@BINPATH@/components/saxparser.xpt
|
||||
#endif
|
||||
@BINPATH@/components/sessionstore.xpt
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/services-crypto-component.xpt
|
||||
#endif
|
||||
@BINPATH@/components/shellservice.xpt
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/shistory.xpt
|
||||
@BINPATH@/components/spellchecker.xpt
|
||||
@BINPATH@/components/storage.xpt
|
||||
@ -308,17 +289,14 @@
|
||||
@BINPATH@/components/xultmpl.xpt
|
||||
@BINPATH@/components/zipwriter.xpt
|
||||
@BINPATH@/components/telemetry.xpt
|
||||
#endif
|
||||
|
||||
; JavaScript components
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/ConsoleAPI.manifest
|
||||
@BINPATH@/components/ConsoleAPI.js
|
||||
@BINPATH@/components/BrowserElementAPI.manifest
|
||||
@BINPATH@/components/BrowserElementAPI.js
|
||||
@BINPATH@/components/FeedProcessor.manifest
|
||||
@BINPATH@/components/FeedProcessor.js
|
||||
#endif
|
||||
@BINPATH@/components/BrowserFeeds.manifest
|
||||
@BINPATH@/components/FeedConverter.js
|
||||
@BINPATH@/components/FeedWriter.js
|
||||
@ -337,7 +315,6 @@
|
||||
@BINPATH@/components/BrowserPageThumbs.manifest
|
||||
@BINPATH@/components/nsPrivateBrowsingService.manifest
|
||||
@BINPATH@/components/nsPrivateBrowsingService.js
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/toolkitsearch.manifest
|
||||
@BINPATH@/components/nsSearchService.js
|
||||
@BINPATH@/components/nsSearchSuggestions.js
|
||||
@ -364,10 +341,8 @@
|
||||
@BINPATH@/components/NetworkGeolocationProvider.js
|
||||
@BINPATH@/components/GPSDGeolocationProvider.manifest
|
||||
@BINPATH@/components/GPSDGeolocationProvider.js
|
||||
#endif
|
||||
@BINPATH@/components/nsSidebar.manifest
|
||||
@BINPATH@/components/nsSidebar.js
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/extensions.manifest
|
||||
@BINPATH@/components/addonManager.js
|
||||
@BINPATH@/components/amContentHandler.js
|
||||
@ -381,20 +356,16 @@
|
||||
@BINPATH@/components/nsUpdateTimerManager.manifest
|
||||
@BINPATH@/components/nsUpdateTimerManager.js
|
||||
@BINPATH@/components/pluginGlue.manifest
|
||||
#endif
|
||||
@BINPATH@/components/nsSessionStore.manifest
|
||||
@BINPATH@/components/nsSessionStartup.js
|
||||
@BINPATH@/components/nsSessionStore.js
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/nsURLFormatter.manifest
|
||||
@BINPATH@/components/nsURLFormatter.js
|
||||
#endif
|
||||
#ifndef XP_OS2
|
||||
@BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
|
||||
#else
|
||||
@BINPATH@/components/brwsrcmp@DLL_SUFFIX@
|
||||
#endif
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/txEXSLTRegExFunctions.manifest
|
||||
@BINPATH@/components/txEXSLTRegExFunctions.js
|
||||
@BINPATH@/components/toolkitplaces.manifest
|
||||
@ -403,13 +374,9 @@
|
||||
@BINPATH@/components/nsPlacesAutoComplete.manifest
|
||||
@BINPATH@/components/nsPlacesAutoComplete.js
|
||||
@BINPATH@/components/nsPlacesExpiration.js
|
||||
#endif
|
||||
@BINPATH@/components/PlacesProtocolHandler.js
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/PlacesCategoriesStarter.js
|
||||
#endif
|
||||
@BINPATH@/components/PageThumbsProtocol.js
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/nsDefaultCLH.manifest
|
||||
@BINPATH@/components/nsDefaultCLH.js
|
||||
@BINPATH@/components/nsContentPrefService.manifest
|
||||
@ -460,12 +427,10 @@
|
||||
@BINPATH@/components/nsINIProcessor.js
|
||||
@BINPATH@/components/nsPrompter.manifest
|
||||
@BINPATH@/components/nsPrompter.js
|
||||
#endif
|
||||
#ifdef MOZ_SERVICES_SYNC
|
||||
@BINPATH@/components/SyncComponents.manifest
|
||||
@BINPATH@/components/Weave.js
|
||||
#endif
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/TelemetryPing.js
|
||||
@BINPATH@/components/TelemetryPing.manifest
|
||||
@BINPATH@/components/messageWakeupService.js
|
||||
@ -477,7 +442,6 @@
|
||||
|
||||
@BINPATH@/components/ContactManager.js
|
||||
@BINPATH@/components/ContactManager.manifest
|
||||
#endif
|
||||
|
||||
; Modules
|
||||
@BINPATH@/modules/*
|
||||
@ -486,21 +450,17 @@
|
||||
#ifdef MOZ_SAFE_BROWSING
|
||||
@BINPATH@/components/nsSafebrowsingApplication.manifest
|
||||
@BINPATH@/components/nsSafebrowsingApplication.js
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/components/nsURLClassifier.manifest
|
||||
@BINPATH@/components/nsUrlClassifierHashCompleter.js
|
||||
@BINPATH@/components/nsUrlClassifierListManager.js
|
||||
@BINPATH@/components/nsUrlClassifierLib.js
|
||||
@BINPATH@/components/url-classifier.xpt
|
||||
#endif
|
||||
#endif
|
||||
|
||||
; GNOME hooks
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
#ifdef MOZ_ENABLE_GNOME_COMPONENT
|
||||
@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
; ANGLE GLES-on-D3D rendering library
|
||||
#ifdef MOZ_ANGLE
|
||||
@ -520,10 +480,8 @@
|
||||
#ifdef SHIP_FEEDBACK
|
||||
@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
|
||||
#endif
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/chrome/toolkit@JAREXT@
|
||||
@BINPATH@/chrome/toolkit.manifest
|
||||
#endif
|
||||
#ifdef MOZ_GTK2
|
||||
@BINPATH@/chrome/icons/default/default16.png
|
||||
@BINPATH@/chrome/icons/default/default32.png
|
||||
@ -546,15 +504,12 @@
|
||||
#ifdef MOZ_SERVICES_SYNC
|
||||
@BINPATH@/@PREF_DIR@/services-sync.js
|
||||
#endif
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
@BINPATH@/greprefs.js
|
||||
@BINPATH@/defaults/autoconfig/platform.js
|
||||
@BINPATH@/defaults/autoconfig/prefcalls.js
|
||||
#endif
|
||||
@BINPATH@/defaults/profile/prefs.js
|
||||
|
||||
; [Layout Engine Resources]
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
; Style Sheets, Graphics and other Resources used by the layout engine.
|
||||
@BINPATH@/res/EditorOverride.css
|
||||
@BINPATH@/res/contenteditable.css
|
||||
@ -597,11 +552,9 @@
|
||||
@BINPATH@/res/svg.css
|
||||
@BINPATH@/components/dom_svg.xpt
|
||||
@BINPATH@/components/dom_smil.xpt
|
||||
#endif
|
||||
|
||||
; [Personal Security Manager]
|
||||
;
|
||||
#ifndef SYSTEM_LIBXUL
|
||||
; NSS libraries are signed in the staging directory,
|
||||
; meaning their .chk files are created there directly.
|
||||
;
|
||||
@ -627,7 +580,6 @@ bin/libfreebl_32fpu_3.so
|
||||
bin/libfreebl_32int_3.so
|
||||
bin/libfreebl_32int64_3.so
|
||||
#endif
|
||||
#endif
|
||||
|
||||
; [Updater]
|
||||
;
|
||||
|
||||
@ -4186,10 +4186,6 @@ MOZ_ARG_WITH_BOOL(system-libxul,
|
||||
[ --with-system-libxul Use system installed libxul SDK],
|
||||
SYSTEM_LIBXUL=1)
|
||||
|
||||
if test -n "$SYSTEM_LIBXUL"; then
|
||||
AC_DEFINE(SYSTEM_LIBXUL)
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = If NSPR was not detected in the system,
|
||||
dnl = use the one in the source tree (mozilla/nsprpub)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user