mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 451909 kill MOZ_XUL_APP now that all apps set it. docshell/toolkit cleanup r=benjamin, makefile cleanups r=ted

This commit is contained in:
Arpad Borsos 2008-09-02 10:45:14 +01:00
Родитель 891d60d295
Коммит 2b2fcd0d14
21 изменённых файлов: 6 добавлений и 114 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
docshell/base/nsAboutRedirector.cpp
Просмотреть файл

@ -73,11 +73,7 @@ static RedirEntry kRedirMap[] = {
#ifdef MOZ_CRASHREPORTER
{ "crashes", "chrome://global/content/crashes.xhtml", 0 },
#endif
#ifdef MOZ_XUL_APP
{ "logo", "chrome://branding/content/about.png",
#else
{ "logo", "chrome://global/content/logo.gif",
#endif
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
{ "buildconfig", "chrome://global/content/buildconfig.html",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },

4
embedding/Makefile.in
Просмотреть файл

@ -48,10 +48,6 @@ PACKAGE_FILE = embed.pkg
DIRS = base components browser
ifndef MOZ_XUL_APP
DIRS += lite
endif
ifdef ENABLE_TESTS
XPCSHELL_TESTS = tests/unit
endif

3
embedding/browser/Makefile.in
Просмотреть файл

@ -44,9 +44,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = webBrowser build
ifndef MOZ_XUL_APP
DIRS += chrome
endif
ifeq ($(OS_ARCH),WINNT)
ifndef MOZ_NO_ACTIVEX_SUPPORT

2
embedding/tests/Makefile.in
Просмотреть файл

@ -42,10 +42,8 @@ endif
ifeq ($(OS_ARCH),WINNT)
# disable winembed in non-libxul
ifndef BUILD_STATIC_LIBS
ifdef MOZ_XUL_APP
DIRS = winEmbed
endif
endif
endif

2
embedding/tests/os2Embed/Makefile.in
Просмотреть файл

@ -102,9 +102,7 @@ EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS)
EXTRA_LIBS += -L$(DEPTH)/dist/lib/components
EXTRA_LIBS += $(EXTRA_DSO_LIBS) $(STATIC_EXTRA_LIBS)
ifdef MOZ_XUL_APP
EXTRA_LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
endif # MOZ_XUL_APP
DEFINES += $(STATIC_DEFINES)
CPPSRCS += $(STATIC_CPPSRCS)

4
extensions/layout-debug/src/Makefile.in
Просмотреть файл

@ -66,10 +66,6 @@ REQUIRES = xpcom \
toolkitcomps \
$(NULL)
ifndef MOZ_XUL_APP
REQUIRES += appcomps
endif
XPIDLSRCS = \
nsILayoutRegressionTester.idl \
nsILayoutDebuggingTools.idl \

2
extensions/pref/autoconfig/Makefile.in
Просмотреть файл

@ -43,7 +43,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = autoconfig
DIRS = public resources src
DIRS = public src
include $(topsrcdir)/config/rules.mk

5
extensions/spellcheck/hunspell/src/Makefile.in
Просмотреть файл

@ -54,6 +54,7 @@ REQUIRES = xpcom \
$(NULL)
CPPSRCS = mozHunspell.cpp \
mozHunspellDirProvider.cpp \
$(NULL)
ifndef MOZ_NATIVE_HUNSPELL
@ -67,10 +68,6 @@ CPPSRCS += affentry.cpp \
$(NULL)
endif
ifdef MOZ_XUL_APP
CPPSRCS += mozHunspellDirProvider.cpp
endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(XPCOM_LIBS) \

2
extensions/widgetutils/Makefile.in
Просмотреть файл

@ -9,7 +9,6 @@ include $(DEPTH)/config/autoconf.mk
MODULE = widgetutils
XPI_NAME = widgetutils
ifdef MOZ_XUL_APP
INSTALL_EXTENSION_ID = widgetutils@extensions.mozilla.org
DIST_FILES = install.rdf
NO_JAR_AUTO_REG = 1
@ -25,7 +24,6 @@ XULAPP_DEFINES = \
ifdef TARGET_XPCOM_ABI
XULAPP_DEFINES += -DEM_ABI=$(OS_TARGET)_$(TARGET_XPCOM_ABI)
endif
endif
DIRS = src
#DIRS += public

1
netwerk/Makefile.in
Просмотреть файл

@ -55,7 +55,6 @@ DIRS = \
protocol \
system \
build \
resources \
locales \
$(NULL)

2
security/manager/ssl/Makefile.in
Просмотреть файл

@ -42,7 +42,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
MODULE = pipnss
DIRS = resources src public
DIRS = src public
XPCSHELL_TESTS = tests

3
toolkit/components/Makefile.in
Просмотреть файл

@ -57,7 +57,6 @@ DIRS += \
# These component dirs are built only for XUL apps
ifdef MOZ_XUL_APP
DIRS += \
apppicker \
filepicker \
@ -133,8 +132,6 @@ DIRS += \
EXTRA_PP_COMPONENTS = nsDefaultCLH.js
endif # MOZ_XUL_APP
ifeq ($(MOZ_BUILD_APP),camino)
DIRS += autocomplete/public
DIRS += downloads/public

37
toolkit/components/remote/nsGTKRemoteService.cpp
Просмотреть файл

@ -70,12 +70,8 @@
#include "nsGTKToolkit.h"
#endif
#ifdef MOZ_XUL_APP
#include "nsICommandLineRunner.h"
#include "nsXULAppAPI.h"
#else
#include "nsISuiteRemoteService.h"
#endif
#define MOZILLA_VERSION_PROP "_MOZILLA_VERSION"
#define MOZILLA_LOCK_PROP "_MOZILLA_LOCK"
@ -94,11 +90,7 @@
#define TO_LITTLE_ENDIAN32(x) (x)
#endif
#ifdef MOZ_XUL_APP
const unsigned char kRemoteVersion[] = "5.1";
#else
const unsigned char kRemoteVersion[] = "5.0";
#endif
NS_IMPL_ISUPPORTS2(nsGTKRemoteService,
nsIRemoteService,
@ -274,32 +266,6 @@ nsGTKRemoteService::EnsureAtoms(void)
sMozCommandLineAtom = XAtoms[i++];
}
#ifndef MOZ_XUL_APP
const char*
nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow, PRUint32 aTimestamp)
{
nsresult rv;
nsCOMPtr<nsISuiteRemoteService> remote
(do_GetService("@mozilla.org/browser/xremoteservice;2"));
if (!remote)
return "509 internal error";
rv = remote->ParseCommand(aCommand, aWindow);
if (NS_SUCCEEDED(rv))
return "200 executed command";
if (NS_ERROR_INVALID_ARG == rv)
return "500 command not parseable";
if (NS_ERROR_NOT_IMPLEMENTED == rv)
return "501 unrecognized command";
return "509 internal error";
}
#else //MOZ_XUL_APP
// Set desktop startup ID to the passed ID, if there is one, so that any created
// windows get created with the right window manager metadata, and any windows
// that get new tabs and are activated also get the right WM metadata.
@ -483,7 +449,6 @@ nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow,
return "200 executed command";
}
#endif // MOZ_XUL_APP
void
nsGTKRemoteService::HandleCommandsFor(GtkWidget* widget,
@ -584,7 +549,6 @@ nsGTKRemoteService::HandlePropertyChange(GtkWidget *aWidget,
return TRUE;
}
#ifdef MOZ_XUL_APP
if (pevent->state == GDK_PROPERTY_NEW_VALUE &&
CMP_GATOM_XATOM(pevent->atom, sMozCommandLineAtom)) {
@ -628,7 +592,6 @@ nsGTKRemoteService::HandlePropertyChange(GtkWidget *aWidget,
XFree(data);
return TRUE;
}
#endif //MOZ_XUL_APP
if (pevent->state == GDK_PROPERTY_NEW_VALUE &&
CMP_GATOM_XATOM(pevent->atom, sMozResponseAtom)) {

2
toolkit/components/remote/nsGTKRemoteService.h
Просмотреть файл

@ -83,10 +83,8 @@ private:
static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow,
PRUint32 aTimestamp);
#ifdef MOZ_XUL_APP
static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow,
PRUint32 aTimestamp);
#endif
static gboolean HandlePropertyChange(GtkWidget *widget,
GdkEventProperty *event,

4
toolkit/components/remote/nsPhRemoteService.cpp
Просмотреть файл

@ -28,12 +28,8 @@
#include "nsIServiceManager.h"
#include "nsCRT.h"
#ifdef MOZ_XUL_APP
#include "nsICommandLineRunner.h"
#include "nsXULAppAPI.h"
#else
#include "nsISuiteRemoteService.h"
#endif
#include <Pt.h>

8
toolkit/components/remote/nsQtRemoteService.cpp
Просмотреть файл

@ -66,12 +66,8 @@
//#include "nsGTKToolkit.h"
#endif
#ifdef MOZ_XUL_APP
#include "nsICommandLineRunner.h"
#include "nsXULAppAPI.h"
#else
#include "nsISuiteRemoteService.h"
#endif
#define MOZILLA_VERSION_PROP "_MOZILLA_VERSION"
#define MOZILLA_LOCK_PROP "_MOZILLA_LOCK"
@ -90,11 +86,7 @@
#define TO_LITTLE_ENDIAN32(x) (x)
#endif
#ifdef MOZ_XUL_APP
const unsigned char kRemoteVersion[] = "5.1";
#else
const unsigned char kRemoteVersion[] = "5.0";
#endif
NS_IMPL_ISUPPORTS2(nsQtRemoteService,
nsIRemoteService,

10
toolkit/mozapps/update/src/nsUpdateService.js.in
Просмотреть файл

@ -2806,7 +2806,6 @@ TimerManager.prototype = {
}
};
#ifdef MOZ_XUL_APP
/**
* UpdatePrompt
* An object which can prompt the user with information about updates, request
@ -3084,7 +3083,6 @@ UpdatePrompt.prototype = {
return this;
}
};
#endif
var gModule = {
registerSelf: function(componentManager, fileSpec, location, type) {
@ -3127,13 +3125,11 @@ var gModule = {
className : "Update Checker",
factory : makeFactory(Checker)
},
#ifdef MOZ_XUL_APP
prompt: { CID : Components.ID("{27ABA825-35B5-4018-9FDD-F99250A0E722}"),
contractID : "@mozilla.org/updates/update-prompt;1",
className : "Update Prompt",
factory : makeFactory(UpdatePrompt)
},
#endif
timers: { CID : Components.ID("{B322A5C0-A419-484E-96BA-D7182163899F}"),
contractID : "@mozilla.org/updates/timer-manager;1",
className : "Timer Manager",
@ -3177,16 +3173,12 @@ function NSGetModule(compMgr, fileSpec) {
* the specified update, false otherwise.
*/
function isCompatible(update) {
#ifdef MOZ_XUL_APP
var em =
Components.classes["@mozilla.org/extensions/manager;1"].
getService(nsIExtensionManager);
var items = em.getIncompatibleItemList("", update.extensionVersion,
update.platformVersion, nsIUpdateItem.TYPE_ANY, false, { });
return items.length == 0;
#else
return true;
#endif
}
/**
@ -3205,7 +3197,6 @@ function showPromptIfNoIncompatibilities(update) {
prompter.showUpdateAvailable(update);
}
#ifdef MOZ_XUL_APP
/**
* Determines if an addon is compatible with a particular update.
* @param addon
@ -3314,6 +3305,5 @@ function showPromptIfNoIncompatibilities(update) {
em.update([], 0, mode, listener);
}
else
#endif
showPrompt(update);
}

3
toolkit/toolkit-makefiles.sh
Просмотреть файл

@ -400,7 +400,6 @@ MAKEFILES_netwerk="
netwerk/streamconv/test/Makefile
netwerk/test/Makefile
netwerk/testserver/Makefile
netwerk/resources/Makefile
netwerk/locales/Makefile
netwerk/system/Makefile
netwerk/system/win32/Makefile
@ -608,7 +607,6 @@ MAKEFILES_embedding="
embedding/browser/activex/src/control/Makefile
embedding/browser/activex/src/control_kicker/Makefile
embedding/browser/build/Makefile
embedding/browser/chrome/Makefile
embedding/browser/webBrowser/Makefile
embedding/browser/gtk/Makefile
embedding/browser/gtk/src/Makefile
@ -890,7 +888,6 @@ if test -n "$MOZ_PSM"; then
security/manager/boot/public/Makefile
security/manager/ssl/Makefile
security/manager/ssl/src/Makefile
security/manager/ssl/resources/Makefile
security/manager/ssl/public/Makefile
security/manager/pki/Makefile
security/manager/pki/resources/Makefile

14
toolkit/toolkit-tiers.mk
Просмотреть файл

@ -189,9 +189,7 @@ endif
# "toolkit" was.
#
tier_toolkit_dirs += chrome
tier_toolkit_dirs += profile
tier_toolkit_dirs += chrome profile
# This must preceed xpfe
ifdef MOZ_JPROF
@ -207,10 +205,6 @@ tier_toolkit_dirs += \
toolkit/components \
$(NULL)
ifndef MOZ_XUL_APP
tier_toolkit_dirs += themes
endif
ifdef MOZ_ENABLE_XREMOTE
tier_toolkit_dirs += widget/src/xremoteclient
endif
@ -219,9 +213,7 @@ ifdef MOZ_SPELLCHECK
tier_toolkit_dirs += extensions/spellcheck
endif
ifdef MOZ_XUL_APP
tier_toolkit_dirs += toolkit
endif
ifdef MOZ_XPINSTALL
tier_toolkit_dirs += xpinstall
@ -243,18 +235,14 @@ tier_toolkit_dirs += extensions/java/xpcom/src
endif
ifndef BUILD_STATIC_LIBS
ifdef MOZ_XUL_APP
ifneq (,$(MOZ_ENABLE_GTK2))
tier_toolkit_dirs += embedding/browser/gtk
endif
endif
endif
ifdef MOZ_XUL_APP
ifndef BUILD_STATIC_LIBS
tier_toolkit_dirs += toolkit/library
endif
endif
ifdef MOZ_ENABLE_LIBXUL
tier_toolkit_dirs += xpcom/stub

6
xpfe/components/download-manager/src/Makefile.in
Просмотреть файл

@ -63,12 +63,10 @@ REQUIRES = xpcom \
widget \
pref \
embed_base \
alerts \
toolkitcomps \
$(NULL)
ifdef MOZ_XUL_APP
REQUIRES += alerts toolkitcomps
endif
CPPSRCS = \
nsDownloadManager.cpp \
$(NULL)

2
xpfe/components/winhooks/Makefile.in
Просмотреть файл

@ -72,9 +72,7 @@ REQUIRES = \
FORCE_STATIC_LIB = 1
ifdef MOZ_XUL_APP
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
endif
include $(topsrcdir)/config/rules.mk