From 6eb93f7dd3e28385b70ca2c4df9deab679d431e7 Mon Sep 17 00:00:00 2001 From: Matheus Kerschbaum Date: Mon, 23 May 2011 18:54:47 +0200 Subject: [PATCH] Bug 648911 - Remove support for non-libxul builds. r=ted,joedrew --- browser/app/Makefile.in | 59 +--- browser/components/build/Makefile.in | 8 - browser/confvars.sh | 2 - browser/installer/Makefile.in | 9 - browser/installer/removed-files.in | 20 +- config/Makefile.in | 2 - config/autoconf.mk.in | 6 - config/config.mk | 54 --- config/rules.mk | 26 +- config/static-config.mk | 119 ------- config/static-rules.mk | 25 -- config/system-headers | 12 - configure.in | 35 -- content/svg/content/src/nsSVGSVGElement.cpp | 10 - content/svg/content/src/nsSVGSVGElement.h | 7 - db/morkreader/Makefile.in | 3 - docshell/build/Makefile.in | 5 - dom/plugins/test/testplugin/Makefile.in | 1 + embedding/tests/Makefile.in | 4 - gfx/Makefile.in | 17 +- gfx/angle/Makefile.in | 4 - gfx/angle/angle-shared.patch | 205 ------------ gfx/angle/include/GLSLANG/ShaderLang.h | 42 +-- gfx/cairo/cairo/src/Makefile.in | 4 - gfx/cairo/cairo/src/cairo-platform.h | 22 -- gfx/cairo/cairo/src/cairo-spline.c | 4 - gfx/cairo/libpixman/src/Makefile.in | 12 - gfx/cairo/libpixman/src/pixman-compiler.h | 4 +- gfx/cairo/pixman-export.patch | 4 +- gfx/harfbuzz/src/Makefile.in | 4 - gfx/layers/opengl/LayerManagerOGLProgram.h | 2 +- gfx/src/gfxCore.h | 17 +- gfx/src/gfxCrashReporterUtils.cpp | 2 +- gfx/tests/Makefile.in | 85 +++-- gfx/thebes/GLContext.h | 13 - gfx/thebes/Makefile.in | 7 - gfx/thebes/gfxDllDeps.cpp | 25 -- intl/uconv/tests/Makefile.in | 53 +-- js/jsd/Makefile.in | 27 +- js/src/config/Makefile.in | 1 - js/src/config/autoconf.mk.in | 1 - js/src/config/config.mk | 54 --- js/src/config/rules.mk | 26 +- js/src/config/system-headers | 12 - js/src/configure.in | 14 - js/src/xpconnect/Makefile.in | 2 - .../xpconnect/loader/mozJSComponentLoader.cpp | 10 - .../xpconnect/loader/mozJSComponentLoader.h | 4 - js/src/xpconnect/shell/xpcshell.cpp | 2 - js/src/xpconnect/src/Makefile.in | 4 - js/src/xpconnect/tests/Makefile.in | 6 +- layout/base/nsPresShell.cpp | 9 - layout/build/Makefile.in | 5 - layout/generic/nsIFrame.h | 8 - layout/style/test/Makefile.in | 11 +- mobile/app/Makefile.in | 18 +- mobile/confvars.sh | 1 - mobile/installer/Makefile.in | 9 - modules/libpr0n/src/SVGDocumentWrapper.cpp | 7 - modules/libpref/src/Makefile.in | 3 - modules/zlib/src/Makefile.in | 9 - modules/zlib/src/mozzconf.h | 4 - netwerk/test/Makefile.in | 23 +- parser/htmlparser/tests/Makefile.in | 9 +- rdf/build/Makefile.in | 6 - toolkit/components/places/Makefile.in | 6 - toolkit/components/startup/nsAppStartup.cpp | 4 - .../url-classifier/tests/Makefile.in | 23 +- toolkit/crashreporter/test/Makefile.in | 20 +- toolkit/library/Makefile.in | 11 - toolkit/library/libxul-config.mk | 4 - toolkit/library/libxul-rules.mk | 7 - toolkit/toolkit-tiers.mk | 6 - toolkit/xre/Makefile.in | 14 +- toolkit/xre/nsAppRunner.cpp | 12 - tools/trace-malloc/Makefile.in | 4 - widget/src/android/GfxInfo.cpp | 4 +- widget/src/cocoa/GfxInfo.mm | 4 +- widget/src/os2/Makefile.in | 4 - widget/src/windows/GfxInfo.cpp | 6 +- widget/src/windows/Makefile.in | 4 - widget/src/windows/nsToolkit.cpp | 40 --- widget/src/windows/tests/Makefile.in | 43 ++- widget/src/xpwidgets/GfxInfoBase.cpp | 6 +- widget/src/xpwidgets/nsNativeTheme.cpp | 4 - xpcom/Makefile.in | 14 +- xpcom/base/nsDebugImpl.cpp | 2 +- xpcom/base/nscore.h | 8 - xpcom/build/Makefile.in | 17 - xpcom/build/dlldeps.cpp | 311 ------------------ xpcom/build/nsXPComInit.cpp | 6 - xpcom/components/nsComponentManager.cpp | 2 - xpcom/glue/nsCycleCollectorUtils.cpp | 8 - xpcom/glue/nsCycleCollectorUtils.h | 4 - xpcom/glue/nsThreadUtils.cpp | 5 - xpcom/glue/nsThreadUtils.h | 4 - xpcom/io/nsSegmentedBuffer.cpp | 2 +- xpcom/stub/Makefile.in | 13 - xpcom/tests/Makefile.in | 51 ++- xpcom/tests/TestPipes.cpp | 7 +- xpcom/tests/bug656331_component/Makefile.in | 1 + xpcom/tests/component/Makefile.in | 1 + xpfe/components/autocomplete/src/Makefile.in | 1 - xpinstall/src/Makefile.in | 12 - xulrunner/app/Makefile.in | 8 - xulrunner/confvars.sh | 2 - 106 files changed, 199 insertions(+), 1724 deletions(-) delete mode 100644 config/static-config.mk delete mode 100644 config/static-rules.mk delete mode 100644 gfx/angle/angle-shared.patch delete mode 100644 gfx/thebes/gfxDllDeps.cpp delete mode 100644 xpcom/build/dlldeps.cpp diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index dd3a89ffa6e1..0f9f7a18ebd2 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -102,51 +102,20 @@ CPPSRCS = nsBrowserApp.cpp LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base -ifdef BUILD_STATIC_LIBS -ifdef _MSC_VER -STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DEPTH)/staticlib -else -STATIC_COMPONENTS_LINKER_PATH = -L$(DEPTH)/staticlib -endif -LIBS += $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) -else ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) LIBS += $(DIST)/bin/XUL +TK_LIBS := $(TK_LIBS) else EXTRA_DSO_LIBS += xul endif -endif - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -TK_LIBS := $(TK_LIBS) -endif - -ifdef MOZ_ENABLE_LIBXUL -APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS) -else -MOZILLA_INTERNAL_API = 1 -APP_XPCOM_LIBS = $(XPCOM_LIBS) -endif LIBS += \ $(STATIC_COMPONENTS_LINKER_PATH) \ $(EXTRA_DSO_LIBS) \ - $(APP_XPCOM_LIBS) \ + $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ $(NULL) -ifdef BUILD_STATIC_LIBS -LIBS += \ - $(MOZ_JS_LIBS) \ - $(TK_LIBS) \ - $(NULL) - -# Add explicit X11 dependency when building against X11 toolkits -ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) -LIBS += $(XLDFLAGS) $(XLIBS) $(ZLIB_LIBS) -endif -endif - ifdef MOZ_JPROF LIBS += -ljprof endif @@ -171,18 +140,6 @@ ifdef _MSC_VER WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup endif -ifdef BUILD_STATIC_LIBS -include $(topsrcdir)/config/static-config.mk - -EXTRA_DEPS += \ - $(STATIC_EXTRA_DEPS) \ - $(NULL) -DEFINES += $(STATIC_DEFINES) -CPPSRCS += $(STATIC_CPPSRCS) -EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS) -EXTRA_LIBS += $(STATIC_EXTRA_LIBS) -endif - ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool) OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32) @@ -195,9 +152,6 @@ RCFLAGS += -DMOZ_PHOENIX -I$(srcdir) else RCFLAGS += -DMOZ_PHOENIX --include-dir $(srcdir) endif -ifdef BUILD_STATIC_LIBS -RCFLAGS += -DMOZ_STATIC_BUILD -endif ifdef DEBUG RCFLAGS += -DDEBUG endif @@ -206,9 +160,6 @@ endif ifeq ($(OS_ARCH),OS2) RESFILE=splashos2.res RCFLAGS += -DMOZ_PHOENIX -ifdef BUILD_STATIC_LIBS -RCFLAGS += -DMOZ_STATIC_BUILD -i $(DIST)/include -endif ifdef DEBUG RCFLAGS += -DDEBUG endif @@ -217,12 +168,6 @@ endif include $(topsrcdir)/config/rules.mk -ifdef BUILD_STATIC_LIBS -include $(topsrcdir)/config/static-rules.mk - -DEFINES += -DIMPL_XREAPI -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),photon) LIBS += -lphexlib endif diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in index 491465971af4..e09dde0820c7 100644 --- a/browser/components/build/Makefile.in +++ b/browser/components/build/Makefile.in @@ -74,12 +74,4 @@ EXTRA_DSO_LDOPTS += \ $(NULL) endif -ifndef MOZ_ENABLE_LIBXUL -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -# Doesn't work, couldn't figure out why -#EXTRA_DSO_LIBS += thebes -EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)thebes.$(IMPORT_LIB_SUFFIX) -endif -endif - include $(topsrcdir)/config/rules.mk diff --git a/browser/confvars.sh b/browser/confvars.sh index 2a7c528cc7b2..94d739044e6c 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -41,9 +41,7 @@ MOZ_APP_VENDOR=Mozilla MOZ_UPDATER=1 MOZ_PHOENIX=1 -MOZ_ENABLE_LIBXUL=1 MOZ_CHROME_FILE_FORMAT=omni -MOZ_STATIC_BUILD_UNSUPPORTED=1 # always enabled for form history MOZ_MORKREADER=1 MOZ_SAFE_BROWSING=1 diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index e866f15422ab..47138c44ba55 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -47,16 +47,7 @@ include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in -ifdef MOZ_ENABLE_LIBXUL MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in -else -define message -You need to build with --enable-libxul (the default, unless you specify ---disable-libxul or --enable-shared or --enable-debug) to package a build. -endef -default libs installer:: - $(error $(message)) -endif MOZ_NONLOCALIZED_PKG_LIST = \ xpcom \ diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index e9103df42ef3..aa8c41e6d022 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -1277,21 +1277,13 @@ xpicleanup@BIN_SUFFIX@ mozcrt19.dll #endif #endif -#ifdef MOZ_ENABLE_LIBXUL - @DLL_PREFIX@xpcom_core@DLL_SUFFIX@ - components/@DLL_PREFIX@jar50@DLL_SUFFIX@ - #ifdef XP_WIN - components/xpinstal.dll - #else - components/@DLL_PREFIX@jsd@DLL_SUFFIX@ - components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@ - #endif +@DLL_PREFIX@xpcom_core@DLL_SUFFIX@ +components/@DLL_PREFIX@jar50@DLL_SUFFIX@ +#ifdef XP_WIN + components/xpinstal.dll #else - #ifdef XP_MACOSX - XUL - #else - @DLL_PREFIX@xul@DLL_SUFFIX@ - #endif + components/@DLL_PREFIX@jsd@DLL_SUFFIX@ + components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@ #endif #ifndef MOZ_UPDATER components/nsUpdateService.js diff --git a/config/Makefile.in b/config/Makefile.in index 1e3652572e4a..7b2a8c6d9679 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -122,10 +122,8 @@ ifdef WRAP_SYSTEM_INCLUDES export:: if test ! -d system_wrappers; then mkdir system_wrappers; fi $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - -DBUILD_STATIC_LIBS=$(BUILD_STATIC_LIBS) \ -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ - -DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \ -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \ -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \ -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 566eb57d3e75..ba7b3de491da 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -124,8 +124,6 @@ STDCXX_COMPAT = @STDCXX_COMPAT@ INCREMENTAL_LINKER = @INCREMENTAL_LINKER@ MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@ MOZ_MAIL_NEWS = @MOZ_MAIL_NEWS@ -BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@ -MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@ ENABLE_TESTS = @ENABLE_TESTS@ IBMBIDI = @IBMBIDI@ MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@ @@ -455,11 +453,7 @@ ZLIB_LIBS = @ZLIB_LIBS@ ZLIB_REQUIRES = else ZLIB_CFLAGS = @MOZ_ZLIB_CFLAGS@ -ifdef MOZ_ENABLE_LIBXUL MOZ_ZLIB_LIBS = @MOZ_ZLIB_LIBS@ -else -ZLIB_LIBS = @MOZ_ZLIB_LIBS@ -endif ZLIB_REQUIRES = zlib endif diff --git a/config/config.mk b/config/config.mk index fb894ae064fb..fc871c511fc9 100644 --- a/config/config.mk +++ b/config/config.mk @@ -245,35 +245,12 @@ endif # WINNT && !GNU_CC # # Build using PIC by default -# Do not use PIC if not building a shared lib (see exceptions below) # - -ifndef BUILD_STATIC_LIBS _ENABLE_PIC=1 -endif -ifneq (,$(FORCE_SHARED_LIB)$(FORCE_USE_PIC)) -_ENABLE_PIC=1 -endif - -# If module is going to be merged into the nsStaticModule, -# make sure that the entry points are translated and -# the module is built static. - -ifdef IS_COMPONENT -ifdef EXPORT_LIBRARY -ifneq (,$(BUILD_STATIC_LIBS)) -ifdef MODULE_NAME -DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1 -FORCE_STATIC_LIB=1 -endif -endif -endif -endif # Determine if module being compiled is destined # to be merged into libxul -ifdef MOZ_ENABLE_LIBXUL ifdef LIBXUL_LIBRARY ifdef IS_COMPONENT ifdef MODULE_NAME @@ -283,17 +260,14 @@ $(error Component makefile does not specify MODULE_NAME.) endif endif FORCE_STATIC_LIB=1 -_ENABLE_PIC=1 SHORT_LIBNAME= endif -endif # If we are building this component into an extension/xulapp, it cannot be # statically linked. In the future we may want to add a xulapp meta-component # build option. ifdef XPI_NAME -_ENABLE_PIC=1 ifdef IS_COMPONENT EXPORT_LIBRARY= FORCE_STATIC_LIB= @@ -301,19 +275,6 @@ FORCE_SHARED_LIB=1 endif endif -# -# Disable PIC if necessary -# - -ifndef _ENABLE_PIC -DSO_CFLAGS= -ifeq ($(OS_ARCH)_$(HAVE_GCC3_ABI),Darwin_1) -DSO_PIC_CFLAGS=-mdynamic-no-pic -else -DSO_PIC_CFLAGS= -endif -endif - ifndef SHARED_LIBRARY_NAME ifdef LIBRARY_NAME SHARED_LIBRARY_NAME=$(LIBRARY_NAME) @@ -371,7 +332,6 @@ endif # Force XPCOM/widget/gfx methods to be _declspec(dllexport) when we're # building libxul libraries -ifdef MOZ_ENABLE_LIBXUL ifdef LIBXUL_LIBRARY DEFINES += \ -D_IMPL_NS_COM \ @@ -388,20 +348,6 @@ ifndef JS_SHARED_LIBRARY DEFINES += -DSTATIC_EXPORTABLE_JS_API endif endif -endif - -# Force _all_ exported methods to be |_declspec(dllexport)| when we're -# building them into the executable. - -ifeq (,$(filter-out WINNT OS2, $(OS_ARCH))) -ifdef BUILD_STATIC_LIBS -DEFINES += \ - -D_IMPL_NS_GFX \ - -D_IMPL_NS_MSG_BASE \ - -D_IMPL_NS_WIDGET \ - $(NULL) -endif -endif # Flags passed to JarMaker.py MAKE_JARS_FLAGS = \ diff --git a/config/rules.mk b/config/rules.mk index 95c313642ccb..d77c70e36113 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -216,7 +216,7 @@ endif # ENABLE_TESTS # # Library rules # -# If BUILD_STATIC_LIBS or FORCE_STATIC_LIB is set, build a static library. +# If FORCE_STATIC_LIB is set, build a static library. # Otherwise, build a shared library. # @@ -239,7 +239,7 @@ endif endif ifdef LIBRARY -ifneq (_1,$(FORCE_SHARED_LIB)_$(BUILD_STATIC_LIBS)) +ifdef FORCE_SHARED_LIB ifdef MKSHLIB ifdef LIB_IS_C_ONLY @@ -266,24 +266,12 @@ ifeq ($(OS_ARCH),OS2) DEF_FILE := $(SHARED_LIBRARY:.dll=.def) endif -ifdef MOZ_ENABLE_LIBXUL EMBED_MANIFEST_AT=2 -endif endif # MKSHLIB -endif # FORCE_SHARED_LIB && !BUILD_STATIC_LIBS +endif # FORCE_SHARED_LIB endif # LIBRARY -ifeq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB)) -LIBRARY := $(NULL) -endif - -ifeq (_1,$(FORCE_SHARED_LIB)_$(BUILD_STATIC_LIBS)) -SHARED_LIBRARY := $(NULL) -DEF_FILE := $(NULL) -IMPORT_LIBRARY := $(NULL) -endif - ifdef FORCE_STATIC_LIB ifndef FORCE_SHARED_LIB SHARED_LIBRARY := $(NULL) @@ -294,7 +282,7 @@ endif ifdef FORCE_SHARED_LIB ifndef FORCE_STATIC_LIB -LIBRARY := $(NULL) +LIBRARY := $(NULL) endif endif @@ -785,12 +773,6 @@ export:: ifdef LIBRARY_NAME ifdef EXPORT_LIBRARY ifdef IS_COMPONENT -ifdef BUILD_STATIC_LIBS - @$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_COMPS) $(STATIC_LIBRARY_NAME) -ifdef MODULE_NAME - @$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_COMP_NAMES) $(MODULE_NAME) -endif -endif # BUILD_STATIC_LIBS else # !IS_COMPONENT $(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_LIBS) $(STATIC_LIBRARY_NAME) endif # IS_COMPONENT diff --git a/config/static-config.mk b/config/static-config.mk deleted file mode 100644 index eba4edf95a49..000000000000 --- a/config/static-config.mk +++ /dev/null @@ -1,119 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either of the GNU General Public License Version 2 or later (the "GPL"), -# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -# Static components makefile -# Include this makefile after config/config.mk & before config/rules.mk -# This makefile will provide the defines for statically linking -# all of the components into the binary. - -STATIC_CPPSRCS += nsStaticComponents.cpp -STATIC_DEFINES += -D_BUILD_STATIC_BIN=1 -STATIC_REQUIRES += \ - xpcom \ - string \ - $(NULL) - -STATIC_EXTRA_LIBS += \ - $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DEPTH)/staticlib/components/$(LIB_PREFIX),$(shell cat $(FINAL_LINK_COMPS)))) \ - $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DEPTH)/staticlib/$(LIB_PREFIX),$(shell cat $(FINAL_LINK_LIBS)))) \ - $(NULL) - -STATIC_COMPONENT_LIST = $(shell cat $(FINAL_LINK_COMP_NAMES)) - -STATIC_EXTRA_DEPS += $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DEPTH)/staticlib/components/$(LIB_PREFIX),$(shell cat $(FINAL_LINK_COMPS)))) $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DEPTH)/staticlib/$(LIB_PREFIX),$(shell cat $(FINAL_LINK_LIBS)))) - -STATIC_EXTRA_DEPS += \ - $(topsrcdir)/config/static-config.mk \ - $(topsrcdir)/config/static-rules.mk \ - $(NULL) - -ifdef MOZ_PSM -STATIC_EXTRA_DEPS += $(NSS_DEP_LIBS) -endif - -STATIC_EXTRA_LIBS += \ - $(PNG_LIBS) \ - $(JPEG_LIBS) \ - $(ZLIB_LIBS) \ - $(NULL) - -ifdef MOZ_PSM -STATIC_EXTRA_LIBS += \ - $(NSS_LIBS) \ - $(NULL) -endif - -STATIC_EXTRA_LIBS += $(MOZ_CAIRO_LIBS) - -STATIC_EXTRA_LIBS += $(QCMS_LIBS) - -ifdef MOZ_ENABLE_GTK2 -STATIC_EXTRA_LIBS += $(XLDFLAGS) $(XT_LIBS) -lgthread-2.0 -STATIC_EXTRA_LIBS += $(MOZ_PANGO_LIBS) -endif - -ifdef MOZ_STORAGE -STATIC_EXTRA_LIBS += $(SQLITE_LIBS) -endif - -ifdef MOZ_ENABLE_STARTUP_NOTIFICATION -STATIC_EXTRA_LIBS += $(MOZ_STARTUP_NOTIFICATION_LIBS) -endif - -ifdef MOZ_SYDNEYAUDIO -ifeq ($(OS_ARCH),Linux) -STATIC_EXTRA_LIBS += $(MOZ_ALSA_LIBS) -endif -endif - -# Component Makefile always brings in this. -# STATIC_EXTRA_LIBS += $(TK_LIBS) - -ifeq ($(OS_ARCH),WINNT) -STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool imm32) -# XXX temporary workaround until link ordering issue is solved -ifdef GNU_CC -STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,winmm wsock32 gdi32) -endif -STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME, usp10) -endif - -ifeq ($(OS_ARCH),AIX) -STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,odm cfg) -endif - -LOCAL_INCLUDES += -I$(topsrcdir)/config diff --git a/config/static-rules.mk b/config/static-rules.mk deleted file mode 100644 index f4842dbecfd9..000000000000 --- a/config/static-rules.mk +++ /dev/null @@ -1,25 +0,0 @@ - -ifdef _NO_AUTO_VARS -_TARGET = $(srcdir)/$(@F) -else -_TARGET = $@ -endif - -$(warning FINAL_LINK_COMP_NAMES = $(FINAL_LINK_COMP_NAMES)) -$(warning FINAL_LINK_COMPS = $(FINAL_LINK_COMPS)) - -nsStaticComponents.cpp: $(topsrcdir)/config/nsStaticComponents.cpp.in $(GLOBAL_DEPS) $(FINAL_LINK_COMP_NAMES) - rm -f $@ - cat $< | \ - sed -e "s|%MODULE_LIST%|$(foreach m, $(STATIC_COMPONENT_LIST),MODULE($(m)))|" \ - > $(_TARGET) - -GARBAGE += nsStaticComponents.cpp - -ifeq ($(OS_ARCH),IRIX) -LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=80 -endif - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -LIBS += -framework QuickTime -framework IOKit -lcrypto -endif diff --git a/config/system-headers b/config/system-headers index 12a88bf75aa2..94e827944ac2 100644 --- a/config/system-headers +++ b/config/system-headers @@ -70,9 +70,6 @@ bstring.h builtin.h Button.h byteswap.h -#if MOZ_ENABLE_LIBXUL!=1 -#define WRAP_CAIRO_HEADERS -#endif #if MOZ_TREE_CAIRO!=1 #define WRAP_CAIRO_HEADERS #endif @@ -994,15 +991,6 @@ png.h #if MOZ_NATIVE_ZLIB==1 zlib.h #endif -#if MOZ_ENABLE_LIBXUL!=1 -#if BUILD_STATIC_LIBS!=1 -#define WRAP_LCMS_HEADERS -#endif -#endif -#ifdef WRAP_LCMS_HEADERS -icc34.h -lcms.h -#endif #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION libsn/sn.h libsn/sn-common.h diff --git a/configure.in b/configure.in index 928e760e9990..42a6c05de63e 100644 --- a/configure.in +++ b/configure.in @@ -4433,8 +4433,6 @@ dnl = dnl ======================================================== MOZ_ARG_HEADER(External Packages) -MOZ_ENABLE_LIBXUL=1 - MOZ_ARG_WITH_STRING(libxul-sdk, [ --with-libxul-sdk=PFX Use the libXUL SDK at ], LIBXUL_SDK_DIR=$withval) @@ -4448,7 +4446,6 @@ elif test -n "$LIBXUL_SDK_DIR" -a "$LIBXUL_SDK_DIR" != "no"; then AC_MSG_ERROR([$LIBXUL_SDK/include/xpcom-config.h doesn't exist]) fi - MOZ_ENABLE_LIBXUL=1 fi AC_SUBST(LIBXUL_SDK) @@ -4465,10 +4462,6 @@ MOZ_ARG_WITH_BOOL(system-libxul, [ --with-system-libxul Use system installed libxul SDK], SYSTEM_LIBXUL=1) -if test -n "$SYSTEM_LIBXUL" -a -z "$MOZ_ENABLE_LIBXUL"; then - AC_MSG_ERROR([--with-system-libxul needs --with-libxul-sdk]) -fi - dnl ======================================================== dnl = If NSPR was not detected in the system, dnl = use the one in the source tree (mozilla/nsprpub) @@ -4796,7 +4789,6 @@ dnl ======================================================== MOZ_ARG_HEADER(Application) -BUILD_STATIC_LIBS= ENABLE_TESTS=1 MOZ_ACTIVEX_SCRIPTING_SUPPORT= MOZ_BRANDING_DIRECTORY= @@ -8101,22 +8093,6 @@ dnl = dnl ======================================================== MOZ_ARG_HEADER(Static build options) -MOZ_ARG_ENABLE_BOOL(static, -[ --enable-static Enable building internal static libs], - BUILD_STATIC_LIBS=1, - BUILD_STATIC_LIBS=) - -MOZ_ENABLE_LIBXUL=1 - -MOZ_ARG_DISABLE_BOOL(libxul, -[ --disable-libxul Disable building libxul (not supported)], - MOZ_ENABLE_LIBXUL=, - MOZ_ENABLE_LIBXUL=1) - -if test -z "$MOZ_ENABLE_LIBXUL"; then - AC_MSG_ERROR([--disable-libxul is no longer supported.]) -fi - # split JS out by default to avoid VS2005 PGO crash (bug 591836). if test "$OS_ARCH" = "WINNT" -a "$CPU_ARCH" != "x86_64" ; then ENABLE_SHARED_JS=1 @@ -8137,17 +8113,8 @@ else fi AC_SUBST(JS_SHARED_LIBRARY) -if test -n "$MOZ_STATIC_BUILD_UNSUPPORTED" -a -n "$BUILD_STATIC_LIBS"; then - AC_MSG_ERROR([--enable-static is not supported for building $MOZ_BUILD_APP.]) -fi - -if test -n "$MOZ_ENABLE_LIBXUL" -a -n "$BUILD_STATIC_LIBS"; then - AC_MSG_ERROR([--enable-libxul is not compatible with --enable-static]) -fi - AC_SUBST(LIBXUL_LIBS) XPCOM_LIBS="$LIBXUL_LIBS" -AC_DEFINE(MOZ_ENABLE_LIBXUL) dnl ======================================================== dnl = @@ -8798,8 +8765,6 @@ AC_SUBST(JAR) AC_SUBST(MOZ_PROFILELOCKING) -AC_SUBST(BUILD_STATIC_LIBS) -AC_SUBST(MOZ_ENABLE_LIBXUL) AC_SUBST(ENABLE_TESTS) AC_SUBST(IBMBIDI) AC_SUBST(MOZ_UNIVERSALCHARDET) diff --git a/content/svg/content/src/nsSVGSVGElement.cpp b/content/svg/content/src/nsSVGSVGElement.cpp index 83ee25b02fd9..c9915b7b4683 100644 --- a/content/svg/content/src/nsSVGSVGElement.cpp +++ b/content/svg/content/src/nsSVGSVGElement.cpp @@ -60,7 +60,6 @@ #include "nsGUIEvent.h" #include "nsSVGUtils.h" #include "nsSVGSVGElement.h" -#include "nsSVGEffects.h" // For nsSVGEffects::RemoveAllRenderingObservers #include "nsContentErrors.h" // For NS_PROPTABLE_PROP_OVERWRITTEN #ifdef MOZ_SMIL @@ -1289,15 +1288,6 @@ nsSVGSVGElement::GetPreserveAspectRatio() return &mPreserveAspectRatio; } -#ifndef MOZ_ENABLE_LIBXUL -// XXXdholbert HACK -- see comment w/ this method's declaration in header file. -void -nsSVGSVGElement::RemoveAllRenderingObservers() -{ - nsSVGEffects::RemoveAllRenderingObservers(this); -} -#endif // !MOZ_LIBXUL - PRBool nsSVGSVGElement::ShouldSynthesizeViewBox() { diff --git a/content/svg/content/src/nsSVGSVGElement.h b/content/svg/content/src/nsSVGSVGElement.h index 74941d8ecb23..bce1065d4968 100644 --- a/content/svg/content/src/nsSVGSVGElement.h +++ b/content/svg/content/src/nsSVGSVGElement.h @@ -226,13 +226,6 @@ public: virtual nsXPCClassInfo* GetClassInfo(); -#ifndef MOZ_ENABLE_LIBXUL - // XXXdholbert HACK to call static method - // nsSVGEffects::RemoveAllRenderingObservers() on myself, on behalf - // of imagelib in non-libxul builds. - virtual void RemoveAllRenderingObservers(); -#endif // !MOZ_LIBXUL - private: // Methods for elements to override my "PreserveAspectRatio" value. // These are private so that only our friends (nsSVGImageFrame in diff --git a/db/morkreader/Makefile.in b/db/morkreader/Makefile.in index 3ef58888779d..5dd3f4ee703d 100644 --- a/db/morkreader/Makefile.in +++ b/db/morkreader/Makefile.in @@ -43,10 +43,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef MOZ_ENABLE_LIBXUL DIRS = external -endif - MODULE = morkreader LIBRARY_NAME = morkreader_s LIBXUL_LIBRARY = 1 diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in index dcb685238fd2..ae5541640bb1 100644 --- a/docshell/build/Makefile.in +++ b/docshell/build/Makefile.in @@ -57,11 +57,6 @@ EXPORTS = \ nsDocShellCID.h \ $(NULL) -ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) -EXTRA_DSO_LIBS = gkgfx -endif - - CPPSRCS = \ nsDocShellModule.cpp \ $(NULL) diff --git a/dom/plugins/test/testplugin/Makefile.in b/dom/plugins/test/testplugin/Makefile.in index 9cc76cc6a1ad..a1648c0aec21 100644 --- a/dom/plugins/test/testplugin/Makefile.in +++ b/dom/plugins/test/testplugin/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = nptest LIBRARY_NAME = nptest MODULE_NAME = TestPlugin +FORCE_SHARED_LIB = 1 # Don't use STL wrappers; nptest isn't Gecko code STL_FLAGS = diff --git a/embedding/tests/Makefile.in b/embedding/tests/Makefile.in index c8b897fa007e..436c61492b14 100644 --- a/embedding/tests/Makefile.in +++ b/embedding/tests/Makefile.in @@ -36,11 +36,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk ifeq ($(OS_ARCH),WINNT) -# disable winembed in non-libxul -ifndef BUILD_STATIC_LIBS DIRS = winEmbed endif -endif - include $(topsrcdir)/config/rules.mk diff --git a/gfx/Makefile.in b/gfx/Makefile.in index 003a617994cb..c1148d15cd18 100644 --- a/gfx/Makefile.in +++ b/gfx/Makefile.in @@ -48,22 +48,7 @@ ifdef MOZ_TREE_CAIRO DIRS = cairo endif -# In static builds, ycbcr must appear after layers in -# the link line on linux. This order is defined by the -# order listed in DIRS. On shared builds ycbcr must -# be built first so the order is reversed. -ifndef BUILD_STATIC_LIBS -DIRS += ycbcr -endif - -DIRS += angle - - -DIRS += src qcms layers harfbuzz/src ots/src thebes ipc - -ifdef BUILD_STATIC_LIBS -DIRS += ycbcr -endif +DIRS += ycbcr angle src qcms layers harfbuzz/src ots/src thebes ipc ifdef ENABLE_TESTS TOOL_DIRS += tests diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in index 4ecaff857f82..622a86cb544d 100644 --- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -121,10 +121,6 @@ CSRCS = \ DEFINES += -DANGLE_USE_NSPR -DANGLE_BUILD -ifndef MOZ_ENABLE_LIBXUL -EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS) -endif - # ANGLE only on Win32 for now, the solution isn't set up # for 64-bit yet. This is handled by MOZ_ANGLE which the configure script # leaves undefined in the 64-bit case. diff --git a/gfx/angle/angle-shared.patch b/gfx/angle/angle-shared.patch deleted file mode 100644 index 2b514c17f812..000000000000 --- a/gfx/angle/angle-shared.patch +++ /dev/null @@ -1,205 +0,0 @@ -# HG changeset patch -# Parent 438b6d09a9fac42fd66235e626a09a0ea4e88b61 - -diff --git a/gfx/angle/include/GLSLANG/ShaderLang.h b/gfx/angle/include/GLSLANG/ShaderLang.h ---- a/gfx/angle/include/GLSLANG/ShaderLang.h -+++ b/gfx/angle/include/GLSLANG/ShaderLang.h -@@ -1,16 +1,36 @@ - // - // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - // - #ifndef _COMPILER_INTERFACE_INCLUDED_ - #define _COMPILER_INTERFACE_INCLUDED_ - -+#ifdef MOZILLA_VERSION -+#include "nscore.h" -+ -+#ifdef WIN32 -+# if !defined(MOZ_ENABLE_LIBXUL) && !defined(MOZ_STATIC_BUILD) -+# ifdef ANGLE_BUILD -+# define ANGLE_API NS_EXPORT -+# else -+# define ANGLE_API NS_IMPORT -+# endif -+# else -+# define ANGLE_API /*nothing*/ -+# endif -+#else -+# define ANGLE_API NS_EXTERNAL_VIS -+#endif -+#else -+#define ANGLE_API /*nothing*/ -+#endif -+ - // - // This is the platform independent interface between an OGL driver - // and the shading language compiler. - // - - #ifdef __cplusplus - extern "C" { - #endif -@@ -76,22 +96,22 @@ typedef enum { - SH_SOURCE_PATH = 0x0200, - } ShCompileOptions; - - // - // Driver must call this first, once, before doing any other - // compiler operations. - // If the function succeeds, the return value is nonzero, else zero. - // --int ShInitialize(); -+ANGLE_API int ShInitialize(); - // - // Driver should call this at shutdown. - // If the function succeeds, the return value is nonzero, else zero. - // --int ShFinalize(); -+ANGLE_API int ShFinalize(); - - // - // Implementation dependent built-in resources (constants and extensions). - // The names for these resources has been obtained by stripping gl_/GL_. - // - typedef struct - { - // Constants. -@@ -107,17 +127,17 @@ typedef struct - // Extensions. - // Set to 1 to enable the extension, else 0. - int OES_standard_derivatives; - } ShBuiltInResources; - - // - // Initialize built-in resources with minimum expected values. - // --void ShInitBuiltInResources(ShBuiltInResources* resources); -+ANGLE_API void ShInitBuiltInResources(ShBuiltInResources* resources); - - // - // ShHandle held by but opaque to the driver. It is allocated, - // managed, and de-allocated by the compiler. It's contents - // are defined by and used by the compiler. - // - // If handle creation fails, 0 will be returned. - // -@@ -127,19 +147,19 @@ typedef void* ShHandle; - // Driver calls these to create and destroy compiler objects. - // - // Returns the handle of constructed compiler. - // Parameters: - // type: Specifies the type of shader - SH_FRAGMENT_SHADER or SH_VERTEX_SHADER. - // spec: Specifies the language spec the compiler must conform to - - // SH_GLES2_SPEC or SH_WEBGL_SPEC. - // resources: Specifies the built-in resources. --ShHandle ShConstructCompiler(ShShaderType type, ShShaderSpec spec, -+ANGLE_API ShHandle ShConstructCompiler(ShShaderType type, ShShaderSpec spec, - const ShBuiltInResources* resources); --void ShDestruct(ShHandle handle); -+ANGLE_API void ShDestruct(ShHandle handle); - - // - // Compiles the given shader source. - // If the function succeeds, the return value is nonzero, else zero. - // Parameters: - // handle: Specifies the handle of compiler to be used. - // shaderStrings: Specifies an array of pointers to null-terminated strings - // containing the shader source code. -@@ -156,17 +176,17 @@ void ShDestruct(ShHandle handle); - // SH_INTERMEDIATE_TREE: Writes intermediate tree to info log. - // Can be queried by calling ShGetInfoLog(). - // SH_OBJECT_CODE: Translates intermediate tree to glsl or hlsl shader. - // Can be queried by calling ShGetObjectCode(). - // SH_ATTRIBUTES_UNIFORMS: Extracts attributes and uniforms. - // Can be queried by calling ShGetActiveAttrib() and - // ShGetActiveUniform(). - // --int ShCompile( -+ANGLE_API int ShCompile( - const ShHandle handle, - const char* const shaderStrings[], - const int numStrings, - int compileOptions - ); - - // Returns a parameter from a compiled shader. - // Parameters: -@@ -182,53 +202,53 @@ int ShCompile( - // variable name including the null - // termination character. - // SH_ACTIVE_UNIFORMS: the number of active uniform variables. - // SH_ACTIVE_UNIFORM_MAX_LENGTH: the length of the longest active uniform - // variable name including the null - // termination character. - // - // params: Requested parameter --void ShGetInfo(const ShHandle handle, ShShaderInfo pname, int* params); -+ANGLE_API void ShGetInfo(const ShHandle handle, ShShaderInfo pname, int* params); - - // Returns nul-terminated information log for a compiled shader. - // Parameters: - // handle: Specifies the compiler - // infoLog: Specifies an array of characters that is used to return - // the information log. It is assumed that infoLog has enough memory - // to accomodate the information log. The size of the buffer required - // to store the returned information log can be obtained by calling - // ShGetInfo with SH_INFO_LOG_LENGTH. --void ShGetInfoLog(const ShHandle handle, char* infoLog); -+ANGLE_API void ShGetInfoLog(const ShHandle handle, char* infoLog); - - // Returns null-terminated object code for a compiled shader. - // Parameters: - // handle: Specifies the compiler - // infoLog: Specifies an array of characters that is used to return - // the object code. It is assumed that infoLog has enough memory to - // accomodate the object code. The size of the buffer required to - // store the returned object code can be obtained by calling - // ShGetInfo with SH_OBJECT_CODE_LENGTH. --void ShGetObjectCode(const ShHandle handle, char* objCode); -+ANGLE_API void ShGetObjectCode(const ShHandle handle, char* objCode); - - // Returns information about an active attribute variable. - // Parameters: - // handle: Specifies the compiler - // index: Specifies the index of the attribute variable to be queried. - // length: Returns the number of characters actually written in the string - // indicated by name (excluding the null terminator) if a value other - // than NULL is passed. - // size: Returns the size of the attribute variable. - // type: Returns the data type of the attribute variable. - // name: Returns a null terminated string containing the name of the - // attribute variable. It is assumed that name has enough memory to - // accomodate the attribute variable name. The size of the buffer - // required to store the attribute variable name can be obtained by - // calling ShGetInfo with SH_ACTIVE_ATTRIBUTE_MAX_LENGTH. --void ShGetActiveAttrib(const ShHandle handle, -+ANGLE_API void ShGetActiveAttrib(const ShHandle handle, - int index, - int* length, - int* size, - ShDataType* type, - char* name); - - // Returns information about an active uniform variable. - // Parameters: -@@ -239,17 +259,17 @@ void ShGetActiveAttrib(const ShHandle ha - // other than NULL is passed. - // size: Returns the size of the uniform variable. - // type: Returns the data type of the uniform variable. - // name: Returns a null terminated string containing the name of the - // uniform variable. It is assumed that name has enough memory to - // accomodate the uniform variable name. The size of the buffer required - // to store the uniform variable name can be obtained by calling - // ShGetInfo with SH_ACTIVE_UNIFORMS_MAX_LENGTH. --void ShGetActiveUniform(const ShHandle handle, -+ANGLE_API void ShGetActiveUniform(const ShHandle handle, - int index, - int* length, - int* size, - ShDataType* type, - char* name); - - #ifdef __cplusplus - } diff --git a/gfx/angle/include/GLSLANG/ShaderLang.h b/gfx/angle/include/GLSLANG/ShaderLang.h index 8d36af2f4abb..fa7b978230b7 100644 --- a/gfx/angle/include/GLSLANG/ShaderLang.h +++ b/gfx/angle/include/GLSLANG/ShaderLang.h @@ -6,26 +6,6 @@ #ifndef _COMPILER_INTERFACE_INCLUDED_ #define _COMPILER_INTERFACE_INCLUDED_ -#ifdef MOZILLA_VERSION -#include "nscore.h" - -#ifdef WIN32 -# if !defined(MOZ_ENABLE_LIBXUL) && !defined(MOZ_STATIC_BUILD) -# ifdef ANGLE_BUILD -# define ANGLE_API NS_EXPORT -# else -# define ANGLE_API NS_IMPORT -# endif -# else -# define ANGLE_API /*nothing*/ -# endif -#else -# define ANGLE_API NS_EXTERNAL_VIS -#endif -#else -#define ANGLE_API /*nothing*/ -#endif - // // This is the platform independent interface between an OGL driver // and the shading language compiler. @@ -101,12 +81,12 @@ typedef enum { // compiler operations. // If the function succeeds, the return value is nonzero, else zero. // -ANGLE_API int ShInitialize(); +int ShInitialize(); // // Driver should call this at shutdown. // If the function succeeds, the return value is nonzero, else zero. // -ANGLE_API int ShFinalize(); +int ShFinalize(); // // Implementation dependent built-in resources (constants and extensions). @@ -132,7 +112,7 @@ typedef struct // // Initialize built-in resources with minimum expected values. // -ANGLE_API void ShInitBuiltInResources(ShBuiltInResources* resources); +void ShInitBuiltInResources(ShBuiltInResources* resources); // // ShHandle held by but opaque to the driver. It is allocated, @@ -152,9 +132,9 @@ typedef void* ShHandle; // spec: Specifies the language spec the compiler must conform to - // SH_GLES2_SPEC or SH_WEBGL_SPEC. // resources: Specifies the built-in resources. -ANGLE_API ShHandle ShConstructCompiler(ShShaderType type, ShShaderSpec spec, +ShHandle ShConstructCompiler(ShShaderType type, ShShaderSpec spec, const ShBuiltInResources* resources); -ANGLE_API void ShDestruct(ShHandle handle); +void ShDestruct(ShHandle handle); // // Compiles the given shader source. @@ -181,7 +161,7 @@ ANGLE_API void ShDestruct(ShHandle handle); // Can be queried by calling ShGetActiveAttrib() and // ShGetActiveUniform(). // -ANGLE_API int ShCompile( +int ShCompile( const ShHandle handle, const char* const shaderStrings[], const int numStrings, @@ -207,7 +187,7 @@ ANGLE_API int ShCompile( // termination character. // // params: Requested parameter -ANGLE_API void ShGetInfo(const ShHandle handle, ShShaderInfo pname, int* params); +void ShGetInfo(const ShHandle handle, ShShaderInfo pname, int* params); // Returns nul-terminated information log for a compiled shader. // Parameters: @@ -217,7 +197,7 @@ ANGLE_API void ShGetInfo(const ShHandle handle, ShShaderInfo pname, int* params) // to accomodate the information log. The size of the buffer required // to store the returned information log can be obtained by calling // ShGetInfo with SH_INFO_LOG_LENGTH. -ANGLE_API void ShGetInfoLog(const ShHandle handle, char* infoLog); +void ShGetInfoLog(const ShHandle handle, char* infoLog); // Returns null-terminated object code for a compiled shader. // Parameters: @@ -227,7 +207,7 @@ ANGLE_API void ShGetInfoLog(const ShHandle handle, char* infoLog); // accomodate the object code. The size of the buffer required to // store the returned object code can be obtained by calling // ShGetInfo with SH_OBJECT_CODE_LENGTH. -ANGLE_API void ShGetObjectCode(const ShHandle handle, char* objCode); +void ShGetObjectCode(const ShHandle handle, char* objCode); // Returns information about an active attribute variable. // Parameters: @@ -243,7 +223,7 @@ ANGLE_API void ShGetObjectCode(const ShHandle handle, char* objCode); // accomodate the attribute variable name. The size of the buffer // required to store the attribute variable name can be obtained by // calling ShGetInfo with SH_ACTIVE_ATTRIBUTE_MAX_LENGTH. -ANGLE_API void ShGetActiveAttrib(const ShHandle handle, +void ShGetActiveAttrib(const ShHandle handle, int index, int* length, int* size, @@ -264,7 +244,7 @@ ANGLE_API void ShGetActiveAttrib(const ShHandle handle, // accomodate the uniform variable name. The size of the buffer required // to store the uniform variable name can be obtained by calling // ShGetInfo with SH_ACTIVE_UNIFORMS_MAX_LENGTH. -ANGLE_API void ShGetActiveUniform(const ShHandle handle, +void ShGetActiveUniform(const ShHandle handle, int index, int* length, int* size, diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index df6852f267ee..820dd783d659 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -43,10 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifndef MOZ_ENABLE_LIBXUL -VISIBILITY_FLAGS = -endif - MODULE = cairo LIBRARY_NAME = mozcairo LIBXUL_LIBRARY = 1 diff --git a/gfx/cairo/cairo/src/cairo-platform.h b/gfx/cairo/cairo/src/cairo-platform.h index 43fd58936979..eee2e712df7b 100644 --- a/gfx/cairo/cairo/src/cairo-platform.h +++ b/gfx/cairo/cairo/src/cairo-platform.h @@ -42,8 +42,6 @@ /* we're replacing any definition from cairoint.h etc */ #undef cairo_public -#if defined(MOZ_ENABLE_LIBXUL) - #ifdef HAVE_VISIBILITY_HIDDEN_ATTRIBUTE #define CVISIBILITY_HIDDEN __attribute__((visibility("hidden"))) #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) @@ -55,26 +53,6 @@ /* In libxul builds we don't ever want to export cairo symbols */ #define cairo_public extern CVISIBILITY_HIDDEN -#else - -#ifdef MOZ_STATIC_BUILD -# define cairo_public -#else -# if defined(XP_WIN) || defined(XP_BEOS) || defined(XP_OS2) -# define cairo_public extern __declspec(dllexport) -# else -# ifdef HAVE_VISIBILITY_ATTRIBUTE -# define cairo_public extern __attribute__((visibility("default"))) -# elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) -# define cairo_public extern __global -# else -# define cairo_public extern -# endif -# endif -#endif - -#endif - #define CCALLBACK #define CCALLBACK_DECL #define CSTATIC_CALLBACK(__x) static __x diff --git a/gfx/cairo/cairo/src/cairo-spline.c b/gfx/cairo/cairo/src/cairo-spline.c index a2f4e68a3682..132d9a516ef6 100644 --- a/gfx/cairo/cairo/src/cairo-spline.c +++ b/gfx/cairo/cairo/src/cairo-spline.c @@ -194,14 +194,12 @@ _cairo_spline_decompose_into (cairo_spline_knots_t *s1, double tolerance_squared cairo_status_t status; depth++; -#ifdef MOZ_ENABLE_LIBXUL if (depth == 200) { CrashSpline(tolerance_squared, s1->a.x, s1->a.y, s1->b.x, s1->b.y, s1->c.x, s1->c.y, s1->d.x, s1->d.y); } -#endif if (_cairo_spline_error_squared (s1) < tolerance_squared) { depth--; @@ -227,7 +225,6 @@ _cairo_spline_decompose (cairo_spline_t *spline, double tolerance) cairo_spline_knots_t s1; cairo_status_t status; -#ifdef MOZ_ENABLE_LIBXUL StoreSpline(spline->knots.a.x, spline->knots.a.y, spline->knots.b.x, @@ -236,7 +233,6 @@ _cairo_spline_decompose (cairo_spline_t *spline, double tolerance) spline->knots.c.y, spline->knots.d.x, spline->knots.d.y); -#endif s1 = spline->knots; spline->last_point = s1.a; status = _cairo_spline_decompose_into (&s1, tolerance * tolerance, spline); diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 94efccbe4946..7ded2e3c20d7 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -181,18 +181,6 @@ FORCE_USE_PIC = 1 include $(topsrcdir)/config/config.mk -ifndef MOZ_ENABLE_LIBXUL -ifdef GNU_CC -# -fvisibility=hidden works fine but PIXMAN_EXPORT is not used in header -# files, so pixman.h needs to be included before -# "#pragma GCC visibility -push(hidden)". -ifdef WRAP_SYSTEM_INCLUDES -MY_VISIBILITY_FLAGS := -DPIXMAN_USE_INTERNAL_API -include pixman.h $(VISIBILITY_FLAGS) -COMPILE_CFLAGS += $(MY_VISIBILITY_FLAGS) -endif # WRAP_SYSTEM_INCLUDES -endif # GNU_CC -endif # !MOZ_ENABLE_LIBXUL - include $(topsrcdir)/config/rules.mk CFLAGS += -DPACKAGE="mozpixman" -D_USE_MATH_DEFINES diff --git a/gfx/cairo/libpixman/src/pixman-compiler.h b/gfx/cairo/libpixman/src/pixman-compiler.h index 1a40255ae832..d1948f84217d 100644 --- a/gfx/cairo/libpixman/src/pixman-compiler.h +++ b/gfx/cairo/libpixman/src/pixman-compiler.h @@ -65,7 +65,7 @@ #endif /* In libxul builds we don't ever want to export pixman symbols */ -#ifdef MOZ_ENABLE_LIBXUL +#if 1 # define PIXMAN_EXPORT cairo_public #else @@ -79,7 +79,7 @@ # define PIXMAN_EXPORT #endif -#endif /* MOZ_ENABLE_LIBXUL */ +#endif /* TLS */ #if defined(PIXMAN_NO_TLS) diff --git a/gfx/cairo/pixman-export.patch b/gfx/cairo/pixman-export.patch index 35bb43cc5876..78ca8c6696e2 100644 --- a/gfx/cairo/pixman-export.patch +++ b/gfx/cairo/pixman-export.patch @@ -11,7 +11,7 @@ diff --git a/gfx/cairo/libpixman/src/pixman-compiler.h b/gfx/cairo/libpixman/src #endif +/* In libxul builds we don't ever want to export pixman symbols */ -+#ifdef MOZ_ENABLE_LIBXUL ++#if 1 +# define PIXMAN_EXPORT cairo_public +#else + @@ -25,7 +25,7 @@ diff --git a/gfx/cairo/libpixman/src/pixman-compiler.h b/gfx/cairo/libpixman/src # define PIXMAN_EXPORT #endif -+#endif /* MOZ_ENABLE_LIBXUL */ ++#endif + /* TLS */ #if defined(PIXMAN_NO_TLS) diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in index feaea0693aa3..932a09bdfd85 100644 --- a/gfx/harfbuzz/src/Makefile.in +++ b/gfx/harfbuzz/src/Makefile.in @@ -32,10 +32,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifndef MOZ_ENABLE_LIBXUL -VISIBILITY_FLAGS = -endif - MODULE = harfbuzz LIBRARY_NAME = mozharfbuzz LIBXUL_LIBRARY = 1 diff --git a/gfx/layers/opengl/LayerManagerOGLProgram.h b/gfx/layers/opengl/LayerManagerOGLProgram.h index ed66c66cbfcf..ba06eb6fe865 100644 --- a/gfx/layers/opengl/LayerManagerOGLProgram.h +++ b/gfx/layers/opengl/LayerManagerOGLProgram.h @@ -48,7 +48,7 @@ namespace mozilla { namespace layers { -#if defined(DEBUG) && defined(MOZ_ENABLE_LIBXUL) +#if defined(DEBUG) #define CHECK_CURRENT_PROGRAM 1 #define ASSERT_THIS_PROGRAM \ do { \ diff --git a/gfx/src/gfxCore.h b/gfx/src/gfxCore.h index 93c8ad261516..1ebb199aceea 100644 --- a/gfx/src/gfxCore.h +++ b/gfx/src/gfxCore.h @@ -50,19 +50,8 @@ namespace mozilla { #define NS_SIDE_RIGHT mozilla::css::eSideRight #define NS_SIDE_BOTTOM mozilla::css::eSideBottom #define NS_SIDE_LEFT mozilla::css::eSideLeft - -#if defined(MOZ_ENABLE_LIBXUL) || !defined(MOZILLA_INTERNAL_API) -# define NS_GFX -# define NS_GFX_(type) type -# define NS_GFX_STATIC_MEMBER_(type) type -#elif defined(_IMPL_NS_GFX) -# define NS_GFX NS_EXPORT -# define NS_GFX_(type) NS_EXPORT_(type) -# define NS_GFX_STATIC_MEMBER_(type) NS_EXPORT_STATIC_MEMBER_(type) -#else -# define NS_GFX NS_IMPORT -# define NS_GFX_(type) NS_IMPORT_(type) -# define NS_GFX_STATIC_MEMBER_(type) NS_IMPORT_STATIC_MEMBER_(type) -#endif +#define NS_GFX +#define NS_GFX_(type) type +#define NS_GFX_STATIC_MEMBER_(type) type #endif diff --git a/gfx/src/gfxCrashReporterUtils.cpp b/gfx/src/gfxCrashReporterUtils.cpp index 874675cca94d..e7376084a9c1 100644 --- a/gfx/src/gfxCrashReporterUtils.cpp +++ b/gfx/src/gfxCrashReporterUtils.cpp @@ -34,7 +34,7 @@ #include "gfxCrashReporterUtils.h" -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) #define MOZ_GFXFEATUREREPORTER 1 #endif diff --git a/gfx/tests/Makefile.in b/gfx/tests/Makefile.in index c7e7c1359009..638f0c49e01d 100644 --- a/gfx/tests/Makefile.in +++ b/gfx/tests/Makefile.in @@ -54,49 +54,48 @@ _TEST_FILES = $(addprefix mochitest/, \ test_acceleration.html \ ) -ifndef MOZ_ENABLE_LIBXUL -ifndef BUILD_STATIC_LIBS - -CPP_UNIT_TESTS = \ - TestColorNames.cpp \ - TestRect.cpp \ - TestRegion.cpp \ - $(NULL) - -# These are built but not run. gfxColorManagementTest.cpp can't even -# be built, because it has not been updated for qcms. -CPP_DISABLED_UNIT_TESTS = \ - gfxFontSelectionTest.cpp \ - gfxSurfaceRefCountTest.cpp \ - gfxTextRunPerfTest.cpp \ - gfxWordCacheTest.cpp \ - $(NULL) -# gfxColorManagementTest.cpp \ - - -# rules.mk will put the CPP_UNIT_TESTS into SIMPLE_PROGRAMS twice if we -# define SIMPLE_PROGRAMS based on CPPSRCS directly. -CPPSRCS = $(CPP_DISABLED_UNIT_TESTS) -SIMPLE_PROGRAMS = $(CPP_DISABLED_UNIT_TESTS:.cpp=$(BIN_SUFFIX)) - -ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) -CMMSRCS = gfxTestCocoaHelper.mm -HELPER_OBJS = gfxTestCocoaHelper.$(OBJ_SUFFIX) -EXTRA_DEPS += gfxTestCocoaHelper.$(OBJ_SUFFIX) -endif - -LIBS = \ - $(HELPER_OBJS) \ - $(call EXPAND_LIBNAME_PATH,thebes,../thebes) \ - $(call EXPAND_LIBNAME_PATH,gkgfx,../src) \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(XPCOM_LIBS) \ - $(MOZ_JS_LIBS) \ - $(TK_LIBS) \ - $(NULL) - -endif -endif +# CPP_UNIT_TESTS disabled for now because they dont work in libxul builds. +#ifndef BUILD_STATIC_LIBS +# +#CPP_UNIT_TESTS = \ +# TestColorNames.cpp \ +# TestRect.cpp \ +# TestRegion.cpp \ +# $(NULL) +# +## These are built but not run. gfxColorManagementTest.cpp can't even +## be built, because it has not been updated for qcms. +#CPP_DISABLED_UNIT_TESTS = \ +# gfxFontSelectionTest.cpp \ +# gfxSurfaceRefCountTest.cpp \ +# gfxTextRunPerfTest.cpp \ +# gfxWordCacheTest.cpp \ +# $(NULL) +## gfxColorManagementTest.cpp \ +# +# +## rules.mk will put the CPP_UNIT_TESTS into SIMPLE_PROGRAMS twice if we +## define SIMPLE_PROGRAMS based on CPPSRCS directly. +#CPPSRCS = $(CPP_DISABLED_UNIT_TESTS) +#SIMPLE_PROGRAMS = $(CPP_DISABLED_UNIT_TESTS:.cpp=$(BIN_SUFFIX)) +# +#ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) +#CMMSRCS = gfxTestCocoaHelper.mm +#HELPER_OBJS = gfxTestCocoaHelper.$(OBJ_SUFFIX) +#EXTRA_DEPS += gfxTestCocoaHelper.$(OBJ_SUFFIX) +#endif +# +#LIBS = \ +# $(HELPER_OBJS) \ +# $(call EXPAND_LIBNAME_PATH,thebes,../thebes) \ +# $(call EXPAND_LIBNAME_PATH,gkgfx,../src) \ +# $(MOZ_UNICHARUTIL_LIBS) \ +# $(XPCOM_LIBS) \ +# $(MOZ_JS_LIBS) \ +# $(TK_LIBS) \ +# $(NULL) +# +#endif include $(topsrcdir)/config/rules.mk diff --git a/gfx/thebes/GLContext.h b/gfx/thebes/GLContext.h index d1c16183c737..7838c55d4561 100644 --- a/gfx/thebes/GLContext.h +++ b/gfx/thebes/GLContext.h @@ -791,19 +791,6 @@ public: const nsIntPoint& aSrcPoint = nsIntPoint(0, 0), bool aPixelBuffer = PR_FALSE); -#ifndef MOZ_ENABLE_LIBXUL - virtual ShaderProgramType UploadSurfaceToTextureExternal(gfxASurface *aSurface, - const nsIntRect& aSrcRect, - GLuint& aTexture, - bool aOverwrite = false, - const nsIntPoint& aDstPoint = nsIntPoint(0, 0), - bool aPixelBuffer = PR_FALSE) - { - return UploadSurfaceToTexture(aSurface, aSrcRect, aTexture, aOverwrite, - aDstPoint, aPixelBuffer); - } -#endif - /** Helper for DecomposeIntoNoRepeatTriangles */ struct RectTriangles { diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index fbc9ac47390f..be4287d4660c 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -204,13 +204,6 @@ SHARED_LIBRARY_LIBS += \ $(NULL) -ifndef MOZ_ENABLE_LIBXUL -EXTRA_DSO_LIBS = gkgfx ycbcr -ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH))) -CPPSRCS += gfxDllDeps.cpp -endif -endif - EXTRA_DSO_LDOPTS += \ $(MOZ_CAIRO_LIBS) \ $(LIBS_DIR) \ diff --git a/gfx/thebes/gfxDllDeps.cpp b/gfx/thebes/gfxDllDeps.cpp deleted file mode 100644 index 464d3b7427b9..000000000000 --- a/gfx/thebes/gfxDllDeps.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "Layers.h" -#include "LayerManagerOGL.h" -#include "BasicLayers.h" -#include "ImageLayers.h" -#ifdef MOZ_ENABLE_D3D9_LAYER -#include "LayerManagerD3D9.h" -#endif -#ifdef MOZ_ENABLE_D3D10_LAYER -#include "LayerManagerD3D10.h" -#endif - -using namespace mozilla; -using namespace layers; - -void XXXNeverCalled_Layers() -{ - BasicLayerManager(nsnull); - LayerManagerOGL(nsnull); -#ifdef MOZ_ENABLE_D3D9_LAYER - LayerManagerD3D9(nsnull); -#endif -#ifdef MOZ_ENABLE_D3D10_LAYER - LayerManagerD3D10(nsnull); -#endif -} diff --git a/intl/uconv/tests/Makefile.in b/intl/uconv/tests/Makefile.in index 1af7e50b86ec..d17360039336 100644 --- a/intl/uconv/tests/Makefile.in +++ b/intl/uconv/tests/Makefile.in @@ -46,23 +46,21 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_intl_uconv XPCSHELL_TESTS = unit -ifndef MOZ_ENABLE_LIBXUL -MOZILLA_INTERNAL_API = 1 - - -CPPSRCS = \ - TestUConv.cpp \ - nsconv.cpp \ - plattest.cpp \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += convperf.cpp -endif - -SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) - -endif # MOZ_ENABLE_LIBXUL +# Tests disabled because they dont work in libxul builds. +#MOZILLA_INTERNAL_API = 1 +# +# +#CPPSRCS = \ +# TestUConv.cpp \ +# nsconv.cpp \ +# plattest.cpp \ +# $(NULL) +# +#ifeq ($(OS_ARCH),WINNT) +#CPPSRCS += convperf.cpp +#endif +# +#SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) relativesrcdir = intl/uconv/tests @@ -78,24 +76,3 @@ libs:: $(_TEST_FILES) $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) include $(topsrcdir)/config/rules.mk - -ifndef MOZ_ENABLE_LIBXUL -INCLUDES += \ - -I$(srcdir)/../ucvlatin \ - -I$(srcdir)/../ucvja \ - -I$(srcdir)/../util \ - $(NULL) - -LIBS += \ - $(LIBS_DIR) \ - $(XPCOM_LIBS) \ - $(NSPR_LIBS) \ - $(NULL) - -# needed for mac linux -ifeq ($(OS_ARCH),Linux) -ifneq ($(OS_RELEASE),1.2) -OS_LIBS += -ldl -endif -endif -endif # MOZ_ENABLE_LIBXUL diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in index fb2500a49f15..b43ead0be53a 100644 --- a/js/jsd/Makefile.in +++ b/js/jsd/Makefile.in @@ -47,10 +47,14 @@ include $(DEPTH)/config/autoconf.mk MODULE = jsdebug LIBRARY_NAME = jsd -FORCE_SHARED_LIB= 1 -ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) -LIBRARY_NAME = jsd32$(VERSION_NUMBER) -endif +DIRS = idl +CPPSRCS = jsd_xpc.cpp +IS_COMPONENT = 1 +LIBXUL_LIBRARY = 1 + +MODULE_NAME = JavaScript_Debugger +EXPORT_LIBRARY = 1 + # REQUIRES = java js @@ -79,21 +83,6 @@ CSRCS = \ jsd_val.c \ $(NULL) -ifdef JSD_STANDALONE -DIRS += jsdb -else -DIRS += idl -CPPSRCS = jsd_xpc.cpp -IS_COMPONENT = 1 -LIBXUL_LIBRARY = 1 - -ifdef MOZ_ENABLE_LIBXUL -FORCE_SHARED_LIB= -MODULE_NAME = JavaScript_Debugger -EXPORT_LIBRARY = 1 -endif -endif - ifdef ENABLE_TESTS TOOL_DIRS += test endif diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in index 83a91f869042..e60d65d650a9 100644 --- a/js/src/config/Makefile.in +++ b/js/src/config/Makefile.in @@ -94,7 +94,6 @@ ifdef WRAP_SYSTEM_INCLUDES export:: if test ! -d system_wrappers_js; then mkdir system_wrappers_js; fi $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - -DBUILD_STATIC_LIBS=$(BUILD_STATIC_LIBS) \ $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js $(INSTALL) system_wrappers_js $(DIST) diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in index b2bf95c22821..b99e475ddc16 100644 --- a/js/src/config/autoconf.mk.in +++ b/js/src/config/autoconf.mk.in @@ -96,7 +96,6 @@ DEHYDRA_PATH = @DEHYDRA_PATH@ NS_TRACE_MALLOC = @NS_TRACE_MALLOC@ INCREMENTAL_LINKER = @INCREMENTAL_LINKER@ MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@ -BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@ ENABLE_TESTS = @ENABLE_TESTS@ TAR=@TAR@ diff --git a/js/src/config/config.mk b/js/src/config/config.mk index fb894ae064fb..fc871c511fc9 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -245,35 +245,12 @@ endif # WINNT && !GNU_CC # # Build using PIC by default -# Do not use PIC if not building a shared lib (see exceptions below) # - -ifndef BUILD_STATIC_LIBS _ENABLE_PIC=1 -endif -ifneq (,$(FORCE_SHARED_LIB)$(FORCE_USE_PIC)) -_ENABLE_PIC=1 -endif - -# If module is going to be merged into the nsStaticModule, -# make sure that the entry points are translated and -# the module is built static. - -ifdef IS_COMPONENT -ifdef EXPORT_LIBRARY -ifneq (,$(BUILD_STATIC_LIBS)) -ifdef MODULE_NAME -DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1 -FORCE_STATIC_LIB=1 -endif -endif -endif -endif # Determine if module being compiled is destined # to be merged into libxul -ifdef MOZ_ENABLE_LIBXUL ifdef LIBXUL_LIBRARY ifdef IS_COMPONENT ifdef MODULE_NAME @@ -283,17 +260,14 @@ $(error Component makefile does not specify MODULE_NAME.) endif endif FORCE_STATIC_LIB=1 -_ENABLE_PIC=1 SHORT_LIBNAME= endif -endif # If we are building this component into an extension/xulapp, it cannot be # statically linked. In the future we may want to add a xulapp meta-component # build option. ifdef XPI_NAME -_ENABLE_PIC=1 ifdef IS_COMPONENT EXPORT_LIBRARY= FORCE_STATIC_LIB= @@ -301,19 +275,6 @@ FORCE_SHARED_LIB=1 endif endif -# -# Disable PIC if necessary -# - -ifndef _ENABLE_PIC -DSO_CFLAGS= -ifeq ($(OS_ARCH)_$(HAVE_GCC3_ABI),Darwin_1) -DSO_PIC_CFLAGS=-mdynamic-no-pic -else -DSO_PIC_CFLAGS= -endif -endif - ifndef SHARED_LIBRARY_NAME ifdef LIBRARY_NAME SHARED_LIBRARY_NAME=$(LIBRARY_NAME) @@ -371,7 +332,6 @@ endif # Force XPCOM/widget/gfx methods to be _declspec(dllexport) when we're # building libxul libraries -ifdef MOZ_ENABLE_LIBXUL ifdef LIBXUL_LIBRARY DEFINES += \ -D_IMPL_NS_COM \ @@ -388,20 +348,6 @@ ifndef JS_SHARED_LIBRARY DEFINES += -DSTATIC_EXPORTABLE_JS_API endif endif -endif - -# Force _all_ exported methods to be |_declspec(dllexport)| when we're -# building them into the executable. - -ifeq (,$(filter-out WINNT OS2, $(OS_ARCH))) -ifdef BUILD_STATIC_LIBS -DEFINES += \ - -D_IMPL_NS_GFX \ - -D_IMPL_NS_MSG_BASE \ - -D_IMPL_NS_WIDGET \ - $(NULL) -endif -endif # Flags passed to JarMaker.py MAKE_JARS_FLAGS = \ diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index 95c313642ccb..d77c70e36113 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -216,7 +216,7 @@ endif # ENABLE_TESTS # # Library rules # -# If BUILD_STATIC_LIBS or FORCE_STATIC_LIB is set, build a static library. +# If FORCE_STATIC_LIB is set, build a static library. # Otherwise, build a shared library. # @@ -239,7 +239,7 @@ endif endif ifdef LIBRARY -ifneq (_1,$(FORCE_SHARED_LIB)_$(BUILD_STATIC_LIBS)) +ifdef FORCE_SHARED_LIB ifdef MKSHLIB ifdef LIB_IS_C_ONLY @@ -266,24 +266,12 @@ ifeq ($(OS_ARCH),OS2) DEF_FILE := $(SHARED_LIBRARY:.dll=.def) endif -ifdef MOZ_ENABLE_LIBXUL EMBED_MANIFEST_AT=2 -endif endif # MKSHLIB -endif # FORCE_SHARED_LIB && !BUILD_STATIC_LIBS +endif # FORCE_SHARED_LIB endif # LIBRARY -ifeq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB)) -LIBRARY := $(NULL) -endif - -ifeq (_1,$(FORCE_SHARED_LIB)_$(BUILD_STATIC_LIBS)) -SHARED_LIBRARY := $(NULL) -DEF_FILE := $(NULL) -IMPORT_LIBRARY := $(NULL) -endif - ifdef FORCE_STATIC_LIB ifndef FORCE_SHARED_LIB SHARED_LIBRARY := $(NULL) @@ -294,7 +282,7 @@ endif ifdef FORCE_SHARED_LIB ifndef FORCE_STATIC_LIB -LIBRARY := $(NULL) +LIBRARY := $(NULL) endif endif @@ -785,12 +773,6 @@ export:: ifdef LIBRARY_NAME ifdef EXPORT_LIBRARY ifdef IS_COMPONENT -ifdef BUILD_STATIC_LIBS - @$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_COMPS) $(STATIC_LIBRARY_NAME) -ifdef MODULE_NAME - @$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_COMP_NAMES) $(MODULE_NAME) -endif -endif # BUILD_STATIC_LIBS else # !IS_COMPONENT $(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_LIBS) $(STATIC_LIBRARY_NAME) endif # IS_COMPONENT diff --git a/js/src/config/system-headers b/js/src/config/system-headers index 12a88bf75aa2..94e827944ac2 100644 --- a/js/src/config/system-headers +++ b/js/src/config/system-headers @@ -70,9 +70,6 @@ bstring.h builtin.h Button.h byteswap.h -#if MOZ_ENABLE_LIBXUL!=1 -#define WRAP_CAIRO_HEADERS -#endif #if MOZ_TREE_CAIRO!=1 #define WRAP_CAIRO_HEADERS #endif @@ -994,15 +991,6 @@ png.h #if MOZ_NATIVE_ZLIB==1 zlib.h #endif -#if MOZ_ENABLE_LIBXUL!=1 -#if BUILD_STATIC_LIBS!=1 -#define WRAP_LCMS_HEADERS -#endif -#endif -#ifdef WRAP_LCMS_HEADERS -icc34.h -lcms.h -#endif #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION libsn/sn.h libsn/sn-common.h diff --git a/js/src/configure.in b/js/src/configure.in index e32dddd61d0b..4f99e2e623fc 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -4392,7 +4392,6 @@ dnl ======================================================== MOZ_ARG_HEADER(Application) -BUILD_STATIC_LIBS= ENABLE_TESTS=1 MOZ_THUMB2= @@ -5391,18 +5390,6 @@ AC_SUBST(CC_WRAPPER) AC_SUBST(CXX_WRAPPER) -dnl ======================================================== -dnl = -dnl = Static Build Options -dnl = -dnl ======================================================== -MOZ_ARG_HEADER(Static build options) - -MOZ_ARG_ENABLE_BOOL(static, -[ --enable-static Enable building of internal static libs], - BUILD_STATIC_LIBS=1, - BUILD_STATIC_LIBS=) - dnl ======================================================== dnl = Link js shell to system readline dnl ======================================================== @@ -5521,7 +5508,6 @@ AC_SUBST(MOZ_PROFILING) AC_SUBST(MOZ_QUANTIFY) AC_SUBST(LIBICONV) -AC_SUBST(BUILD_STATIC_LIBS) AC_SUBST(ENABLE_TESTS) AC_SUBST(ENABLE_STRIP) diff --git a/js/src/xpconnect/Makefile.in b/js/src/xpconnect/Makefile.in index 7e79ef28296d..9b5e7130aea8 100644 --- a/js/src/xpconnect/Makefile.in +++ b/js/src/xpconnect/Makefile.in @@ -46,9 +46,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpconnect DIRS = public idl wrappers loader src -ifndef BUILD_STATIC_LIBS TOOL_DIRS += shell -endif ifdef ENABLE_TESTS TOOL_DIRS += tests diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect/loader/mozJSComponentLoader.cpp index bb2644dc37a3..d813d677359f 100644 --- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp @@ -86,10 +86,8 @@ #include "xpcprivate.h" #include "nsIResProtocolHandler.h" -#ifdef MOZ_ENABLE_LIBXUL #include "mozilla/scache/StartupCache.h" #include "mozilla/scache/StartupCacheUtils.h" -#endif #include "mozilla/Omnijar.h" #include "jsdbgapi.h" @@ -342,7 +340,6 @@ ReportOnCaller(JSCLContextHelper &helper, return OutputError(cx, format, ap); } -#ifdef MOZ_ENABLE_LIBXUL static nsresult ReadScriptFromStream(JSContext *cx, nsIObjectInputStream *stream, JSObject **scriptObj) @@ -444,7 +441,6 @@ WriteScriptToStream(JSContext *cx, JSObject *scriptObj, JS_XDRDestroy(xdr); return rv; } -#endif // MOZ_ENABLE_LIBXUL mozJSComponentLoader::mozJSComponentLoader() : mRuntime(nsnull), @@ -932,7 +928,6 @@ PathifyURI(nsIURI *in, nsACString &out) } /* static */ -#ifdef MOZ_ENABLE_LIBXUL nsresult mozJSComponentLoader::ReadScript(StartupCache* cache, nsIURI *uri, JSContext *cx, JSObject **scriptObj) @@ -990,7 +985,6 @@ mozJSComponentLoader::WriteScript(StartupCache* cache, JSObject *scriptObj, rv = cache->PutBuffer(spec.get(), buf, len); return rv; } -#endif //MOZ_ENABLE_LIBXUL nsresult mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponentFile, @@ -1091,7 +1085,6 @@ mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponentFile, JSObject *scriptObj = nsnull; -#ifdef MOZ_ENABLE_LIBXUL // Before compiling the script, first check to see if we have it in // the startupcache. Note: as a rule, startupcache errors are not fatal // to loading the script, since we can always slow-load. @@ -1110,7 +1103,6 @@ mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponentFile, writeToCache = PR_TRUE; } } -#endif if (!scriptObj) { // The script wasn't in the cache , so compile it now. @@ -1253,7 +1245,6 @@ mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponentFile, nativePath.get()); #endif -#ifdef MOZ_ENABLE_LIBXUL if (writeToCache) { // We successfully compiled the script, so cache it. rv = WriteScript(cache, scriptObj, aComponentFile, aURI, cx); @@ -1266,7 +1257,6 @@ mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponentFile, LOG(("Failed to write to cache\n")); } } -#endif // Assign aGlobal here so that it's available to recursive imports. // See bug 384168. diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.h b/js/src/xpconnect/loader/mozJSComponentLoader.h index 9ced3dacd04e..b86e77b0c607 100644 --- a/js/src/xpconnect/loader/mozJSComponentLoader.h +++ b/js/src/xpconnect/loader/mozJSComponentLoader.h @@ -55,11 +55,9 @@ #include "nsClassHashtable.h" #include "nsDataHashtable.h" #include "nsIPrincipal.h" -#ifdef MOZ_ENABLE_LIBXUL #include "mozilla/scache/StartupCache.h" using namespace mozilla::scache; -#endif #include "xpcIJSGetFactory.h" @@ -131,12 +129,10 @@ class mozJSComponentLoader : public mozilla::ModuleLoader, char **location, jsval *exception); -#ifdef MOZ_ENABLE_LIBXUL nsresult ReadScript(StartupCache *cache, nsIURI *uri, JSContext *cx, JSObject **scriptObj); nsresult WriteScript(StartupCache *cache, JSObject *scriptObj, nsIFile *component, nsIURI *uri, JSContext *cx); -#endif nsCOMPtr mCompMgr; nsCOMPtr mRuntimeService; diff --git a/js/src/xpconnect/shell/xpcshell.cpp b/js/src/xpconnect/shell/xpcshell.cpp index 5a56b9515d8e..f5138bb9b1b1 100644 --- a/js/src/xpconnect/shell/xpcshell.cpp +++ b/js/src/xpconnect/shell/xpcshell.cpp @@ -1871,9 +1871,7 @@ main(int argc, char **argv, char **envp) return 1; } -#ifdef MOZ_ENABLE_LIBXUL xpc_LocalizeContext(cx); -#endif nsCOMPtr xpc = do_GetService(nsIXPConnect::GetCID()); if (!xpc) { diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in index 5e009ce8194d..373e52e91ca4 100644 --- a/js/src/xpconnect/src/Makefile.in +++ b/js/src/xpconnect/src/Makefile.in @@ -53,10 +53,6 @@ SHORT_LIBNAME = xpconect IS_COMPONENT = 1 MODULE_NAME = xpconnect GRE_MODULE = 1 -ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) -LIBRARY_NAME = xpc32$(VERSION_NUMBER) -SHORT_LIBNAME = xpc32$(VERSION_NUMBER) -endif else LIBRARY_NAME = xpconnect_s FORCE_STATIC_LIB = 1 diff --git a/js/src/xpconnect/tests/Makefile.in b/js/src/xpconnect/tests/Makefile.in index 6e6927bcf67f..d2c5ec4a56cb 100644 --- a/js/src/xpconnect/tests/Makefile.in +++ b/js/src/xpconnect/tests/Makefile.in @@ -50,9 +50,9 @@ SIMPLE_PROGRAMS = TestXPC$(BIN_SUFFIX) DIRS = idl mochitest chrome -ifndef MOZ_ENABLE_LIBXUL -DIRS += components -endif +# XXX Doesn't work in libxul builds. +#DIRS += components +# XPCSHELL_TESTS = unit diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 0d2421c3772c..9430492e46a9 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -9419,16 +9419,7 @@ nsIFrame* nsIPresShell::GetAbsoluteContainingBlock(nsIFrame *aFrame) nsAccessibilityService* nsIPresShell::AccService() { -#ifdef MOZ_ENABLE_LIBXUL return GetAccService(); -#else - if (gIsAccessibilityActive) { - nsCOMPtr srv = - do_GetService("@mozilla.org/accessibilityService;1"); - return static_cast(srv.get()); - } - return nsnull; -#endif } #endif diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index da992a54000a..f2170769884d 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -58,11 +58,6 @@ MODULE_NAME = nsLayoutModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -ifndef MOZ_ENABLE_LIBXUL -EXTRA_DSO_LIBS = gkgfx -EXTRA_DSO_LIBS += angle -endif - EXTRA_DSO_LIBS += thebes ycbcr diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 8162d40c739f..e69881e053bf 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -2024,14 +2024,6 @@ public: void Invalidate(const nsRect& aDamageRect) { return InvalidateWithFlags(aDamageRect, 0); } -#ifndef MOZ_ENABLE_LIBXUL - /** - * Same as InvalidateOverflowRect, just for non-libxul builds. - */ - virtual void InvalidateOverflowRectExternal() - { return InvalidateOverflowRect(); } -#endif - /** * As Invalidate above, except that this should be called when the * rendering that has changed is performed using layers so we can avoid diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in index 8d30779fefd3..c19570d1f822 100644 --- a/layout/style/test/Makefile.in +++ b/layout/style/test/Makefile.in @@ -62,7 +62,6 @@ HOST_CPPSRCS = \ HOST_SIMPLE_PROGRAMS = $(addprefix host_, $(HOST_CPPSRCS:.cpp=$(HOST_BIN_SUFFIX))) - # ParseCSS.cpp used to be built as a test program, but it was not # being used for anything, and recent changes to the CSS loader have # made it fail to link. Further changes are planned which should make @@ -70,13 +69,9 @@ HOST_SIMPLE_PROGRAMS = $(addprefix host_, $(HOST_CPPSRCS:.cpp=$(HOST_BIN_SUFFIX) # # TestCSSPropertyLookup.cpp needs the internal XPCOM APIs and so cannot # be built with libxul enabled. - -ifndef BUILD_STATIC_LIBS -ifndef MOZ_ENABLE_LIBXUL -CPP_UNIT_TESTS = TestCSSPropertyLookup.cpp -LIBS += ../nsCSSKeywords.$(OBJ_SUFFIX) ../nsCSSProps.$(OBJ_SUFFIX) $(XPCOM_LIBS) -endif -endif +# +#CPP_UNIT_TESTS = TestCSSPropertyLookup.cpp +#LIBS += ../nsCSSKeywords.$(OBJ_SUFFIX) ../nsCSSProps.$(OBJ_SUFFIX) $(XPCOM_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/mobile/app/Makefile.in b/mobile/app/Makefile.in index 1c062dc4a0a9..5b65c1e59435 100644 --- a/mobile/app/Makefile.in +++ b/mobile/app/Makefile.in @@ -62,20 +62,11 @@ OS_LDFLAGS += -Wl,-rpath='$$ORIGIN' NSDISTMODE = copy endif -ifdef MOZ_ENABLE_LIBXUL -APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS) -else -MOZILLA_INTERNAL_API = 1 -APP_XPCOM_LIBS = $(XPCOM_LIBS) -endif +LIBS += \ + $(XPCOM_GLUE_LDOPTS) \ + $(NSPR_LIBS) \ + $(NULL) -LIBS += $(APP_XPCOM_LIBS) \ - $(NSPR_LIBS) \ - $(NULL) - -ifdef BUILD_STATIC_LIBS -LIBS += $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) -else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) LIBS += $(DIST)/bin/XUL else @@ -85,7 +76,6 @@ endif ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,version) endif -endif # BUILD_STATIC_LIBS ifdef _MSC_VER # Always enter a Windows program through wmain, whether or not we're diff --git a/mobile/confvars.sh b/mobile/confvars.sh index 6ef92163bc2e..32e3fd2de58a 100644 --- a/mobile/confvars.sh +++ b/mobile/confvars.sh @@ -47,7 +47,6 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/branding/official MOZ_SAFE_BROWSING= MOZ_SERVICES_SYNC=1 -MOZ_ENABLE_LIBXUL=1 MOZ_DISABLE_DOMCRYPTO=1 if test "$LIBXUL_SDK"; then diff --git a/mobile/installer/Makefile.in b/mobile/installer/Makefile.in index f3a2c12c2d1e..cbb8771a1418 100644 --- a/mobile/installer/Makefile.in +++ b/mobile/installer/Makefile.in @@ -52,16 +52,7 @@ include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in -ifdef MOZ_ENABLE_LIBXUL MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in -else -define message -You need to build with --enable-libxul (the default, unless you specify ---disable-libxul or --enable-shared or --enable-debug) to package a build. -endef -default libs installer:: - $(error $(message)) -endif MOZ_NONLOCALIZED_PKG_LIST = \ xpcom \ diff --git a/modules/libpr0n/src/SVGDocumentWrapper.cpp b/modules/libpr0n/src/SVGDocumentWrapper.cpp index 39b9ad94f695..2c5f6fb04aac 100644 --- a/modules/libpr0n/src/SVGDocumentWrapper.cpp +++ b/modules/libpr0n/src/SVGDocumentWrapper.cpp @@ -326,14 +326,7 @@ SVGDocumentWrapper::Observe(nsISupports* aSubject, // Sever ties from rendering observers to helper-doc's root SVG node nsSVGSVGElement* svgElem = GetRootSVGElem(); if (svgElem) { -#ifdef MOZ_ENABLE_LIBXUL nsSVGEffects::RemoveAllRenderingObservers(svgElem); -#else - // XXXdholbert Can't call static nsSVGEffects functions from imagelib in - // non-libxul builds -- so, this is a hack using a virtual function to - // have the SVG element call the method on our behalf. - svgElem->RemoveAllRenderingObservers(); -#endif // MOZ_ENABLE_LIBXUL } // Clean up at XPCOM shutdown time. diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index 58726e5ab4a2..b4080082a1d9 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -47,9 +47,6 @@ LIBRARY_NAME = pref EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsPrefModule -ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) -LIBRARY_NAME = xppref32 -endif GRE_MODULE = 1 LIBXUL_LIBRARY = 1 diff --git a/modules/zlib/src/Makefile.in b/modules/zlib/src/Makefile.in index 9179a3aa40c7..79003fa5dcf5 100644 --- a/modules/zlib/src/Makefile.in +++ b/modules/zlib/src/Makefile.in @@ -49,15 +49,6 @@ GRE_MODULE = 1 LIBXUL_LIBRARY = 1 DIST_INSTALL = 1 -ifndef MOZ_ENABLE_LIBXUL -ifeq ($(OS_ARCH),WINNT) -ifndef GNU_CC -MAPFILE = $(LIBRARY_NAME).map -DEFFILE = $(win_srcdir)/zlib.def -endif -endif -endif - ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) DEFINES += -DZLIB_DLL=1 endif diff --git a/modules/zlib/src/mozzconf.h b/modules/zlib/src/mozzconf.h index 1f0c98da47bd..08f25a3c6d4b 100644 --- a/modules/zlib/src/mozzconf.h +++ b/modules/zlib/src/mozzconf.h @@ -39,10 +39,6 @@ #if defined(XP_WIN) && defined(ZLIB_DLL) #undef ZLIB_DLL -#elif defined(HAVE_VISIBILITY_ATTRIBUTE) && !defined(MOZ_ENABLE_LIBXUL) -#define ZEXTERN __attribute__((visibility ("default"))) extern -#elif (defined(__SUNPRO_C) || defined(__SUNPRO_CC)) && !defined(MOZ_ENABLE_LIBXUL) -#define ZEXTERN __global extern #endif /* Exported Symbols */ diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in index 15b468dee54a..7db55055a233 100644 --- a/netwerk/test/Makefile.in +++ b/netwerk/test/Makefile.in @@ -71,18 +71,17 @@ SIMPLE_PROGRAMS = \ TestProtocols$(BIN_SUFFIX) \ $(NULL) -ifndef MOZ_ENABLE_LIBXUL -SIMPLE_PROGRAMS += \ - TestPerf$(BIN_SUFFIX) \ - TestIDN$(BIN_SUFFIX) \ - TestSocketTransport$(BIN_SUFFIX) \ - TestStreamTransport$(BIN_SUFFIX) \ - TestStreamChannel$(BIN_SUFFIX) \ - TestStreamPump$(BIN_SUFFIX) \ - TestIOThreads$(BIN_SUFFIX) \ - TestUDPSocketProvider$(BIN_SUFFIX) \ - $(NULL) -endif +# XXX Make this work in libxul builds. +#SIMPLE_PROGRAMS += \ +# TestPerf$(BIN_SUFFIX) \ +# TestIDN$(BIN_SUFFIX) \ +# TestSocketTransport$(BIN_SUFFIX) \ +# TestStreamTransport$(BIN_SUFFIX) \ +# TestStreamChannel$(BIN_SUFFIX) \ +# TestStreamPump$(BIN_SUFFIX) \ +# TestIOThreads$(BIN_SUFFIX) \ +# TestUDPSocketProvider$(BIN_SUFFIX) \ +# $(NULL) CPP_UNIT_TESTS = \ TestSTSParser.cpp \ diff --git a/parser/htmlparser/tests/Makefile.in b/parser/htmlparser/tests/Makefile.in index 2294a11300e4..67c60fc593b4 100644 --- a/parser/htmlparser/tests/Makefile.in +++ b/parser/htmlparser/tests/Makefile.in @@ -48,10 +48,9 @@ DIRS = \ mochitest \ $(NULL) -ifndef MOZ_ENABLE_LIBXUL -DIRS += \ - outsinks \ - $(NULL) -endif +# XXX This doesn't work in libxul builds. +#DIRS += \ +# outsinks \ +# $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in index 2458968a25ba..7a961a1814ab 100644 --- a/rdf/build/Makefile.in +++ b/rdf/build/Makefile.in @@ -64,12 +64,6 @@ SHARED_LIBRARY_LIBS = \ ../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \ $(NULL) -ifndef MOZ_ENABLE_LIBXUL -SHARED_LIBRARY_LIBS += \ - ../util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \ - $(NULL) -endif - EXTRA_DSO_LDOPTS = \ $(LIBS_DIR) \ $(EXTRA_DSO_LIBS) \ diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in index c55fc872fd0b..69871fd0beb3 100644 --- a/toolkit/components/places/Makefile.in +++ b/toolkit/components/places/Makefile.in @@ -104,12 +104,6 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(NULL) -ifndef MOZ_ENABLE_LIBXUL -EXTRA_DSO_LDOPTS += \ - $(MOZ_JS_LIBS) \ - $(NULL) -endif - LOCAL_INCLUDES += -I$(srcdir)/../build # This is the default value. Must be in sync with the one defined in SQLite. diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp index a6489253d690..cf3d7fb19550 100644 --- a/toolkit/components/startup/nsAppStartup.cpp +++ b/toolkit/components/startup/nsAppStartup.cpp @@ -97,10 +97,8 @@ #endif static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); -#ifdef MOZ_ENABLE_LIBXUL extern PRTime gXRE_mainTimestamp; extern PRTime gFirstPaintTimestamp; -#endif // mfinklesessionstore-browser-state-restored might be a better choice than the one below static PRTime gRestoredTimestamp = 0; // Timestamp of sessionstore-windows-restored static PRTime gProcessCreationTimestamp = 0;// Timestamp of sessionstore-windows-restored @@ -724,10 +722,8 @@ nsAppStartup::GetStartupInfo() } MaybeDefineProperty(cx, obj, "process", gProcessCreationTimestamp); -#ifdef MOZ_ENABLE_LIBXUL MaybeDefineProperty(cx, obj, "main", gXRE_mainTimestamp); MaybeDefineProperty(cx, obj, "firstPaint", gFirstPaintTimestamp); -#endif MaybeDefineProperty(cx, obj, "sessionRestored", gRestoredTimestamp); return NS_OK; } diff --git a/toolkit/components/url-classifier/tests/Makefile.in b/toolkit/components/url-classifier/tests/Makefile.in index ea742cb3f984..3445fcd712d7 100644 --- a/toolkit/components/url-classifier/tests/Makefile.in +++ b/toolkit/components/url-classifier/tests/Makefile.in @@ -56,23 +56,10 @@ DIRS += mochitest \ # xpcshell tests XPCSHELL_TESTS=unit -ifndef MOZ_ENABLE_LIBXUL -# simple c++ tests (no xpcom) -CPP_UNIT_TESTS = \ - TestUrlClassifierUtils.cpp \ - $(NULL) - -LOCAL_INCLUDES = \ - -I$(srcdir)/../src \ - -I$(srcdir)/../public \ - $(NULL) - -LIBS = \ - ../src/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX) \ - $(MOZ_COMPONENT_LIBS) \ - $(XPCOM_LIBS) \ - $(NSPR_LIBS) \ - $(NULL) -endif +# XXX Get this to work in libxul builds. +## simple c++ tests (no xpcom) +#CPP_UNIT_TESTS = \ +# TestUrlClassifierUtils.cpp \ +# $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in index b54531787f82..f93fb1cf475c 100644 --- a/toolkit/crashreporter/test/Makefile.in +++ b/toolkit/crashreporter/test/Makefile.in @@ -49,6 +49,8 @@ XPCSHELL_TESTS = unit LIBRARY_NAME = testcrasher NO_DIST_INSTALL = 1 +FORCE_SHARED_LIB = 1 + VPATH += \ $(srcdir)/../google-breakpad/src/processor/ \ $(srcdir)/../google-breakpad/src/common/ \ @@ -70,23 +72,7 @@ LOCAL_INCLUDES += \ -I$(srcdir)/../google-breakpad/src/ \ $(NULL) EXTRA_DSO_LIBS += xpcom -EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) - -ifdef MOZ_ENABLE_LIBXUL -EXTRA_DSO_LDOPTS += $(XPCOM_GLUE_LDOPTS) -else - -MOZILLA_INTERNAL_API = 1 - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL -else -EXTRA_DSO_LIBS += xul -endif - -EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS) $(XPCOM_LIBS) - -endif +EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS) EXTRA_JS_MODULES = CrashTestUtils.jsm diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 9023dcb3aaec..2db6cfb09221 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -87,7 +87,6 @@ SHARED_LIBRARY_LIBS += \ $(foreach lib,$(STATIC_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \ $(NULL) -ifdef MOZ_ENABLE_LIBXUL include $(srcdir)/libxul-config.mk EXTRA_DEPS += \ @@ -124,7 +123,6 @@ GARBAGE += \ $(RDF_UTIL_SRC_LCPPSRCS) \ $(NULL) endif -endif ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) SDK_LIBRARY = $(IMPORT_LIBRARY) @@ -144,13 +142,6 @@ endif EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -ifndef MOZ_ENABLE_LIBXUL -EXTRA_DSO_LDOPTS += \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NULL) -endif - DEFINES += -DIMPL_XREAPI EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) @@ -253,9 +244,7 @@ include $(topsrcdir)/config/rules.mk export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) $(INSTALL) $^ . -ifdef MOZ_ENABLE_LIBXUL include $(srcdir)/libxul-rules.mk -endif ifeq ($(OS_ARCH),OpenBSD) # Needed by nsAuthGSSAPI diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk index 23a88182c36d..a479c37c03a1 100644 --- a/toolkit/library/libxul-config.mk +++ b/toolkit/library/libxul-config.mk @@ -50,7 +50,6 @@ endif ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) CPPSRCS += \ - dlldeps.cpp \ nsGFXDeps.cpp \ $(NULL) @@ -73,7 +72,6 @@ ifeq ($(OS_ARCH),OS2) REQUIRES += widget gfx CPPSRCS += \ - dlldeps.cpp \ nsGFXDeps.cpp \ $(NULL) @@ -81,10 +79,8 @@ ifndef MOZ_NATIVE_ZLIB CPPSRCS += dlldeps-zlib.cpp endif -ifdef MOZ_ENABLE_LIBXUL RESFILE = xulrunos2.res RCFLAGS += -i $(topsrcdir)/widget/src/os2 -endif LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/os2 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base diff --git a/toolkit/library/libxul-rules.mk b/toolkit/library/libxul-rules.mk index 16143e2382bc..e4517595f0c0 100644 --- a/toolkit/library/libxul-rules.mk +++ b/toolkit/library/libxul-rules.mk @@ -57,10 +57,3 @@ DEFINES += \ ifeq ($(MOZ_WIDGET_TOOLKIT),windows) OS_LIBS += $(call EXPAND_LIBNAME,usp10 oleaut32) endif - -export:: dlldeps.cpp - -dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp - $(INSTALL) $^ . - -GARBAGE += dlldeps.cpp diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk index 2e0df0c4baec..2323206a5173 100644 --- a/toolkit/toolkit-tiers.mk +++ b/toolkit/toolkit-tiers.mk @@ -226,11 +226,8 @@ endif tier_platform_dirs += services/crypto/component -ifdef MOZ_ENABLE_LIBXUL tier_platform_dirs += startupcache -endif -ifndef BUILD_STATIC_LIBS ifdef APP_LIBXUL_STATICDIRS # Applications can cheat and ask for code to be # built before libxul so libxul can be linked against it. @@ -243,11 +240,8 @@ tier_platform_dirs += $(APP_LIBXUL_DIRS) endif tier_platform_dirs += toolkit/library -endif -ifdef MOZ_ENABLE_LIBXUL tier_platform_dirs += xpcom/stub -endif ifdef NS_TRACE_MALLOC tier_platform_dirs += tools/trace-malloc diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 7771a7ee048f..28ad29b55639 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -64,6 +64,7 @@ CPPSRCS = \ nsNativeAppSupportBase.cpp \ nsAppData.cpp \ nsSigHandlers.cpp \ + nsEmbedFunctions.cpp \ $(NULL) ifdef MOZ_X11 @@ -82,10 +83,6 @@ endif DEFINES += -DIMPL_XREAPI -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' -ifndef BUILD_STATIC_LIBS -CPPSRCS += nsEmbedFunctions.cpp -endif - ifdef MOZ_UPDATER ifneq ($(OS_TARGET),Android) CPPSRCS += nsUpdateDriver.cpp @@ -196,11 +193,6 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ $(NULL) -ifdef BUILD_STATIC_LIBS -export:: - @$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_COMP_NAMES) Apprunner -endif - LOCAL_INCLUDES += \ -I$(srcdir) \ -I$(srcdir)/../profile \ @@ -213,10 +205,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) CXXFLAGS += $(MOZ_PANGO_CFLAGS) endif -ifdef BUILD_STATIC_LIBS -DEFINES += -D_BUILD_STATIC_BIN -endif - DEFINES += \ -DOS_TARGET=\"$(OS_TARGET)\" \ -DMOZ_WIDGET_TOOLKIT=\"$(MOZ_WIDGET_TOOLKIT)\" diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 5fae29c22ab4..b8fcfcda1cdc 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -1134,16 +1134,6 @@ ScopedXPCOMStartup::Initialize() nsresult rv; -#ifndef MOZ_ENABLE_LIBXUL -#ifndef _BUILD_STATIC_BIN - XRE_AddStaticComponent(&kXREModule); -#else - for (const mozilla::Module *const *const *staticModules = kPStaticModules; - *staticModules; ++staticModules) - XRE_AddStaticComponent(**staticModules); -#endif -#endif - rv = NS_InitXPCOM2(&mServiceManager, gDirServiceProvider->GetAppDir(), gDirServiceProvider); if (NS_FAILED(rv)) { @@ -1707,9 +1697,7 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative, #if defined(XP_MACOSX) CommandLineServiceMac::SetupMacCommandLine(gRestartArgc, gRestartArgv, PR_TRUE); PRUint32 restartMode = 0; -#if defined(MOZ_ENABLE_LIBXUL) restartMode = gRestartMode; -#endif LaunchChildMac(gRestartArgc, gRestartArgv, restartMode); #else nsCOMPtr lf; diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in index ac50f705cd97..ad9560265321 100644 --- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -78,11 +78,9 @@ endif include $(topsrcdir)/config/config.mk -ifdef MOZ_ENABLE_LIBXUL ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT)) EXTRA_DSO_LIBS = xul endif -endif LIBS += \ $(LIBS_DIR) \ @@ -93,11 +91,9 @@ LIBS += \ $(NSPR_LIBS) \ $(NULL) -ifdef MOZ_ENABLE_LIBXUL ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) LIBS += $(DIST)/bin/XUL endif -endif ifdef HAVE_BOUTELL_GD ifeq ($(OS_ARCH),WINNT) diff --git a/widget/src/android/GfxInfo.cpp b/widget/src/android/GfxInfo.cpp index 01f1f3fa97ef..8a0638bba856 100644 --- a/widget/src/android/GfxInfo.cpp +++ b/widget/src/android/GfxInfo.cpp @@ -43,7 +43,7 @@ #include "AndroidBridge.h" -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) #include "nsExceptionHandler.h" #include "nsICrashReporter.h" #define NS_CRASHREPORTER_CONTRACTID "@mozilla.org/toolkit/crash-reporter;1" @@ -159,7 +159,7 @@ void GfxInfo::AddCrashReportAnnotations() { #if 0 -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) nsCAutoString deviceIDString, vendorIDString; PRUint32 deviceID, vendorID; diff --git a/widget/src/cocoa/GfxInfo.mm b/widget/src/cocoa/GfxInfo.mm index 6e3eff38b926..83e7bbc7711d 100644 --- a/widget/src/cocoa/GfxInfo.mm +++ b/widget/src/cocoa/GfxInfo.mm @@ -44,7 +44,7 @@ #include "mozilla/FunctionTimer.h" #include "nsToolkit.h" -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) #include "nsExceptionHandler.h" #include "nsICrashReporter.h" #define NS_CRASHREPORTER_CONTRACTID "@mozilla.org/toolkit/crash-reporter;1" @@ -180,7 +180,7 @@ GfxInfo::GetAdapterDeviceID(PRUint32 *aAdapterDeviceID) void GfxInfo::AddCrashReportAnnotations() { -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AdapterRendererIDs"), NS_LossyConvertUTF16toASCII(mRendererIDsString)); diff --git a/widget/src/os2/Makefile.in b/widget/src/os2/Makefile.in index 0a194ba6d191..4751cfec83d9 100644 --- a/widget/src/os2/Makefile.in +++ b/widget/src/os2/Makefile.in @@ -52,10 +52,6 @@ GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -ifdef BUILD_STATIC_LIBS -EXPORTS = wdgtos2rc.h -endif - CPPSRCS = \ nsAppShell.cpp \ nsBidiKeyboard.cpp \ diff --git a/widget/src/windows/GfxInfo.cpp b/widget/src/windows/GfxInfo.cpp index 89001a49abed..9e91ab027116 100644 --- a/widget/src/windows/GfxInfo.cpp +++ b/widget/src/windows/GfxInfo.cpp @@ -48,7 +48,7 @@ #include "prprf.h" #include "GfxDriverInfo.h" -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) #include "nsExceptionHandler.h" #include "nsICrashReporter.h" #define NS_CRASHREPORTER_CONTRACTID "@mozilla.org/toolkit/crash-reporter;1" @@ -533,7 +533,7 @@ GfxInfo::GetAdapterDeviceID(PRUint32 *aAdapterDeviceID) return NS_OK; } -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) /* Cisco's VPN software can cause corruption of the floating point state. * Make a note of this in our crash reports so that some weird crashes * make more sense */ @@ -553,7 +553,7 @@ CheckForCiscoVPN() { void GfxInfo::AddCrashReportAnnotations() { -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) CheckForCiscoVPN(); nsCAutoString deviceIDString, vendorIDString; diff --git a/widget/src/windows/Makefile.in b/widget/src/windows/Makefile.in index 2e2ce57d958d..cc00a9201643 100644 --- a/widget/src/windows/Makefile.in +++ b/widget/src/windows/Makefile.in @@ -114,10 +114,6 @@ ifdef MOZ_ENABLE_D3D10_LAYER DEFINES += -DMOZ_ENABLE_D3D10_LAYER endif -ifdef BUILD_STATIC_LIBS -DEFINES += -DMOZ_STATIC_COMPONENT_LIBS -endif # BUILD_STATIC_LIBS - EXPORTS = nsdefs.h WindowHook.h diff --git a/widget/src/windows/nsToolkit.cpp b/widget/src/windows/nsToolkit.cpp index 3ebe75d3b9f9..a15153d3b460 100644 --- a/widget/src/windows/nsToolkit.cpp +++ b/widget/src/windows/nsToolkit.cpp @@ -75,46 +75,6 @@ StartAllowingD3D9(nsITimer *aTimer, void *aClosure) nsWindow::StartAllowingD3D9(true); } -#if !defined(MOZ_STATIC_COMPONENT_LIBS) && !defined(MOZ_ENABLE_LIBXUL) -// -// Dll entry point. Keep the dll instance -// - -#if defined(__GNUC__) -// If DllMain gets name mangled, it won't be seen. -extern "C" { -#endif - -BOOL APIENTRY DllMain( HINSTANCE hModule, - DWORD reason, - LPVOID lpReserved ) -{ - switch( reason ) { - case DLL_PROCESS_ATTACH: - nsToolkit::Startup(hModule); - break; - - case DLL_THREAD_ATTACH: - break; - - case DLL_THREAD_DETACH: - break; - - case DLL_PROCESS_DETACH: - nsToolkit::Shutdown(); - break; - - } - - return TRUE; -} - -#if defined(__GNUC__) -} // extern "C" -#endif - -#endif - // // main for the message pump thread // diff --git a/widget/src/windows/tests/Makefile.in b/widget/src/windows/tests/Makefile.in index 0830f72ec696..9594e916ac3f 100644 --- a/widget/src/windows/tests/Makefile.in +++ b/widget/src/windows/tests/Makefile.in @@ -42,28 +42,25 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifndef BUILD_STATIC_LIBS -ifndef MOZ_ENABLE_LIBXUL -LOCAL_INCLUDES = -I$(srcdir)/../ \ - -I$(srcdir)/../../xpwidgets \ - $(NULL) - -LIBS = ../$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \ - ../../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)thebes.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)gkgfx.$(LIB_SUFFIX) \ - $(XPCOM_LIBS) \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(QCMS_LIBS) \ - $(NULL) - -EXTRA_DSO_LDOPTS += $(LIBS_DIR) - -OS_LIBS += $(call EXPAND_LIBNAME,ole32 oleaut32 shell32 comctl32 comdlg32 imm32 shlwapi winspool msimg32) - -CPP_UNIT_TESTS = TestWinDND.cpp \ - $(NULL) -endif -endif +# XXX None of these stuff works in libxul builds. +#LOCAL_INCLUDES = -I$(srcdir)/../ \ +# -I$(srcdir)/../../xpwidgets \ +# $(NULL) +# +#LIBS = ../$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \ +# ../../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \ +# $(DIST)/lib/$(LIB_PREFIX)thebes.$(LIB_SUFFIX) \ +# $(DIST)/lib/$(LIB_PREFIX)gkgfx.$(LIB_SUFFIX) \ +# $(XPCOM_LIBS) \ +# $(MOZ_UNICHARUTIL_LIBS) \ +# $(QCMS_LIBS) \ +# $(NULL) +# +#EXTRA_DSO_LDOPTS += $(LIBS_DIR) +# +#OS_LIBS += $(call EXPAND_LIBNAME,ole32 oleaut32 shell32 comctl32 comdlg32 imm32 shlwapi winspool msimg32) +# +#CPP_UNIT_TESTS = TestWinDND.cpp \ +# $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/widget/src/xpwidgets/GfxInfoBase.cpp b/widget/src/xpwidgets/GfxInfoBase.cpp index 6711fbb127a6..15878c7b4c18 100644 --- a/widget/src/xpwidgets/GfxInfoBase.cpp +++ b/widget/src/xpwidgets/GfxInfoBase.cpp @@ -55,7 +55,7 @@ #include "nsTArray.h" #include "mozilla/Preferences.h" -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) #include "nsExceptionHandler.h" #endif @@ -87,7 +87,7 @@ StoreSpline(int ax, int ay, int bx, int by, int cx, int cy, int dx, int dy) { void CrashSpline(double tolerance, int ax, int ay, int bx, int by, int cx, int cy, int dx, int dy) { -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) static bool annotated; if (!annotated) { @@ -644,7 +644,7 @@ GfxInfoBase::LogFailure(const nsACString &failure) mFailures[mFailureCount++] = failure; /* record it in the crash notes too */ -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) CrashReporter::AppendAppNotesToCrashReport(failure); #endif } diff --git a/widget/src/xpwidgets/nsNativeTheme.cpp b/widget/src/xpwidgets/nsNativeTheme.cpp index 05eeddd79e4a..ca45ef174b72 100644 --- a/widget/src/xpwidgets/nsNativeTheme.cpp +++ b/widget/src/xpwidgets/nsNativeTheme.cpp @@ -557,11 +557,7 @@ nsNativeTheme::Notify(nsITimer* aTimer) for (PRUint32 index = 0; index < count; index++) { nsIFrame* frame = mAnimatedContentList[index]->GetPrimaryFrame(); if (frame) { -#ifdef MOZ_ENABLE_LIBXUL frame->InvalidateOverflowRect(); -#else - frame->InvalidateOverflowRectExternal(); -#endif } } diff --git a/xpcom/Makefile.in b/xpcom/Makefile.in index 6e1a54716683..8af06ee85bd2 100644 --- a/xpcom/Makefile.in +++ b/xpcom/Makefile.in @@ -61,10 +61,6 @@ DIRS = \ build \ $(NULL) -ifndef MOZ_ENABLE_LIBXUL -DIRS += stub -endif - ifeq ($(OS_ARCH),WINNT) ifdef MOZ_DEBUG DIRS += windbgdlg @@ -79,12 +75,10 @@ TOOL_DIRS += \ proxy/tests # Can't build internal xptcall tests that use symbols which are not exported. -ifndef MOZ_ENABLE_LIBXUL -TOOL_DIRS += \ - reflect/xptinfo/tests \ - reflect/xptcall/tests \ - $(NULL) -endif +#TOOL_DIRS += \ +# reflect/xptinfo/tests \ +# reflect/xptcall/tests \ +# $(NULL) endif # xpcom-config.h is generated by configure diff --git a/xpcom/base/nsDebugImpl.cpp b/xpcom/base/nsDebugImpl.cpp index 5795caaeebe5..42e9af82afe3 100644 --- a/xpcom/base/nsDebugImpl.cpp +++ b/xpcom/base/nsDebugImpl.cpp @@ -329,7 +329,7 @@ NS_DebugBreak(PRUint32 aSeverity, const char *aStr, const char *aExpr, return; case NS_DEBUG_ABORT: { -#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL) +#if defined(MOZ_CRASHREPORTER) nsCString note("xpcom_runtime_abort("); note += buf.buffer; note += ")"; diff --git a/xpcom/base/nscore.h b/xpcom/base/nscore.h index c1ddece0e43e..c1f8ab54676e 100644 --- a/xpcom/base/nscore.h +++ b/xpcom/base/nscore.h @@ -295,15 +295,7 @@ #define XPCOM_API(type) IMPORT_XPCOM_API(type) #endif -#ifdef MOZ_ENABLE_LIBXUL #define NS_COM -#elif defined(_IMPL_NS_COM) -#define NS_COM NS_EXPORT -#elif defined(XPCOM_GLUE) -#define NS_COM -#else -#define NS_COM NS_IMPORT -#endif #ifdef MOZILLA_INTERNAL_API # define NS_COM_GLUE NS_COM diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 61e760140a34..c1c087953dc0 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -50,11 +50,7 @@ MODULE = xpcom LIBRARY_NAME = xpcom_core SHORT_LIBNAME = xpcomcor LIBXUL_LIBRARY = 1 - -# This is only a static library in libxul builds -ifdef MOZ_ENABLE_LIBXUL EXPORT_LIBRARY = 1 -endif GRE_MODULE = 1 MOZILLA_INTERNAL_API = 1 @@ -72,12 +68,6 @@ CPPSRCS = \ Omnijar.cpp \ $(NULL) -ifndef MOZ_ENABLE_LIBXUL -ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) -CPPSRCS += dlldeps.cpp -endif -endif - SHARED_LIBRARY_LIBS = \ $(DEPTH)/chrome/src/$(LIB_PREFIX)chrome_s.$(LIB_SUFFIX) \ ../ds/$(LIB_PREFIX)xpcomds_s.$(LIB_SUFFIX) \ @@ -138,10 +128,6 @@ EXPORTS_mozilla = \ # Force use of PIC FORCE_USE_PIC = 1 -ifndef MOZ_ENABLE_LIBXUL -FORCE_SHARED_LIB = 1 -endif - # UNIX98 iconv support OS_LIBS += $(LIBICONV) @@ -189,9 +175,6 @@ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version) ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) OS_LIBS += $(call EXPAND_LIBNAME,imagehlp) endif -ifndef MOZ_ENABLE_LIBXUL -OS_LIBS += $(call EXPAND_LIBNAME,psapi) -endif endif # WINNT export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) $(XPCOM_GLUENS_SRC_CPPSRCS) diff --git a/xpcom/build/dlldeps.cpp b/xpcom/build/dlldeps.cpp deleted file mode 100644 index b5c67b1f2a19..000000000000 --- a/xpcom/build/dlldeps.cpp +++ /dev/null @@ -1,311 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -// Force references to all of the symbols that we want exported from -// the dll that are located in the .lib files we link with - -#ifdef XP_WIN -#include -#include "nsWindowsRegKey.h" -#include "nsSetDllDirectory.h" -#ifdef DEBUG -#include "pure.h" -#endif -#endif -#include "nsXULAppAPI.h" -#include "nsXPCOMGlue.h" -#include "nsVoidArray.h" -#include "nsTArray.h" -#include "nsIAtom.h" -#include "nsFixedSizeAllocator.h" -#include "nsRecyclingAllocator.h" -#include "nsDeque.h" -#include "nsTraceRefcnt.h" -#include "nsTraceRefcntImpl.h" -#include "nsXPIDLString.h" -#include "nsIEnumerator.h" -#include "nsEnumeratorUtils.h" -#include "nsQuickSort.h" -#include "nsString.h" -#include "nsPrintfCString.h" -#include "nsSupportsArray.h" -#include "nsArrayEnumerator.h" -#include "nsProxyRelease.h" -#include "xpt_xdr.h" -#include "xptcall.h" -#include "nsILocalFile.h" -#include "nsIPipe.h" -#include "nsStreamUtils.h" -#include "nsWeakReference.h" -#include "nsTextFormatter.h" -#include "nsIStorageStream.h" -#include "nsStringStream.h" -#include "nsLinebreakConverter.h" -#include "nsIBinaryInputStream.h" -#include "nsIInterfaceRequestor.h" -#include "nsIInterfaceRequestorUtils.h" -#include "nsReadableUtils.h" -#include "nsStaticNameTable.h" -#include "nsProcess.h" -#include "nsStringEnumerator.h" -#include "nsIInputStreamTee.h" -#include "nsCheapSets.h" -#include "nsHashKeys.h" -#include "nsTHashtable.h" -#include "pldhash.h" -#include "nsVariant.h" -#include "nsEscape.h" -#include "nsStreamUtils.h" -#include "nsNativeCharsetUtils.h" -#include "nsInterfaceRequestorAgg.h" -#include "nsHashPropertyBag.h" -#include "nsXPCOMStrings.h" -#include "nsStringBuffer.h" -#include "nsCategoryCache.h" -#include "nsCycleCollectionParticipant.h" -#include "nsCycleCollector.h" -#include "nsThreadUtils.h" -#include "nsTObserverArray.h" -#include "nsWildCard.h" -#include "mozilla/Mutex.h" -#include "mozilla/Monitor.h" -#include "mozilla/CondVar.h" -#include "mozilla/TimeStamp.h" - -using namespace mozilla; - -class nsCStringContainer : private nsStringContainer_base { }; -class nsStringContainer : private nsStringContainer_base { }; - -void XXXNeverCalled() -{ - nsTextFormatter::snprintf(nsnull,0,nsnull); - nsTextFormatter::smprintf(nsnull, nsnull); - nsTextFormatter::smprintf_free(nsnull); - nsVoidArray(); - nsSmallVoidArray(); - { - nsTArray array1(1), array2(1); - PRBool a, b, c; - a = b = c = PR_FALSE; - array1.AppendElement(a); - array2.InsertElementAt(b, 0); - array2.InsertElementAt(c, 0); - array1.AppendElements(array2); - } - { - nsTObserverArray dummyObserverArray; - PRBool a = PR_FALSE; - dummyObserverArray.AppendElement(a); - dummyObserverArray.RemoveElement(a); - dummyObserverArray.Clear(); - } - nsStringHashSet(); - nsCStringHashSet(); - nsInt32HashSet(); - nsVoidHashSet(); - nsCheapStringSet(); - nsCheapInt32Set(); - nsSupportsArray(); - NS_GetNumberOfAtoms(); - NS_NewPipe(nsnull, nsnull, 0, 0, PR_FALSE, PR_FALSE, nsnull); - NS_NewPipe2(nsnull, nsnull, PR_FALSE, PR_FALSE, 0, 0, nsnull); - NS_NewInputStreamReadyEvent(nsnull, nsnull, nsnull); - NS_NewOutputStreamReadyEvent(nsnull, nsnull, nsnull); - NS_AsyncCopy(nsnull, nsnull, nsnull, NS_ASYNCCOPY_VIA_READSEGMENTS, 0, nsnull, nsnull); - { - nsCString temp; - NS_ConsumeStream(nsnull, 0, temp); - } - NS_InputStreamIsBuffered(nsnull); - NS_OutputStreamIsBuffered(nsnull); - NS_CopySegmentToStream(nsnull, nsnull, nsnull, 0, 0, nsnull); - NS_CopySegmentToBuffer(nsnull, nsnull, nsnull, 0, 0, nsnull); - NS_DiscardSegment(nsnull, nsnull, nsnull, 0, 0, nsnull); - NS_WriteSegmentThunk(nsnull, nsnull, nsnull, 0, 0, 0); - NS_NewByteInputStream(nsnull, nsnull, 0, NS_ASSIGNMENT_COPY); - NS_NewCStringInputStream(nsnull, nsCString()); - NS_NewStringInputStream(nsnull, nsString()); - PL_DHashStubEnumRemove(nsnull, nsnull, nsnull, nsnull); - nsIDHashKey::HashKey(nsnull); - nsFixedSizeAllocator a; - nsRecyclingAllocator recyclingAllocator(2); - a.Init(0, 0, 0, 0, 0); - a.Alloc(0); - a.Free(0, 0); - nsDeque d(nsnull); - nsDequeIterator di(d); - nsTraceRefcnt::LogAddCOMPtr(nsnull, nsnull); - nsTraceRefcntImpl::DumpStatistics(); - NS_NewEmptyEnumerator(nsnull); - NS_QuickSort(nsnull, 0, 0, nsnull, nsnull); - nsString(); - NS_ProxyRelease(nsnull, nsnull, PR_FALSE); - XPT_DoString(nsnull, nsnull, nsnull); - XPT_DoHeader(nsnull, nsnull, nsnull); - NS_InvokeByIndex(nsnull, 0, 0, nsnull); - NS_GetWeakReference(nsnull); - nsCOMPtr dummyFoo(do_GetInterface(nsnull)); - NS_NewStorageStream(0,0, nsnull); - nsString foo; - nsPrintfCString bar(""); - nsLinebreakConverter::ConvertStringLineBreaks(foo, - nsLinebreakConverter::eLinebreakAny, nsLinebreakConverter::eLinebreakContent); - NS_NewLocalFile(EmptyString(), PR_FALSE, nsnull); - NS_NewNativeLocalFile(EmptyCString(), PR_FALSE, nsnull); - new nsProcess(); - nsStaticCaseInsensitiveNameTable(); - nsAutoString str1; - str1.AssignWithConversion(nsnull, 0); - nsCAutoString str2; - ToNewUnicode(str1); - ToNewUnicode(str2); - ToNewCString(str1); - ToNewCString(str2); - PL_DHashTableFinish(nsnull); - NS_NewInputStreamTee(nsnull, nsnull, nsnull); - nsCOMArray dummyArray; - NS_NewArrayEnumerator(nsnull, dummyArray); - new nsVariant(); - nsUnescape(nsnull); - nsEscape(nsnull, url_XAlphas); - nsTArray array; - NS_NewStringEnumerator(nsnull, &array); - NS_NewAdoptingStringEnumerator(nsnull, &array); - nsTArray carray; - NS_NewUTF8StringEnumerator(nsnull, &carray); - NS_NewAdoptingUTF8StringEnumerator(nsnull, &carray); - nsVoidableString str3; - { - nsAdoptingCString foo, bar; - foo = bar; - } - { - nsAdoptingString foo, bar; - foo = bar; - } - NS_CopyNativeToUnicode(str2, str1); - NS_CopyUnicodeToNative(str1, str2); - { - nsID id; - CallCreateInstance(id, nsnull, id, nsnull); - CallCreateInstance("", nsnull, id, nsnull); - CallGetClassObject(id, id, nsnull); - CallGetClassObject("", id, nsnull); - } - NS_NewInterfaceRequestorAggregation(nsnull, nsnull, nsnull); - NS_NewHashPropertyBag(nsnull); - nsDependentString depstring; - depstring.Rebind(nsnull, PRUint32(0)); - nsDependentCString depcstring; - depcstring.Rebind(nsnull, PRUint32(0)); - // nsStringAPI - nsCStringContainer sc1; - NS_CStringContainerInit(sc1); - NS_CStringContainerInit2(sc1, nsnull, 0, 0); - NS_CStringContainerFinish(sc1); - NS_CStringGetData(str2, nsnull, nsnull); - NS_CStringGetMutableData(str2, 0, nsnull); - NS_CStringSetData(str2, nsnull, 0); - NS_CStringSetDataRange(str2, 0, 0, nsnull, 0); - NS_CStringCopy(str2, str2); - NS_CStringCloneData(str2); - nsStringContainer sc2; - NS_StringContainerInit(sc2); - NS_StringContainerInit2(sc2, nsnull, 0, 0); - NS_StringContainerFinish(sc2); - NS_StringGetData(str1, nsnull, nsnull); - NS_StringGetMutableData(str1, 0, nsnull); - NS_StringSetData(str1, nsnull, 0); - NS_StringSetDataRange(str1, 0, 0, nsnull, 0); - NS_StringCopy(str1, str1); - NS_StringCloneData(str1); - NS_UTF16ToCString(str1, NS_CSTRING_ENCODING_ASCII, str2); - NS_CStringToUTF16(str2, NS_CSTRING_ENCODING_ASCII, str1); - - nsCategoryObserver catobs(nsnull, nsnull); - nsCategoryCache catcache(nsnull); - - // nsStringBuffer.h - { - nsString x; - nsCString y; - nsStringBuffer b; - b.AddRef(); - b.Release(); - nsStringBuffer::Alloc(0); - nsStringBuffer::Realloc(nsnull, 0); - nsStringBuffer::FromString(x); - nsStringBuffer::FromString(y); - b.ToString(0, x); - b.ToString(0, y); - } - - nsXPCOMCycleCollectionParticipant(); - nsCycleCollector_collect(nsnull); -#ifdef XP_WIN - sXPCOMHasLoadedNewDLLs = !sXPCOMHasLoadedNewDLLs; - NS_SetHasLoadedNewDLLs(); - NS_NewWindowsRegKey(nsnull); - NS_SetDllDirectory(nsnull); -#if defined (DEBUG) - PurePrintf(0); -#endif -#endif - - NS_NewThread(nsnull, nsnull); - NS_GetCurrentThread(nsnull); - NS_GetCurrentThread(); - NS_GetMainThread(nsnull); - NS_DispatchToCurrentThread(nsnull); - NS_DispatchToMainThread(nsnull, 0); - NS_ProcessPendingEvents(nsnull, 0); - NS_HasPendingEvents(nsnull); - NS_ProcessNextEvent(nsnull, PR_FALSE); - Mutex theMutex("dummy"); - Monitor theMonitor("dummy2"); - CondVar theCondVar(theMutex, "dummy3"); - TimeStamp theTimeStamp = TimeStamp::Now(); - TimeDuration theTimeDuration = TimeDuration::FromMilliseconds(0); - - NS_WildCardValid((const char *)nsnull); - NS_WildCardValid((const PRUnichar *)nsnull); - NS_WildCardMatch((const char *)nsnull, (const char *)nsnull, PR_FALSE); - NS_WildCardMatch((const PRUnichar *)nsnull, (const PRUnichar *)nsnull, PR_FALSE); - XRE_AddStaticComponent(NULL); - XRE_AddManifestLocation(NS_COMPONENT_LOCATION, NULL); -} diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp index 2d6dbb4c989b..aaad42be59df 100644 --- a/xpcom/build/nsXPComInit.cpp +++ b/xpcom/build/nsXPComInit.cpp @@ -145,9 +145,7 @@ extern nsresult nsStringInputStreamConstructor(nsISupports *, REFNSIID, void **) #include "nsChromeRegistry.h" #include "nsChromeProtocolHandler.h" -#ifdef MOZ_ENABLE_LIBXUL #include "mozilla/scache/StartupCache.h" -#endif #include "base/at_exit.h" #include "base/command_line.h" @@ -524,9 +522,7 @@ NS_InitXPCOM2(nsIServiceManager* *result, // to the directory service. nsDirectoryService::gService->RegisterCategoryProviders(); -#ifdef MOZ_ENABLE_LIBXUL mozilla::scache::StartupCache::GetSingleton(); -#endif NS_TIME_FUNCTION_MARK("Next: create services from category"); // Notify observers of xpcom autoregistration start @@ -607,9 +603,7 @@ ShutdownXPCOM(nsIServiceManager* servMgr) } NS_ProcessPendingEvents(thread); -#ifdef MOZ_ENABLE_LIBXUL mozilla::scache::StartupCache::DeleteSingleton(); -#endif if (observerService) (void) observerService-> NotifyObservers(nsnull, NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID, diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp index 51ee884ec2e9..301ebe2a8e70 100644 --- a/xpcom/components/nsComponentManager.cpp +++ b/xpcom/components/nsComponentManager.cpp @@ -306,11 +306,9 @@ nsComponentManagerImpl::InitializeStaticModules() return; sStaticModules = new nsTArray; -#ifdef MOZ_ENABLE_LIBXUL for (const mozilla::Module *const *const *staticModules = kPStaticModules; *staticModules; ++staticModules) sStaticModules->AppendElement(**staticModules); -#endif } nsTArray* diff --git a/xpcom/glue/nsCycleCollectorUtils.cpp b/xpcom/glue/nsCycleCollectorUtils.cpp index 60f776ab4c3c..d5c59aa00882 100644 --- a/xpcom/glue/nsCycleCollectorUtils.cpp +++ b/xpcom/glue/nsCycleCollectorUtils.cpp @@ -83,12 +83,4 @@ NS_IsCycleCollectorThread() return PR_GetCurrentThread() == gCycleCollectorThread; } -#elif !defined(MOZ_ENABLE_LIBXUL) - -bool -NS_IsCycleCollectorThread() -{ - return gTLSThreadID == mozilla::threads::CycleCollector; -} - #endif diff --git a/xpcom/glue/nsCycleCollectorUtils.h b/xpcom/glue/nsCycleCollectorUtils.h index 7d9bca7d36d9..49b2d86fb45c 100644 --- a/xpcom/glue/nsCycleCollectorUtils.h +++ b/xpcom/glue/nsCycleCollectorUtils.h @@ -47,15 +47,11 @@ NS_COM bool NS_IsCycleCollectorThread(); #elif defined(NS_TLS) // Defined in nsThreadManager.cpp. extern NS_TLS mozilla::threads::ID gTLSThreadID; -#ifdef MOZ_ENABLE_LIBXUL inline bool NS_IsCycleCollectorThread() { return gTLSThreadID == mozilla::threads::CycleCollector; } #else -NS_COM bool NS_IsCycleCollectorThread(); -#endif -#else NS_COM_GLUE bool NS_IsCycleCollectorThread(); #endif #else diff --git a/xpcom/glue/nsThreadUtils.cpp b/xpcom/glue/nsThreadUtils.cpp index 1e82e004a396..b451097fb5a4 100644 --- a/xpcom/glue/nsThreadUtils.cpp +++ b/xpcom/glue/nsThreadUtils.cpp @@ -144,11 +144,6 @@ bool NS_IsMainThread() nsThreadManager::get()->nsThreadManager::GetIsMainThread(&result); return bool(result); } -#elif !defined(MOZ_ENABLE_LIBXUL) -bool NS_IsMainThread() -{ - return gTLSThreadID == mozilla::threads::Main; -} #endif NS_METHOD diff --git a/xpcom/glue/nsThreadUtils.h b/xpcom/glue/nsThreadUtils.h index c482f4d31d07..7b8c8a7e4195 100644 --- a/xpcom/glue/nsThreadUtils.h +++ b/xpcom/glue/nsThreadUtils.h @@ -106,15 +106,11 @@ NS_COM bool NS_IsMainThread(); // This is defined in nsThreadManager.cpp and initialized to `Main` for the // main thread by nsThreadManager::Init. extern NS_TLS mozilla::threads::ID gTLSThreadID; -#ifdef MOZ_ENABLE_LIBXUL inline bool NS_IsMainThread() { return gTLSThreadID == mozilla::threads::Main; } #else -NS_COM bool NS_IsMainThread(); -#endif -#else /** * Test to see if the current thread is the main thread. * diff --git a/xpcom/io/nsSegmentedBuffer.cpp b/xpcom/io/nsSegmentedBuffer.cpp index b910980cab21..3df912acd477 100644 --- a/xpcom/io/nsSegmentedBuffer.cpp +++ b/xpcom/io/nsSegmentedBuffer.cpp @@ -167,7 +167,7 @@ nsSegmentedBuffer::Empty() mFirstSegmentIndex = mLastSegmentIndex = 0; } -#if !defined(MOZ_ENABLE_LIBXUL) && defined(DEBUG) +#if 0 NS_COM void TestSegmentedBuffer() { diff --git a/xpcom/stub/Makefile.in b/xpcom/stub/Makefile.in index cb6b7ad079d7..0b8b23adf7bf 100644 --- a/xpcom/stub/Makefile.in +++ b/xpcom/stub/Makefile.in @@ -81,8 +81,6 @@ DEPENDENT_LIBS_LIST += \ $(DLL_PREFIX)mozalloc$(DLL_SUFFIX) \ $(NULL) -ifdef MOZ_ENABLE_LIBXUL - ifndef MOZ_NATIVE_SQLITE ifeq ($(OS_TARGET),OS2) DEPENDENT_LIBS_LIST += mozsqlt3.dll @@ -111,17 +109,6 @@ EXTRA_DSO_LIBS = xul DEPENDENT_LIBS_LIST += $(DLL_PREFIX)xul$(DLL_SUFFIX) endif -else #!MOZ_ENABLE_LIBXUL - -EXTRA_DSO_LIBS = xpcom_core -ifeq ($(OS_TARGET),OS2) -DEPENDENT_LIBS_LIST += xpcomcor.dll -else -DEPENDENT_LIBS_LIST += $(DLL_PREFIX)xpcom_core$(DLL_SUFFIX) -endif - -endif #ifdef MOZ_ENABLE_LIBXUL - EXTRA_DSO_LDOPTS += \ $(EXTRA_DSO_LIBS) \ $(NSPR_LIBS) \ diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index 2a045979183a..cbf6f67aa739 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -45,10 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom -ifndef MOZ_ENABLE_LIBXUL -MOZILLA_INTERNAL_API = 1 -endif - DIRS = external component bug656331_component ifeq ($(OS_ARCH),WINNT) @@ -100,30 +96,29 @@ CPP_UNIT_TESTS = \ TestCheckedInt.cpp \ $(NULL) -ifndef MOZ_ENABLE_LIBXUL -CPP_UNIT_TESTS += \ - TestArray.cpp \ - TestCRT.cpp \ - TestDeque.cpp \ - TestEncoding.cpp \ - TestExpirationTracker.cpp \ - TestPipes.cpp \ - TestPriorityQueue.cpp \ - TestProxies.cpp \ - TestStorageStream.cpp \ - TestStrings.cpp \ - TestSynchronization.cpp \ - TestTArray.cpp \ - TestThreadPool.cpp \ - TestThreads.cpp \ - TestTimeStamp.cpp \ - TestXPIDLString.cpp \ - TestUTF.cpp \ - TestAtoms.cpp \ - $(NULL) -# FIXME: bug 577500 TestStaticAtoms fails when run in dist/bin -# TestStaticAtoms.cpp -endif +# XXX Make this tests work in libxul builds. +#CPP_UNIT_TESTS += \ +# TestArray.cpp \ +# TestCRT.cpp \ +# TestDeque.cpp \ +# TestEncoding.cpp \ +# TestExpirationTracker.cpp \ +# TestPipes.cpp \ +# TestPriorityQueue.cpp \ +# TestProxies.cpp \ +# TestStorageStream.cpp \ +# TestStrings.cpp \ +# TestSynchronization.cpp \ +# TestTArray.cpp \ +# TestThreadPool.cpp \ +# TestThreads.cpp \ +# TestTimeStamp.cpp \ +# TestXPIDLString.cpp \ +# TestUTF.cpp \ +# TestAtoms.cpp \ +# $(NULL) +## FIXME: bug 577500 TestStaticAtoms fails when run in dist/bin +## TestStaticAtoms.cpp ifdef MOZ_DEBUG # FIXME bug 523392: TestDeadlockDetector doesn't like Windows diff --git a/xpcom/tests/TestPipes.cpp b/xpcom/tests/TestPipes.cpp index 47c267b05fdc..67a4d82743ab 100644 --- a/xpcom/tests/TestPipes.cpp +++ b/xpcom/tests/TestPipes.cpp @@ -471,7 +471,7 @@ RunTests(PRUint32 segSize, PRUint32 segCount) //////////////////////////////////////////////////////////////////////////////// -#if !defined(MOZ_ENABLE_LIBXUL) && defined(DEBUG) +#if 0 extern NS_COM void TestSegmentedBuffer(); #endif @@ -488,11 +488,6 @@ main(int argc, char* argv[]) if (argc > 1 && nsCRT::strcmp(argv[1], "-trace") == 0) gTrace = PR_TRUE; -#if !defined(MOZ_ENABLE_LIBXUL) && defined(DEBUG) - printf("Testing segmented buffer...\n"); - TestSegmentedBuffer(); -#endif - rv = TestChainedPipes(); NS_ASSERTION(NS_SUCCEEDED(rv), "TestChainedPipes failed"); RunTests(16, 1); diff --git a/xpcom/tests/bug656331_component/Makefile.in b/xpcom/tests/bug656331_component/Makefile.in index 16ac3366228c..6c4fff6e0296 100644 --- a/xpcom/tests/bug656331_component/Makefile.in +++ b/xpcom/tests/bug656331_component/Makefile.in @@ -48,6 +48,7 @@ LIBRARY_NAME = test656331 IS_COMPONENT = 1 CPPSRCS = TestComponent.cpp NO_DIST_INSTALL = 1 +FORCE_SHARED_LIB = 1 include $(topsrcdir)/config/config.mk diff --git a/xpcom/tests/component/Makefile.in b/xpcom/tests/component/Makefile.in index 5e9f1dbd0197..2acf594bf14c 100644 --- a/xpcom/tests/component/Makefile.in +++ b/xpcom/tests/component/Makefile.in @@ -47,6 +47,7 @@ LIBRARY_NAME = testcomponent IS_COMPONENT = 1 CPPSRCS = TestComponent.cpp NO_DIST_INSTALL = 1 +FORCE_SHARED_LIB = 1 include $(topsrcdir)/config/config.mk diff --git a/xpfe/components/autocomplete/src/Makefile.in b/xpfe/components/autocomplete/src/Makefile.in index 7585cbd3aead..c35116e87b17 100644 --- a/xpfe/components/autocomplete/src/Makefile.in +++ b/xpfe/components/autocomplete/src/Makefile.in @@ -46,7 +46,6 @@ MODULE = appcomps MODULE_NAME = xpAutoComplete LIBRARY_NAME = xpautocomplete SHORT_LIBNAME = xpautoc -MOZILLA_INTERNAL_API = $(BUILD_STATIC_LIBS) EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 diff --git a/xpinstall/src/Makefile.in b/xpinstall/src/Makefile.in index d590d0922c48..fdc7877e4f36 100644 --- a/xpinstall/src/Makefile.in +++ b/xpinstall/src/Makefile.in @@ -49,15 +49,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpinstall LIBRARY_NAME = xpinstall -ifndef MOZ_ENABLE_LIBXUL -# Make this a true dynamic component even in static builds because -# this component is shared by installer -FORCE_SHARED_LIB = 1 -BUILD_STATIC_LIBS= -SHORT_LIBNAME = xpinstal -else EXPORT_LIBRARY = 1 -endif IS_COMPONENT = 1 MODULE_NAME = nsSoftwareUpdate GRE_MODULE = 1 @@ -87,7 +79,3 @@ EXTRA_DSO_LDOPTS = \ $(NULL) include $(topsrcdir)/config/rules.mk - -ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) -DEFINES += -DZLIB_DLL -endif diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in index 5efc305b2fa1..c713b421f783 100644 --- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -79,14 +79,6 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) TK_LIBS := -framework Cocoa $(TK_LIBS) endif -ifndef MOZ_ENABLE_LIBXUL -ifeq (bundle,$(MOZ_FS_LAYOUT)) -LIBS += $(DIST)/bin/XUL -else -EXTRA_DSO_LIBS += xul -endif -endif - LIBS += \ $(EXTRA_DSO_LIBS) \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ diff --git a/xulrunner/confvars.sh b/xulrunner/confvars.sh index 20896cb7350c..5bca9ea78f17 100755 --- a/xulrunner/confvars.sh +++ b/xulrunner/confvars.sh @@ -40,9 +40,7 @@ MOZ_APP_NAME=xulrunner MOZ_APP_DISPLAYNAME=XULRunner MOZ_UPDATER=1 MOZ_XULRUNNER=1 -MOZ_ENABLE_LIBXUL=1 MOZ_CHROME_FILE_FORMAT=omni -MOZ_STATIC_BUILD_UNSUPPORTED=1 MOZ_APP_VERSION=$MOZILLA_VERSION if test "$MOZ_STORAGE"; then MOZ_PLACES=1