Removing Minimo references. b=405705, r=ted
author"Doug Turner <dougt@meer.net>"
Mon, 16 Jun 2008 13:57:42 -0700
changeset 15381 4b3f252de3def7ac805d5f219e92fa66902fef69
parent 15380 055a716092aab1c0b27efafe57b3f670da35b709
child 15382 a79f8633b10bb3e7027477d5e0e11759d3f039a9
push idunknown
push userunknown
push dateunknown
reviewersted
bugs405705
milestone1.9.1a1pre
Removing Minimo references. b=405705, r=ted
config/autoconf.mk.in
config/config.mk
configure.in
embedding/base/Makefile.in
embedding/browser/photon/src/Makefile.in
embedding/config/Makefile.in
js/src/xpconnect/Makefile.in
modules/libjar/Makefile.in
modules/plugin/Makefile.in
toolkit/Makefile.in
toolkit/themes/gnomestripe/mozapps/jar.mn
toolkit/themes/pinstripe/help/jar.mn
toolkit/themes/pinstripe/mozapps/jar.mn
toolkit/themes/winstripe/help/jar.mn
xpcom/Makefile.in
xpcom/build/Makefile.in
xpcom/obsolete/component/Makefile.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -615,18 +615,16 @@ MOZ_THUNDERBIRD = @MOZ_THUNDERBIRD@
 MOZ_STANDALONE_COMPOSER= @MOZ_STANDALONE_COMPOSER@
 MOZ_STATIC_MAIL_BUILD = @MOZ_STATIC_MAIL_BUILD@
 MOZ_SUNBIRD	= @MOZ_SUNBIRD@
 MOZ_SUITE	= @MOZ_SUITE@
 WINCE		= @WINCE@
 
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
-MINIMO		= @MINIMO@
-
 MACOS_SDK_DIR	= @MACOS_SDK_DIR@
 NEXT_ROOT	= @NEXT_ROOT@
 GCC_VERSION	= @GCC_VERSION@
 XCODEBUILD_VERSION= @XCODEBUILD_VERSION@
 HAS_XCODE_2_1	= @HAS_XCODE_2_1@
 UNIVERSAL_BINARY= @UNIVERSAL_BINARY@
 HAVE_DTRACE= @HAVE_DTRACE@
 
--- a/config/config.mk
+++ b/config/config.mk
@@ -407,38 +407,16 @@ DEFINES += \
 		$(NULL)
 
 ifndef MOZ_NATIVE_ZLIB
 DEFINES += -DZLIB_INTERNAL
 endif
 endif
 endif
 
-ifdef MINIMO
-ifdef LIBXUL_LIBRARY
-DEFINES += \
-		-D_IMPL_NS_COM \
-		-DEXPORT_XPT_API \
-		-DEXPORT_XPTC_API \
-		-DEXPORT_XPTI_API \
-		-D_IMPL_NS_COM_OBSOLETE \
-		-D_IMPL_NS_GFX \
-		-D_IMPL_NS_WIDGET \
-		-DIMPL_XREAPI \
-		-DIMPL_NS_NET \
-		-DIMPL_THEBES \
-		$(NULL)
-endif
-
-ifdef WINCE
-DEFINES += -D_NSPR_BUILD_
-endif
-
-endif
-
 # Force _all_ exported methods to be |_declspec(dllexport)| when we're
 # building them into the executable.
 
 ifeq (,$(filter-out WINNT WINCE OS2, $(OS_ARCH)))
 ifdef BUILD_STATIC_LIBS
 DEFINES += \
         -D_IMPL_NS_GFX \
         -D_IMPL_NS_MSG_BASE \
--- a/configure.in
+++ b/configure.in
@@ -4380,43 +4380,33 @@ case "$target_os" in
 esac
 
 MOZ_ARG_ENABLE_STRING(application,
 [  --enable-application=APP
                           Options include:
                             suite
                             browser (Firefox)
                             mail (Thunderbird)
-                            minimo
                             composer
                             calendar (Sunbird)
                             xulrunner
                             camino
                             content/xslt (Standalone Transformiix XSLT)
                             netwerk (Standalone Necko)
                             tools/update-packaging (AUS-related packaging tools)
                             standalone (use this for standalone
                               xpcom/xpconnect or to manually drive a build)],
 [ MOZ_BUILD_APP=$enableval ] )
 
 if test "$MOZ_BUILD_APP" = "macbrowser"; then
     AC_MSG_WARN([--enable-application=macbrowser is deprecated. Use --enable-application=camino.])
     MOZ_BUILD_APP=camino
 fi
 
-case "$MOZ_BUILD_APP" in
-minimo)
-  MOZ_EMBEDDING_PROFILE=basic
-  ;;
-
-*)
-  MOZ_EMBEDDING_PROFILE=default
-  ;;
-esac
-
+MOZ_EMBEDDING_PROFILE=default
 MOZ_ARG_WITH_STRING(embedding-profile,
 [  --with-embedding-profile=default|basic|minimal
                        see http://wiki.mozilla.org/Gecko:Small_Device_Support],
 [ MOZ_EMBEDDING_PROFILE=$withval ])
 
 case "$MOZ_EMBEDDING_PROFILE" in
 default)
   MOZ_EMBEDDING_LEVEL_DEFAULT=1
@@ -4595,20 +4585,16 @@ case "$MOZ_BUILD_APP" in
 suite)
   AC_DEFINE(MOZ_SUITE)
   ;;
 
 browser)
   AC_DEFINE(MOZ_PHOENIX)
   ;;
 
-minimo)
-  AC_DEFINE(MINIMO)
-  ;;
-
 mail)
   AC_DEFINE(MOZ_THUNDERBIRD)
   ;;
 
 composer)
   AC_DEFINE(MOZ_STANDALONE_COMPOSER)
   ;;
 
--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@@ -49,22 +49,16 @@ XPIDL_MODULE	= embed_base
 
 include $(DEPTH)/config/autoconf.mk
 
 REQUIRES	= xpcom \
 		  intl \
 		  embedcomponents \
 		  $(NULL)
 
-ifdef MINIMO
-# For minimo, we would really like to treat this as a LIBXUL
-# library so that we can get the correct export defines.
-LIBXUL_LIBRARY = 1
-endif
-
 DEFINES += -DMOZILLA_STRICT_API
 
 SDK_HEADERS         = \
                 nsEmbedAPI.h \
                 nsEmbedCID.h \
                 $(NULL)
 
 SDK_XPIDLSRCS   = \
--- a/embedding/browser/photon/src/Makefile.in
+++ b/embedding/browser/photon/src/Makefile.in
@@ -133,21 +133,17 @@ include $(QCONF_OVERRIDE)
 CXXFLAGS        += -I$(if $(USE_INSTALL_ROOT),$(INSTALL_ROOT_nto),$(USE_ROOT_nto))/usr/include
 endif
 
 ifdef BUILD_STATIC_LIBS
 
 # This is so sick! We'll work backwards from the embedding manifest to
 # produce the set of components that we need to link in to a
 # ``minimal'' embedding harness.
-ifdef MINIMO
-EMBED_MANIFEST=$(topsrcdir)/embedding/config/minimo-qnx
-else
 EMBED_MANIFEST=$(topsrcdir)/embedding/config/basebrowser-qnx
-endif
 
 ifdef MOZ_FAT_EMBED
 EMBED_LINK_COMPS=$(FINAL_LINK_COMPS)
 EMBED_LINK_COMP_NAMES=$(FINAL_LINK_COMP_NAMES)
 EMBED_LINK_COMP_MODULES = $(FINAL_LINK_COMP_NAMES)
 else
 EMBED_LINK_COMPS=embed-link-comps
 EMBED_LINK_COMP_NAMES=embed-link-comp-names
--- a/embedding/config/Makefile.in
+++ b/embedding/config/Makefile.in
@@ -53,21 +53,17 @@ ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
   BASEBROWSER_SUPP = basebrowser-win-supp
   CLIENTMANIFEST = client-win
   GREMANIFEST = gre-win
   GREMANIFEST_SUPP = gre-win-supp
   _PLATFORM = dos
   WINAPP=mfcembed
   #WINAPP=winembed
 else
-ifdef MINIMO
-  BASEBROWSER = minimo-unix
-else
   BASEBROWSER = basebrowser-unix
-endif
   CLIENTMANIFEST = client-unix
   _PLATFORM = unix
 endif
 endif
 
 
 embed_chrome: embed-jar.mn
 ifneq (jar,$(MOZ_CHROME_FILE_FORMAT))
@@ -96,19 +92,17 @@ embed_copy::
 ifeq ($(OS_ARCH),WINNT)
 	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(BASEBROWSER_SUPP) -o $(_PLATFORM) -v
 endif
 	if test -f "$(srcdir)/$(CLIENTMANIFEST)"; then \
 		$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(CLIENTMANIFEST) -o $(_PLATFORM) -v; \
 	fi
 	$(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/Embed/chrome
 	$(NSINSTALL) -t $(srcdir)/readme.html $(DIST)/Embed
-ifndef MINIMO
 	-$(NSINSTALL) -t $(DEPTH)/embedding/lite/$(LIB_PREFIX)embed_lite$(DLL_SUFFIX) $(DIST)/Embed/components
-endif
 ifeq ($(OS_ARCH),WINNT)
 ifeq ($(WINAPP),mfcembed)
 	$(NSINSTALL) -t $(DIST)/bin/mfcembed.exe $(DIST)/Embed
 	$(NSINSTALL) -t $(DIST)/bin/mfcEmbedComponents.dll $(DIST)/Embed
 else
 ifeq ($(WINAPP),winembed)
 	$(NSINSTALL) -t $(DIST)/bin/winembed.exe $(DIST)/Embed
 endif
--- a/js/src/xpconnect/Makefile.in
+++ b/js/src/xpconnect/Makefile.in
@@ -47,19 +47,17 @@ MODULE		= xpconnect
 DIRS		= public idl
 
 ifdef MOZ_JSLOADER
 DIRS         +=  loader
 endif
 
 DIRS         += src
 
-ifndef MINIMO
 TOOL_DIRS    += shell
-endif
 
 ifdef ENABLE_TESTS
 TOOL_DIRS    += tests
 endif
 
 ifdef MOZ_XPCTOOLS
 TOOL_DIRS    +=  tools 
 endif
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -51,23 +51,20 @@ DIRS  += zipwriter
 endif
 
 ifdef MOZ_INSTALLER
 # Linux and Solaris installer needs standalone libjar
 DIRS  += standalone
 
 # Make this a true dynamic component even in static builds because
 # this component is shared by installer
-ifndef MINIMO
-# we don't care about the installer for MINIMO
 ifndef MOZ_ENABLE_LIBXUL
 BUILD_STATIC_LIBS=
 endif
 endif
-endif
 
 ifdef ENABLE_TESTS
 TOOL_DIRS += test
 endif
 
 
 MODULE		= jar
 LIBRARY_NAME	= jar$(VERSION_NUMBER)
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -44,31 +44,27 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= plugin
 
 DIRS		= base/public 
 
 ifdef MOZ_PLUGINS
 DIRS		+= base/src 
 
-ifndef MINIMO
-
 ifneq (,$(filter gtk2 ,$(MOZ_WIDGET_TOOLKIT)))
 TOOL_DIRS += samples/unixprinting
 endif
 
 # These subdirs rely on GTK libraries and header files, it is not
 #  buildable on other non-GTK unix builds
 
 ifdef MOZ_ENABLE_GTK2
 TOOL_DIRS += samples/default/unix
 endif
 
-endif
-
 ifeq ($(OS_ARCH),WINNT)
 TOOL_DIRS += samples/default/windows
 endif
 
 ifeq ($(OS_ARCH),OS2)
 TOOL_DIRS += samples/default/os2
 ifdef MOZ_OJI
 TOOL_DIRS += os2wrapper
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -58,19 +58,17 @@ endif
 ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
 DIRS += system/osxproxy
 endif
 
 ifdef MOZ_CRASHREPORTER
 DIRS += crashreporter
 endif
 
-ifndef MINIMO
 DIRS += \
 	xre \
 	mozapps \
 	$(NULL)
-endif
 
 include $(topsrcdir)/config/rules.mk
 
 export::
 	@$(MAKE) -C xre export
--- a/toolkit/themes/gnomestripe/mozapps/jar.mn
+++ b/toolkit/themes/gnomestripe/mozapps/jar.mn
@@ -1,10 +1,9 @@
 classic.jar:
-#ifndef MINIMO
 + skin/classic/mozapps/update/update.png                   (update/update.png)
 + skin/classic/mozapps/update/updates.css                  (update/updates.css)
 + skin/classic/mozapps/downloads/downloadIcon.png          (downloads/downloadIcon.png)
 + skin/classic/mozapps/downloads/downloads.css             (downloads/downloads.css)
 + skin/classic/mozapps/extensions/notifyBadges.png         (extensions/notifyBadges.png)
 + skin/classic/mozapps/extensions/extensionIcons.png       (extensions/extensionIcons.png)
 + skin/classic/mozapps/extensions/searchIcons.png          (extensions/searchIcons.png)
 + skin/classic/mozapps/extensions/extensions.css           (extensions/extensions.css)
@@ -15,9 +14,8 @@ classic.jar:
 + skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
 + skin/classic/mozapps/plugins/pluginGeneric-16.png        (plugins/pluginGeneric-16.png)
 + skin/classic/mozapps/viewsource/viewsource.css           (viewsource/viewsource.css)
 + skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png  (xpinstall/xpinstallItemGeneric.png)
 #ifdef MOZ_PLACES
 + skin/classic/mozapps/places/defaultFavicon.png           (places/defaultFavicon.png)
 + skin/classic/mozapps/places/tagContainerIcon.png         (places/tagContainerIcon.png)
 #endif
-#endif
--- a/toolkit/themes/pinstripe/help/jar.mn
+++ b/toolkit/themes/pinstripe/help/jar.mn
@@ -1,8 +1,6 @@
 classic.jar:
 % skin help classic/1.0 %skin/classic/help/
-#ifndef MINIMO
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png
   skin/classic/help/helpFileLayout.css
   skin/classic/help/Weblink.png
-#endif
--- a/toolkit/themes/pinstripe/mozapps/jar.mn
+++ b/toolkit/themes/pinstripe/mozapps/jar.mn
@@ -1,11 +1,10 @@
 classic.jar:
 % skin mozapps classic/1.0 %skin/classic/mozapps/
-#ifndef MINIMO
   skin/classic/mozapps/downloads/buttons.png                      (downloads/buttons.png)
   skin/classic/mozapps/downloads/downloadIcon.png                 (downloads/downloadIcon.png)
   skin/classic/mozapps/downloads/downloadStatusIcon.png           (downloads/downloadStatusIcon.png)
   skin/classic/mozapps/downloads/downloads.css                    (downloads/downloads.css)
   skin/classic/mozapps/downloads/unknownContentType.css           (downloads/unknownContentType.css)
   skin/classic/mozapps/extensions/extensionItem.png               (extensions/extensionItem.png)
   skin/classic/mozapps/extensions/itemDisabledFader.png           (extensions/itemDisabledFader.png)
   skin/classic/mozapps/extensions/itemEnabledFader.png            (extensions/itemEnabledFader.png)
@@ -37,9 +36,8 @@ classic.jar:
   skin/classic/mozapps/viewsource/viewsource.css                  (viewsource/viewsource.css)
   skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png         (xpinstall/xpinstallItemGeneric.png)
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (xpinstall/xpinstallConfirm.css)
 #ifdef MOZ_PLACES
   skin/classic/mozapps/places/defaultFavicon.png                  (places/defaultFavicon.png)
   skin/classic/mozapps/places/tagContainerIcon.png                (places/tagContainerIcon.png)
 #endif
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
-#endif
--- a/toolkit/themes/winstripe/help/jar.mn
+++ b/toolkit/themes/winstripe/help/jar.mn
@@ -1,10 +1,8 @@
 classic.jar:
 % skin help classic/1.0 %skin/classic/help/
-#ifndef MINIMO
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png
   skin/classic/help/Toolbar-rtl.png
   skin/classic/help/helpFileLayout.css
   skin/classic/help/Weblink.png
   skin/classic/help/Weblink-rtl.png
-#endif
--- a/xpcom/Makefile.in
+++ b/xpcom/Makefile.in
@@ -57,20 +57,18 @@ DIRS		= \
 		threads \
 		reflect \
 		proxy \
                 system \
 		build \
 		$(NULL)
 
 ifndef MOZ_ENABLE_LIBXUL
-ifndef MINIMO
 DIRS += stub
 endif
-endif
 
 TOOL_DIRS = \
 	tools \
 	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_DEBUG
 DIRS		+= windbgdlg
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -84,27 +84,23 @@ CSRCS		= \
 
 CPPSRCS		= \
 		$(XPCOM_GLUE_SRC_LCPPSRCS) \
 		$(XPCOM_GLUENS_SRC_LCPPSRCS) \
 		nsXPComInit.cpp \
 		nsXPCOMStrings.cpp \
 		$(NULL)
 
-ifndef MINIMO
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
 CPPSRCS		+= dlldeps.cpp
 endif
-endif
 
-ifndef MINIMO
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),OS2)
 CPPSRCS		+= dlldeps.cpp
 endif
-endif
 
 ifdef XPCOM_USE_LEA
 CSRCS += malloc.c
 endif
 
 ifdef GC_LEAK_DETECTOR
 EXTRA_DSO_LIBS = boehm
 endif
@@ -145,20 +141,18 @@ SDK_HEADERS =  \
 EXPORTS	= \
 		nsXPCOMCIDInternal.h \
 		$(NULL)
 
 # Force use of PIC
 FORCE_USE_PIC	= 1 
 
 ifndef MOZ_ENABLE_LIBXUL
-ifndef MINIMO
 FORCE_SHARED_LIB = 1
 endif
-endif
 
 # UNIX98 iconv support
 OS_LIBS += $(LIBICONV)
 
 GARBAGE         += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
--- a/xpcom/obsolete/component/Makefile.in
+++ b/xpcom/obsolete/component/Makefile.in
@@ -44,19 +44,17 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom_compat_c
 MODULE_NAME	= xpcomObsoleteModule
 LIBRARY_NAME	= xpcom_compat_c
 ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= xpcomctc
 endif
 
-ifndef MINIMO
 EXPORT_LIBRARY  = 1
-endif
 IS_COMPONENT	= 1
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 PACKAGE_FILE = xpcomobsoletec.pkg
 
 REQUIRES	= xpcom  \
 		  xpcom_obsolete \