Bug 161036 - provide mechanism to build experimental browser UI (bug 161036). r=cls.

Makefile.in

@@ -232,6 +232,10 @@ endif
 
 tier_9_dirs	+= l10n
 
+ifdef MOZ_PHOENIX
+tier_9_dirs	+= toolkit browser
+endif
+
 #
 # tier 9x - application features
 #

allmakefiles.sh

@@ -809,6 +809,18 @@ extensions/transformiix/source/Makefile
 extensions/transformiix/Makefile
 "
 
+MAKEFILES_phoenix="
+browser/Makefile
+browser/base/Makefile
+browser/components/Makefile
+browser/components/prefwindow/Makefile
+browser/components/search/Makefile
+browser/components/search/resources/Makefile
+toolkit/Makefile
+toolkit/skin/unix/Makefile
+toolkit/skin/win/Makefile
+"
+
 if [ "$MACOSX" ]; then
     MAKEFILES_macmorefiles="
        lib/mac/MoreFiles/Makefile
@@ -1208,6 +1220,10 @@ if test -n "$MOZ_CALENDAR"; then
     add_makefiles "$MAKEFILES_calendar"
 fi
 
+if test -n "$MOZ_PHOENIX"; then
+    add_makefiles "$MAKEFILES_phoenix"
+fi
+
 else
 
 # Standalone modules go here

client.mk

@@ -362,6 +362,19 @@ CHECKOUT_CALENDAR := true
 FASTUPDATE_CALENDAR := true
 endif
 
+####################################
+# CVS defines for Phoenix (pulled and built if MOZ_PHOENIX is set)
+#
+CVSCO_PHOENIX := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/toolkit mozilla/browser
+
+ifdef MOZ_PHOENIX
+FASTUPDATE_PHOENIX := fast_update $(CVSCO_PHOENIX)
+CHECKOUT_PHOENIX := cvs_co $(CVSCO_PHOENIX)
+else
+CHECKOUT_PHOENIX := true
+FASTUPDATE_PHOENIX := true
+endif
+
 #######################################################################
 # Rules
 # 
@@ -428,6 +441,7 @@ real_checkout:
         cvs_co $(CVSCO_IMGLIB2) && \
 	$(CHECKOUT_CALENDAR) && \
 	$(CHECKOUT_LIBART) && \
+	$(CHECKOUT_PHOENIX) && \
 	cvs_co $(CVSCO_SEAMONKEY) && \
 	cvs_co $(CVSCO_NOSUBDIRS)
 	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
@@ -488,6 +502,7 @@ real_fast-update:
 	fast_update $(CVSCO_IMGLIB2) && \
 	$(FASTUPDATE_CALENDAR) && \
 	$(FASTUPDATE_LIBART) && \
+	$(FASTUPDATE_PHOENIX) && \
 	fast_update $(CVSCO_SEAMONKEY) && \
 	fast_update $(CVSCO_NOSUBDIRS)
 	@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)

config/autoconf.mk.in

@@ -402,3 +402,6 @@ MOZ_COVERAGE	= @MOZ_COVERAGE@
 MOZ_MAPINFO	= @MOZ_MAPINFO@
 MOZ_BROWSE_INFO	= @MOZ_BROWSE_INFO@
 MOZ_TOOLS_DIR	= @MOZ_TOOLS_DIR@
+
+
+MOZ_PHOENIX	= @MOZ_PHOENIX@

configure.in

@@ -3072,6 +3072,15 @@ fi
 
 AC_SUBST(MOZ_CALENDAR)
 
+dnl ========================================================
+dnl = Phoenix
+dnl ========================================================
+if test "$MOZ_PHOENIX"; then
+   AC_DEFINE(MOZ_PHOENIX)
+fi
+
+AC_SUBST(MOZ_PHOENIX)
+
 dnl ========================================================
 dnl = FreeType2
 dnl ========================================================