author | Ted Mielczarek <ted.mielczarek@gmail.com> |
Sat, 20 Mar 2010 12:14:15 -0400 | |
changeset 40538 | 722ff789df89c0dda5558a3fd554861c48557406 |
parent 40537 | 5b3ca7b7c9ddc244b022ffe0e4395be21b541c7c |
child 40539 | 7886dc6ae0c8ca8d769b956561174c0acc8b4340 |
push id | 12656 |
push user | tmielczarek@mozilla.com |
push date | Wed, 07 Apr 2010 17:15:26 +0000 |
treeherder | mozilla-central@7886dc6ae0c8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bsmedberg |
bugs | 553635 |
milestone | 1.9.3a4pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
|
--- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -184,21 +184,16 @@ @BINPATH@/components/jar.xpt @BINPATH@/components/jsdservice.xpt @BINPATH@/components/layout_base.xpt #ifdef NS_PRINTING @BINPATH@/components/layout_printing.xpt #endif @BINPATH@/components/layout_xul_tree.xpt @BINPATH@/components/layout_xul.xpt -#ifdef XP_UNIX -#ifndef XP_MACOSX -@BINPATH@/components/libimgicon@DLL_SUFFIX@ -#endif -#endif @BINPATH@/components/locale.xpt @BINPATH@/components/lwbrk.xpt #ifndef WINCE @BINPATH@/components/migration.xpt #endif @BINPATH@/components/mimetype.xpt @BINPATH@/components/mozfind.xpt @BINPATH@/components/necko_about.xpt
--- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -838,8 +838,13 @@ components/brwsrcmp.dll #ifndef MOZ_UPDATER components/nsUpdateService.js components/nsUpdateServiceStub.js #endif @DLL_PREFIX@sqlite3@DLL_SUFFIX@ old-homepage-default.properties components/microsummaries.xpt LICENSE +#ifdef XP_UNIX +#ifndef XP_MACOSX +components/libimgicon.so +#endif +#endif
--- a/modules/libpr0n/decoders/Makefile.in +++ b/modules/libpr0n/decoders/Makefile.in @@ -39,17 +39,17 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk ifneq (,$(filter icon,$(MOZ_IMG_DECODERS))) ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) -TOOL_DIRS = icon/gtk icon +DIRS = icon/gtk icon endif ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT))) DIRS = icon/qt icon endif ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH))) DIRS = icon/win icon endif ifeq ($(OS_ARCH),OS2)
--- a/modules/libpr0n/decoders/icon/Makefile.in +++ b/modules/libpr0n/decoders/icon/Makefile.in @@ -41,24 +41,22 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = imgicon LIBRARY_NAME = imgicon IS_COMPONENT = 1 MODULE_NAME = nsIconDecoderModule +LIBXUL_LIBRARY = 1 +EXPORT_LIBRARY = 1 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LDOPTS = $(MOZ_GTK2_LIBS) PLATFORM = gtk -FORCE_SHARED_LIB = 1 -else -LIBXUL_LIBRARY = 1 -EXPORT_LIBRARY = 1 endif ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LDOPTS = $(MOZ_QT_LIBS) PLATFORM = qt endif ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH))) @@ -96,27 +94,20 @@ ifdef USE_ICON_DECODER CPPSRCS += nsIconDecoder.cpp DEFINES += -DUSE_ICON_DECODER endif XPIDLSRCS = nsIIconURI.idl SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX) -ifdef LIBXUL_LIBRARY EXTRA_DSO_LDOPTS += \ $(EXTRA_DSO_LIBS) \ $(MOZ_COMPONENT_LIBS) \ $(NULL) -else -EXTRA_DSO_LDOPTS += \ - $(XPCOM_GLUE_LDOPTS) \ - $(NSPR_LIBS) \ - $(NULL) -endif LOCAL_INCLUDES = -I$(srcdir)/$(PLATFORM) ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,shell32 gdi32 comctl32) endif include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/decoders/icon/gtk/Makefile.in +++ b/modules/libpr0n/decoders/icon/gtk/Makefile.in @@ -39,17 +39,17 @@ DEPTH = ../../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = imgicon LIBRARY_NAME = imgicongtk_s - +LIBXUL_LIBRARY = 1 CPPSRCS = nsIconChannel.cpp ifdef MOZ_ENABLE_GNOMEUI LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS) else LOCAL_INCLUDES += $(MOZ_GTK2_CFLAGS) endif
--- a/toolkit/library/libxul-config.mk +++ b/toolkit/library/libxul-config.mk @@ -297,21 +297,19 @@ endif endif ifdef MOZ_ENABLE_POSTSCRIPT DEFINES += -DMOZ_ENABLE_POSTSCRIPT STATIC_LIBS += gfxpsshar endif ifneq (,$(filter icon,$(MOZ_IMG_DECODERS))) -ifndef MOZ_ENABLE_GTK2 DEFINES += -DICON_DECODER COMPONENT_LIBS += imgicon endif -endif STATIC_LIBS += thebes layers COMPONENT_LIBS += gkgfxthebes ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) COMPONENT_LIBS += gkwidget endif ifeq (beos,$(MOZ_WIDGET_TOOLKIT))