From 67c2f59a01b5ed5e62298e1d02acb6a878451f2f Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Thu, 9 Sep 2004 19:10:39 +0000 Subject: [PATCH] landing build changes for XULRunner (bug 257162) r=bsmedberg git-svn-id: svn://10.0.0.236/trunk@162000 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/Makefile.in | 4 ++++ mozilla/allmakefiles.sh | 12 ++++++++++++ mozilla/client.mk | 2 +- mozilla/config/autoconf.mk.in | 1 + mozilla/configure.in | 14 ++++++++++++++ mozilla/xpfe/Makefile.in | 2 +- mozilla/xpfe/browser/src/Makefile.in | 2 +- mozilla/xpfe/browser/src/nsBrowserInstance.cpp | 2 +- mozilla/xpfe/components/Makefile.in | 18 ++++++++++++++---- mozilla/xpfe/components/build/Makefile.in | 6 ++++++ mozilla/xpfe/components/build/nsModule.cpp | 12 ++++++------ 11 files changed, 61 insertions(+), 14 deletions(-) diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 2eedd1a9a84..d7cef5c9446 100644 --- a/mozilla/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh index 5975cc99519..62a5a00889b 100755 --- a/mozilla/allmakefiles.sh +++ b/mozilla/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" diff --git a/mozilla/client.mk b/mozilla/client.mk index 47287acb832..b852942bf0c 100644 --- a/mozilla/client.mk +++ b/mozilla/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 diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index e7d3bf35121..b03c76cf25f 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/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@ diff --git a/mozilla/configure.in b/mozilla/configure.in index 1235dd1c930..cf11ca01db2 100644 --- a/mozilla/configure.in +++ b/mozilla/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 ======================================================== diff --git a/mozilla/xpfe/Makefile.in b/mozilla/xpfe/Makefile.in index 8d6ff98c6f3..f8467724d81 100644 --- a/mozilla/xpfe/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/xpfe/browser/src/Makefile.in b/mozilla/xpfe/browser/src/Makefile.in index 4645d5d0e95..ac8f6b1dcde 100644 --- a/mozilla/xpfe/browser/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index d07e6d37aa5..cacd051d9aa 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/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 diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in index 4edb12f8627..624947cf875 100644 --- a/mozilla/xpfe/components/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in index 1ce447cbc6c..97c08635d22 100644 --- a/mozilla/xpfe/components/build/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/xpfe/components/build/nsModule.cpp b/mozilla/xpfe/components/build/nsModule.cpp index 8ca96422120..c65d38576a3 100644 --- a/mozilla/xpfe/components/build/nsModule.cpp +++ b/mozilla/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},