landing build changes for XULRunner (bug 257162) r=bsmedberg

Makefile.in

@@ -350,6 +350,10 @@ tier_99_dirs  += other-licenses/branding/firefox/content
 endif
 endif
 
+ifdef MOZ_XULRUNNER
+tier_99_dirs	+= xulrunner
+endif
+
 ifdef MOZ_THUNDERBIRD
 tier_99_dirs	+= mail xpfe/bootstrap/init.d
 ifdef MOZ_USE_OFFICIAL_BRANDING

allmakefiles.sh

@@ -900,6 +900,14 @@ browser/installer/unix/Makefile
 browser/installer/windows/Makefile
 "
 
+MAKEFILES_xulrunner="
+xulrunner/Makefile
+xulrunner/app/Makefile
+xulrunner/app/profile/Makefile
+xulrunner/app/profile/chrome/Makefile
+xulrunner/app/profile/extensions/Makefile
+"
+
 MAKEFILES_xulapp="
 chrome/Makefile
 chrome/src/Makefile
@@ -1485,6 +1493,10 @@ if test -n "$MOZ_XUL_APP"; then
     add_makefiles "$MAKEFILES_xulapp"
 fi
 
+if test -n "$MOZ_XULRUNNER"; then
+    add_makefiles "$MAKEFILES_xulrunner"
+fi
+
 if test -n "$MOZ_THUNDERBIRD"; then
     if test -n "$MOZ_USE_OFFICIAL_BRANDING"; then
         add_makefiles "$MAKEFILES_thunderbird_branding"

client.mk

@@ -487,7 +487,7 @@ ifdef TOOLKIT_CO_TAG
   TOOLKIT_CO_FLAGS := $(TOOLKIT_CO_FLAGS) -r $(TOOLKIT_CO_TAG)
 endif
 
-CVSCO_MOZTOOLKIT := $(CVS) $(CVS_FLAGS) co $(TOOLKIT_CO_FLAGS) $(CVS_CO_DATE_FLAGS)  mozilla/toolkit mozilla/chrome
+CVSCO_MOZTOOLKIT := $(CVS) $(CVS_FLAGS) co $(TOOLKIT_CO_FLAGS) $(CVS_CO_DATE_FLAGS)  mozilla/toolkit mozilla/chrome mozilla/xulrunner
 FASTUPDATE_MOZTOOLKIT := fast_update $(CVSCO_MOZTOOLKIT)
 CHECKOUT_MOZTOOLKIT := cvs_co $(CVSCO_MOZTOOLKIT)
 LOCALE_DIRS += mozilla/toolkit/locales

config/autoconf.mk.in

@@ -474,6 +474,7 @@ MOZ_TOOLS_DIR	= @MOZ_TOOLS_DIR@
 MOZ_MAPINFO	= @MOZ_MAPINFO@
 
 MOZ_PHOENIX	= @MOZ_PHOENIX@
+MOZ_XULRUNNER	= @MOZ_XULRUNNER@
 MOZ_XUL_APP	= @MOZ_XUL_APP@
 MOZ_THUNDERBIRD = @MOZ_THUNDERBIRD@
 MOZ_STANDALONE_COMPOSER= @MOZ_STANDALONE_COMPOSER@

configure.in

@@ -3392,6 +3392,20 @@ fi
 
 AC_SUBST(MOZ_PHOENIX)
 
+dnl ========================================================
+dnl = XUL Runner
+dnl ========================================================
+MOZ_XUL_APP=
+if test "$MOZ_XULRUNNER"; then
+   AC_DEFINE(MOZ_XULRUNNER)
+   MOZ_XUL_APP=1
+   AC_DEFINE(MOZ_XUL_APP)
+   MOZ_APP_NAME=xulrunner
+   MOZ_APP_VERSION=`cat $topsrcdir/xulrunner/config/version.txt`
+fi
+
+AC_SUBST(MOZ_XULRUNNER)
+
 dnl ========================================================
 dnl = Thunderbird
 dnl ========================================================

xpfe/Makefile.in

@@ -46,7 +46,7 @@ MODULE       = browser
 PACKAGE_FILE = xpfe.pkg
 PACKAGE_VARS = USE_SHORT_LIBNAME
 
-ifdef MOZ_PHOENIX
+ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
 DIRS += \
         browser/public \
         browser/src \

xpfe/browser/src/Makefile.in

@@ -66,7 +66,7 @@ REQUIRES	= xpcom \
 		  history \
 		  $(NULL)
 
-ifdef MOZ_PHOENIX
+ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
 REQUIRES += toolkitcomps history
 endif
 

xpfe/browser/src/nsBrowserInstance.cpp

@@ -102,7 +102,7 @@
 // Stuff to implement file download dialog.
 #include "nsIProxyObjectManager.h" 
 
-#ifdef MOZ_PHOENIX
+#if defined(MOZ_PHOENIX) || defined(MOZ_XULRUNNER)
 #include "nsToolkitCompsCID.h"
 #endif
 

xpfe/components/Makefile.in

@@ -52,10 +52,10 @@ endif
 ifdef MOZ_SUNBIRD
 MOZ_HAVE_BROWSER=
 endif
-ifdef MOZ_PHOENIX
-# Firefox uses this flag to stop the automatic processing of the jar.mn file
-# that lives parallel to this Makefile. The jar.mn is responsible for the 
-# packaging of a large number of chrome files Firefox does not need. 
+ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
+# Firefox and XULRunner use this flag to stop the automatic processing of the
+# jar.mn file that lives parallel to this Makefile. The jar.mn is responsible
+# for the packaging of a large number of chrome files these apps don't need. 
 NO_DIST_INSTALL=1
 NO_INSTALL=1
 endif
@@ -74,6 +74,7 @@ DIRS	= \
 			$(NULL)
 
 ifndef MOZ_PHOENIX
+ifndef MOZ_XULRUNNER
 DIRS += \
 		related \
 		prefwindow \
@@ -86,12 +87,21 @@ DIRS += \
 		sidebar \
 		$(NULL)
 endif
+endif
+
+# XXX because 'search' depends on nsIBookmarksService
+# XXX we need to clean up the set of xulrunner dependencies
+ifdef MOZ_XULRUNNER
+DIRS += bookmarks/public
+endif
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef MOZ_PHOENIX
+ifndef MOZ_XULRUNNER
 DIRS    += urlwidget winhooks alerts
 endif
 endif
+endif
 
 else
 # !MOZ_HAVE_BROWSER

xpfe/components/build/Makefile.in

@@ -76,8 +76,10 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 ifndef MOZ_PHOENIX
+ifndef MOZ_XULRUNNER
 REQUIRES += history downloadmanager
 endif
+endif
 
 CPPSRCS		= nsModule.cpp
 
@@ -99,6 +101,7 @@ SHARED_LIBRARY_LIBS = \
 	$(NULL)
 
 ifndef MOZ_PHOENIX
+ifndef MOZ_XULRUNNER
 SHARED_LIBRARY_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)autocomplete_s.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
@@ -115,6 +118,7 @@ SHARED_LIBRARY_LIBS += \
 	$(NULL)
 endif
 
+endif
 endif
 
 LOCAL_INCLUDES	= \
@@ -125,6 +129,7 @@ LOCAL_INCLUDES	= \
 	$(NULL)
 
 ifndef MOZ_PHOENIX
+ifndef MOZ_XULRUNNER
 LOCAL_INCLUDES += \
   -I$(srcdir)/../autocomplete/src  \
   -I$(srcdir)/../bookmarks/src     \
@@ -141,6 +146,7 @@ LOCAL_INCLUDES += \
   $(NULL)
 endif
 
+endif
 endif
 
 ifeq ($(OS_ARCH),WINNT)

xpfe/components/build/nsModule.cpp

@@ -45,7 +45,7 @@
 #include "nsFontPackageHandler.h"
 #include "nsWindowDataSource.h"
 #include "nsRDFCID.h"
-#ifndef MOZ_PHOENIX
+#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER)
 #include "nsAutoComplete.h"
 #include "nsBookmarksService.h"
 #include "nsRelatedLinksHandlerImpl.h"
@@ -58,7 +58,7 @@
 #endif
 #endif
 #if defined(XP_WIN)
-#ifndef MOZ_PHOENIX
+#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER)
 #include "nsWindowsHooks.h"
 #include "nsAlertsService.h"
 #include "nsUrlWidget.h"
@@ -83,7 +83,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(LocalSearchDataSource, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(InternetSearchDataSource, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontPackageHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowDataSource, Init)
-#ifndef MOZ_PHOENIX
+#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(RelatedLinksHandlerImpl, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteItem)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteResults)
@@ -96,7 +96,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPAutoCompleteSession)
 #endif
 #endif
 #if defined(XP_WIN)
-#ifndef MOZ_PHOENIX
+#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlWidget, Init)
@@ -150,7 +150,7 @@ static const nsModuleComponentInfo components[] = {
       nsHTTPIndexConstructor },
     { "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_DATASOURCE_CONTRACTID,
       nsHTTPIndexConstructor },
-#ifndef MOZ_PHOENIX
+#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER)
     { "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_SERVICE_CONTRACTID,
       nsBookmarksServiceConstructor },
     { "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_DATASOURCE_CONTRACTID,
@@ -196,7 +196,7 @@ static const nsModuleComponentInfo components[] = {
       NS_RDF_DATASOURCE_CONTRACTID_PREFIX "window-mediator",
       nsWindowDataSourceConstructor },
 #if defined(XP_WIN)
-#ifndef MOZ_PHOENIX
+#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER)
     { NS_IURLWIDGET_CLASSNAME, NS_IURLWIDGET_CID, NS_IURLWIDGET_CONTRACTID,
       nsUrlWidgetConstructor },
     { "nsAlertsService", NS_ALERTSSERVICE_CID, NS_ALERTSERVICE_CONTRACTID, nsAlertsServiceConstructor},