зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1344038
- Move the gio protocol handler under netwerk/protocol. r=karlt
Historically, we had support for some GNOME VFS protocols through the gnomevfs library, and this was under extension. This may not have been built by default when it was introduced, but GNOME upstream moved those things into Gtk itself, and we then got support for the new Gio-based protocol, similar to what we had through the gnomevfs library. Time passes, and we switched off the gnomevfs library entirely, and enabled the Gio-based protocol handlers by default. We then removed everything related to the gnomevfs library. Fast forward to now, and disabling Gio support in Firefox just doesn't make sense, and leaving the gio protocol handler as an extension doesn't make sense either. As it is a protocol handler, its natural place is under netwerk/protocol, which is where we're moving it here. The netwerk/protocol subdirectories being handled automatically, we don't need to add the moved directory in any DIRS variable. --HG-- rename : extensions/gio/moz.build => netwerk/protocol/gio/moz.build rename : extensions/gio/nsGIOProtocolHandler.cpp => netwerk/protocol/gio/nsGIOProtocolHandler.cpp extra : rebase_source : fe3c9480cee468aa2a24fd34e569b58e4f2c9c9a
This commit is contained in:
Родитель
a403bc4470
Коммит
753d2ac01e
|
@ -38,7 +38,6 @@ MOZ_ENABLE_SIGNMAR=1
|
|||
|
||||
MOZ_APP_VERSION=$FIREFOX_VERSION
|
||||
MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
|
||||
MOZ_EXTENSIONS_DEFAULT=" gio"
|
||||
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
|
||||
# MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
|
||||
# specified. It should never point to the "official" branding directory.
|
||||
|
|
|
@ -7,4 +7,3 @@ MOZ_APP_NAME=geckoembed
|
|||
MOZ_APP_DISPLAYNAME=GeckoEmbed
|
||||
MOZ_UPDATER=
|
||||
MOZ_APP_VERSION=$MOZILLA_VERSION
|
||||
MOZ_EXTENSIONS_DEFAULT=" gio"
|
||||
|
|
|
@ -3571,20 +3571,6 @@ MOZ_ARG_ENABLE_STRING(extensions,
|
|||
done],
|
||||
MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT")
|
||||
|
||||
if test -z "$MOZ_ENABLE_GIO" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then
|
||||
# Suppress warning on non-X11 platforms
|
||||
if test -n "$MOZ_X11"; then
|
||||
AC_MSG_WARN([Removing gio from MOZ_EXTENSIONS due to --disable-gio.])
|
||||
fi
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
|
||||
fi
|
||||
|
||||
if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then
|
||||
MOZ_GIO_COMPONENT=1
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
|
||||
fi
|
||||
AC_SUBST(MOZ_GIO_COMPONENT)
|
||||
|
||||
dnl Ensure every extension exists, to avoid mostly-inscrutable error messages
|
||||
dnl when trying to build a nonexistent extension.
|
||||
for extension in $MOZ_EXTENSIONS; do
|
||||
|
|
|
@ -139,9 +139,6 @@ DIRS += [
|
|||
'/other-licenses/snappy',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_GIO_COMPONENT']:
|
||||
DIRS += ['/extensions/gio']
|
||||
|
||||
if CONFIG['MOZ_RUST']:
|
||||
DIRS += [
|
||||
'/toolkit/library/gtest/rust',
|
||||
|
|
Загрузка…
Ссылка в новой задаче