Bug 1366607: Refer explicitly to the top comm objdir, rather than using a relative depth; rs=bustage-fix

MozReview-Commit-ID: 5VSSyAFsFNe

--HG--
extra : rebase_source : 604a274310865ac5166c63ebdebb9b8d6326bfd5
extra : histedit_source : 43e59a6ad376a679af1b23c963e3577dfaa9ce2c

comm-confvars.sh

@@ -9,6 +9,8 @@ then
 
   mozreltopsrcdir=.
   commreltopsrcdir=comm
+
+  commtopobjdir=$_objdir/comm
 else
   # we are building with mozilla/ as the subdirectory
   # $srcdir is still the mozilla repo, so use the parent for comm
@@ -17,4 +19,6 @@ else
 
   mozreltopsrcdir=mozilla
   commreltopsrcdir=.
+
+  commtopobjdir=$_objdir
 fi

im/app-config.mk

@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifeq ($(findstring comm,$(MOZ_BUILD_APP)),)
-COMMDEPTH = $(DEPTH)
-else
-COMMDEPTH = $(DEPTH)/comm
-endif

mail/app-config.mk

@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifeq ($(findstring comm,$(MOZ_BUILD_APP)),)
-COMMDEPTH = $(DEPTH)
-else
-COMMDEPTH = $(DEPTH)/comm
-endif

mail/build.mk

@@ -4,46 +4,46 @@
 
 ifndef COMM_BUILD
 installer:
-	@$(MAKE) -C $(COMMDEPTH)/mail/installer installer
+	@$(MAKE) -C $(commtopobjdir)/mail/installer installer
 
 package:
-	@$(MAKE) -C $(COMMDEPTH)/mail/installer
+	@$(MAKE) -C $(commtopobjdir)/mail/installer
 
 package-compare:
-	@$(MAKE) -C $(COMMDEPTH)/mail/installer package-compare
+	@$(MAKE) -C $(commtopobjdir)/mail/installer package-compare
 
 stage-package:
-	@$(MAKE) -C $(COMMDEPTH)/mail/installer stage-package
+	@$(MAKE) -C $(commtopobjdir)/mail/installer stage-package
 
 install::
-	@$(MAKE) -C $(COMMDEPTH)/mail/installer install
+	@$(MAKE) -C $(commtopobjdir)/mail/installer install
 
 source-package::
-	@$(MAKE) -C $(COMMDEPTH)/mail/installer source-package
+	@$(MAKE) -C $(commtopobjdir)/mail/installer source-package
 
 upload::
-	@$(MAKE) -C $(COMMDEPTH)/mail/installer upload
+	@$(MAKE) -C $(commtopobjdir)/mail/installer upload
 ifdef MOZ_CALENDAR
-	@$(MAKE) -C $(COMMDEPTH)/calendar/lightning upload
-	@$(MAKE) -C $(COMMDEPTH)/calendar/providers/gdata upload
+	@$(MAKE) -C $(commtopobjdir)/calendar/lightning upload
+	@$(MAKE) -C $(commtopobjdir)/calendar/providers/gdata upload
 endif
 
 source-upload::
-	@$(MAKE) -C $(COMMDEPTH)/mail/installer source-upload
+	@$(MAKE) -C $(commtopobjdir)/mail/installer source-upload
 
 hg-bundle::
-	@$(MAKE) -C $(COMMDEPTH)/mail/installer hg-bundle
+	@$(MAKE) -C $(commtopobjdir)/mail/installer hg-bundle
 
 l10n-check::
-	@$(MAKE) -C $(COMMDEPTH)/mail/locales l10n-check
+	@$(MAKE) -C $(commtopobjdir)/mail/locales l10n-check
 
 wget-en-US:
-	$(MAKE) -C $(COMMDEPTH)/mail/locales wget-en-US
+	$(MAKE) -C $(commtopobjdir)/mail/locales wget-en-US
 
 # make -j1 because dependencies in l10n build targets don't work
 # with parallel builds
 merge-% installers-% langpack-% chrome-%:
-	$(MAKE) -j1 -C $(COMMDEPTH)/mail/locales $@
+	$(MAKE) -j1 -C $(commtopobjdir)/mail/locales $@
 
 ifdef ENABLE_TESTS
 include $(commtopsrcdir)/mail/testsuite-targets.mk

mail/configure.in

@@ -17,6 +17,7 @@ AC_SUBST(moztopsrcdir)
 AC_SUBST(commtopsrcdir)
 AC_SUBST(mozreltopsrcdir)
 AC_SUBST(commreltopsrcdir)
+AC_SUBST(commtopobjdir)
 
 dnl Optional parts of the build.
 AC_SUBST(MOZ_MORK)

mail/installer/Makefile.in

@@ -5,9 +5,6 @@
 STANDALONE_MAKEFILE := 1
 # DIST_SUBDIR := mail  # Not sure why TB is not using this
 
-# Since STANDALONE_MAKEFILE is defined we need to manually include our config
-include $(commtopsrcdir)/mail/app-config.mk
-
 include $(moztopsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
@@ -179,7 +176,7 @@ DEFINES += -DCLANG_CL
 endif
 
 libs::
-	$(MAKE) -C $(COMMDEPTH)/mail/locales langpack
+	$(MAKE) -C $(commtopobjdir)/mail/locales langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS =

mail/locales/Makefile.in

@@ -199,8 +199,8 @@ l10n-check::
 	$(MAKE) installers-x-test L10NBASEDIR='$(PWD)'
 
 ifdef MOZ_CALENDAR
-LIGHTNING_PATH=$(COMMDEPTH)/calendar/lightning
-GDATA_PATH=$(COMMDEPTH)/calendar/providers/gdata
+LIGHTNING_PATH=$(commtopobjdir)/calendar/lightning
+GDATA_PATH=$(commtopobjdir)/calendar/providers/gdata
 
 define run-calendar-rule
 $(MAKE) -C $(LIGHTNING_PATH) $(subst calendar-,,$@) AB_CD=$(AB_CD)

mail/testsuite-targets.mk

@@ -57,10 +57,10 @@ package-tests: stage-mozmill
 endif
 
 stage-mozmill: make-stage-dir
-	$(MAKE) -C $(COMMDEPTH)/mail/test/mozmill stage-package
+	$(MAKE) -C $(commtopobjdir)/mail/test/mozmill stage-package
 
 stage-calendar: make-stage-dir
-	$(MAKE) -C $(COMMDEPTH)/calendar/lightning stage-package
-	$(MAKE) -C $(COMMDEPTH)/calendar/providers/gdata stage-package
+	$(MAKE) -C $(commtopobjdir)/calendar/lightning stage-package
+	$(MAKE) -C $(commtopobjdir)/calendar/providers/gdata stage-package
 
 .PHONY: stage-mozmill stage-calendar

suite/app-config.mk

@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifeq ($(findstring comm,$(MOZ_BUILD_APP)),)
-COMMDEPTH = $(DEPTH)
-else
-COMMDEPTH = $(DEPTH)/comm
-endif

suite/configure.in

@@ -17,6 +17,7 @@ AC_SUBST(moztopsrcdir)
 AC_SUBST(commtopsrcdir)
 AC_SUBST(mozreltopsrcdir)
 AC_SUBST(commreltopsrcdir)
+AC_SUBST(commtopobjdir)
 
 dnl Optional parts of the build.
 AC_SUBST(MOZ_MORK)