Bug 650227 - Adapt comm-central build configuration for building Miramar builds off of comm-central and mozilla-aurora; r=gozer a=Standard8 for checkin to CLOSED TREE
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 15 Apr 2011 19:27:16 +0100
changeset 7564 109f6f7db7fb00b8b0850dedab6634151350658b
parent 7563 a3830df7c0f6e71f30a1d1db07a57b3a7578f5a4
child 7565 b5a0e46781b51dea8e1da7a693115b729c2e5f9d
push idunknown
push userunknown
push dateunknown
reviewersgozer, Standard8
bugs650227
Bug 650227 - Adapt comm-central build configuration for building Miramar builds off of comm-central and mozilla-aurora; r=gozer a=Standard8 for checkin to CLOSED TREE
calendar/lightning/Makefile.in
calendar/providers/gdata/Makefile.in
calendar/timezones/Makefile.in
config/autoconf.mk.in
config/config.mk
config/rules.mk
configure.in
mail/config/version-20.txt
mail/config/version-50.txt
mail/confvars.sh
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -56,16 +56,18 @@ STRIP_XPI = 1
 DIST_FILES = install.rdf application.ini
 PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
 
 # Lighting version number
 LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
 ifdef MOZILLA_2_0_BRANCH
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-20.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-20.txt)
+elif defined(MOZILLA_5_0_BRANCH)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-50.txt)
 else
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 endif
 
 ifneq (,$(findstring pre,$(LIGHTNING_VERSION)))
 DEFINES += -DLIGHTNING_PRERELEASE_VERSION=1
 endif
--- a/calendar/providers/gdata/Makefile.in
+++ b/calendar/providers/gdata/Makefile.in
@@ -48,16 +48,18 @@ export XPI_NAME = gdata-provider
 DIST_FILES = install.rdf
 XPI_PKGNAME = gdata-provider
 STRIP_XPI = 1
 
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 ifdef MOZILLA_2_0_BRANCH
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-20.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-20.txt)
+elif defined(MOZILLA_5_0_BRANCH)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-50.txt)
 else
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 endif
 DEFINES += -DAB_CD=$(AB_CD) \
            -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@@ -75,16 +75,18 @@ ifndef DISABLE_LIGHTNING_INSTALL
 # install as a global extension in dist/bin/extensions/
 INSTALL_EXTENSION_ID = calendar-timezones@mozilla.org
 endif
 
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 ifdef MOZILLA_2_0_BRANCH
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-20.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-20.txt)
+elif defined(MOZILLA_5_0_BRANCH)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-50.txt)
 else
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 endif
 TIMEZONES_VERSION := $(shell cat $(srcdir)/config/version.txt)
 
 DEFINES += -DAB_CD=$(AB_CD) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -40,16 +40,17 @@
 
 INCLUDED_AUTOCONF_MK = 1
 USE_AUTOCONF 	= 1
 MOZILLA_CLIENT	= 1
 COMM_BUILD = @COMM_BUILD@
 MOZILLA_SRCDIR = $(topsrcdir)/mozilla
 MOZILLA_VERSION = @MOZILLA_VERSION@
 MOZILLA_2_0_BRANCH = @MOZILLA_2_0_BRANCH@
+MOZILLA_5_0_BRANCH = @MOZILLA_5_0_BRANCH@
 
 THUNDERBIRD_VERSION	= @THUNDERBIRD_VERSION@
 SUNBIRD_VERSION = @SUNBIRD_VERSION@
 SEAMONKEY_VERSION	= @SEAMONKEY_VERSION@
 
 MOZ_BUILD_APP = @MOZ_BUILD_APP@
 MOZ_APP_NAME	= @MOZ_APP_NAME@
 MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
--- a/config/config.mk
+++ b/config/config.mk
@@ -420,26 +420,26 @@ MY_RULES	:= $(DEPTH)/config/myrules.mk
 # Default command macros; can be overridden in <arch>.mk.
 #
 CCC		= $(CXX)
 NFSPWD		= $(CONFIG_TOOLS)/nfspwd
 PURIFY		= purify $(PURIFYOPTIONS)
 QUANTIFY	= quantify $(QUANTIFYOPTIONS)
 ifdef CROSS_COMPILE
 XPIDL_COMPILE 	= $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
-ifdef MOZILLA_2_0_BRANCH
+ifneq (,$(MOZILLA_2_0_BRANCH)$(MOZILLA_5_0_BRANCH))
 XPIDL_LINK	= $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/host/bin/host_xpt_link$(HOST_BIN_SUFFIX)
 endif
 else
 XPIDL_COMPILE 	= $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
-ifdef MOZILLA_2_0_BRANCH
+ifneq (,$(MOZILLA_2_0_BRANCH)$(MOZILLA_5_0_BRANCH))
 XPIDL_LINK	= $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/bin/xpt_link$(BIN_SUFFIX)
 endif
 endif
-ifndef MOZILLA_2_0_BRANCH
+ifeq (,$(MOZILLA_2_0_BRANCH)$(MOZILLA_5_0_BRANCH))
 XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
 endif
 
 INCLUDES = \
   $(LOCAL_INCLUDES) \
   -I$(srcdir) \
   -I. \
   -I$(DIST)/include -I$(DIST)/include/nsprpub \
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1685,23 +1685,23 @@ ifndef NO_GEN_XPT
 # generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
 # into $(XPIDL_MODULE).xpt and export it to $(FINAL_TARGET)/components.
 $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
 	$(REPORT_BUILD)
 	$(ELOG) $(XPIDL_COMPILE) -m typelib -w $(XPIDL_FLAGS) -e $@ -d $(MDDEPDIR)/$*.pp $(_VPATH_SRCS)
 
 # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
 ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
-ifdef MOZILLA_2_0_BRANCH
+ifneq (,$(MOZILLA_2_0_BRANCH)$(MOZILLA_5_0_BRANCH))
 $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS) $(XPIDL_LINK)
 	$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
 else
 $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS)
 	$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
-endif # MOZILLA_2_0_BRANCH
+endif # MOZILLA_2_0_BRANCH || MOZILLA_5_0_BRANCH
 endif # XPIDL_MODULE.xpt != XPIDLSRCS
 
 libs:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
 ifndef NO_DIST_INSTALL
 	$(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(FINAL_TARGET)/components
 ifndef NO_INTERFACES_MANIFEST
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPIDL_MODULE).xpt"
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/interfaces.manifest"
--- a/configure.in
+++ b/configure.in
@@ -249,23 +249,28 @@ fi
 
 dnl Get mozilla version from central milestone file
 MOZILLA_VERSION=`$PERL $MOZILLA_SRCDIR/config/milestone.pl -topsrcdir $MOZILLA_SRCDIR`
 
 changequote(,)
 MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\).*/\1/;'`
 changequote([,])
 
-dnl Set the Gecko 2.0 branch version.
+dnl Set the Gecko branch version.
 MOZILLA_2_0_BRANCH=
+MOZILLA_5_0_BRANCH=
 if test "$MOZILLA_BRANCH_VERSION" = "2.0"; then
     MOZILLA_2_0_BRANCH=1
     AC_DEFINE(MOZILLA_2_0_BRANCH)
+elif test "$MOZILLA_BRANCH_VERSION" = "5.0"; then
+    MOZILLA_5_0_BRANCH=1
+    AC_DEFINE(MOZILLA_5_0_BRANCH)
 fi
 AC_SUBST(MOZILLA_2_0_BRANCH)
+AC_SUBST(MOZILLA_5_0_BRANCH)
 
 
 dnl ========================================================
 dnl Checks for compilers.
 dnl ========================================================
 dnl Set CROSS_COMPILE in the environment when running configure
 dnl to use the cross-compile setup for now
 dnl ========================================================
rename from mail/config/version-20.txt
rename to mail/config/version-50.txt
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -51,22 +51,23 @@ MOZ_COMPOSER=1
 MOZ_SAFE_BROWSING=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 MOZ_APP_COMPONENT_LIBS="mail msgsmime import xpautocomplete mailcomps $LDAP_COMPONENT"
 MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 MOZ_APP_COMPONENT_INCLUDE=nsMailComponents.h
 
 # Needed for the mozilla-central build side of the system.
-# Can be dropped when we branch MOZILLA_2_0_BRANCH
+# Can be dropped/altered when we sort out our equivalent of
+# MOZILLA_5_0_BRANCH
 MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\).*/\1/;'`
 
-if test "$MOZILLA_BRANCH_VERSION" = "2.0"; then
-  MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version-20.txt
-  # Use unofficial branding for the 2.0 branch
+if test "$MOZILLA_BRANCH_VERSION" = "5.0"; then
+  MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version-50.txt
+  # Use unofficial branding for the 5.0 branch
   MOZ_BRANDING_DIRECTORY=mail/branding/unofficial
 else
   MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
   MOZ_BRANDING_DIRECTORY=mail/branding/nightly
 fi
 
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION