Bug 1074034, part 2: Replace $(MOZDEPTH) with $(DEPTH), r=Standard8
authorJoshua Cranmer <Pidgeot18@gmail.com>
Mon, 29 Sep 2014 18:19:22 -0500
changeset 20992 2bc3fa56968298764f14f05b0779ebd43a14b66c
parent 20991 fa89bf616d7ef7cf02ecba846fa3edac84ec49fc
child 20993 d9ef713a866e688f9af378b2ce332e9b6c3a112f
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs1074034
Bug 1074034, part 2: Replace $(MOZDEPTH) with $(DEPTH), r=Standard8
config/baseconfig.mk
config/config.mk
config/rules.mk
config/static-checking-config.mk
config/version.mk
im/app/Makefile.in
mail/test/mozmill/Makefile.in
mailnews/Makefile.in
suite/browser/test/Makefile.in
suite/common/dataman/tests/Makefile.in
suite/common/downloads/tests/Makefile.in
suite/common/places/tests/Makefile.in
suite/common/tests/browser/Makefile.in
suite/common/tests/chrome/Makefile.in
suite/common/tests/preferences/Makefile.in
suite/smile/test/Makefile.in
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -2,18 +2,17 @@
 # directly in python/mozbuild/mozbuild/base.py for gmake validation.
 # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
 # whether a normal build is happening or whether the check is running.
 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 MOZILLA_SRCDIR = $(topsrcdir)/mozilla
-MOZDEPTH = $(DEPTH)
-DIST = $(MOZDEPTH)/dist
+DIST = $(DEPTH)/dist
 
 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
 # manually use it before config.mk inclusion
 _OBJ_SUFFIX := $(OBJ_SUFFIX)
 OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
 
 ifeq ($(HOST_OS_ARCH),WINNT)
 # We only support building with a non-msys gnu make version
--- a/config/config.mk
+++ b/config/config.mk
@@ -202,19 +202,19 @@ ifdef WANT_MOZILLA_CONFIG_OS_VERSION
 OS_VERS		:= $(suffix $(OS_RELEASE))
 OS_VERSION	:= $(shell echo $(OS_VERS) | sed 's/-.*//')
 endif
 
 endif
 
 OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
 
-FINAL_LINK_LIBS = $(MOZDEPTH)/config/final-link-libs
-FINAL_LINK_COMPS = $(MOZDEPTH)/config/final-link-comps
-FINAL_LINK_COMP_NAMES = $(MOZDEPTH)/config/final-link-comp-names
+FINAL_LINK_LIBS = $(DEPTH)/config/final-link-libs
+FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps
+FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
 
 ifdef _MSC_VER
 CC_WRAPPER ?= $(call py_action,cl)
 CXX_WRAPPER ?= $(call py_action,cl)
 endif # _MSC_VER
 
 CC := $(CC_WRAPPER) $(CC)
 CXX := $(CXX_WRAPPER) $(CXX)
@@ -533,17 +533,17 @@ ELF_DYNSTR_GC	= :
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 OS_LIBS += $(MOZ_QT_LIBS)
 endif
 
 ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
 ifdef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS
-ELF_DYNSTR_GC 	= $(MOZDEPTH)/config/elf-dynstr-gc
+ELF_DYNSTR_GC 	= $(DEPTH)/config/elf-dynstr-gc
 endif
 endif
 endif
 
 ifeq ($(OS_ARCH),Darwin)
 ifdef NEXT_ROOT
 export NEXT_ROOT
 PBBUILD = NEXT_ROOT= $(PBBUILD_BIN)
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1134,25 +1134,25 @@ endif
 ###############################################################################
 
 ifdef MOZBUILD_DERIVED
 
 # If this Makefile is derived from moz.build files, substitution for all .in
 # files is handled by SUBSTITUTE_FILES. This includes Makefile.in.
 ifneq ($(SUBSTITUTE_FILES),,)
 $(SUBSTITUTE_FILES): % : $(srcdir)/%.in $(DEPTH)/config/autoconf.mk
-	@$(PYTHON) $(MOZDEPTH)/config.status -n --file=$@
+	@$(PYTHON) $(DEPTH)/config.status -n --file=$@
 	@$(TOUCH) $@
 endif
 
 # Detect when the backend.mk needs rebuilt. This will cause a full scan and
 # rebuild. While relatively expensive, it should only occur once per recursion.
 ifneq ($(BACKEND_INPUT_FILES),,)
 backend.mk: $(BACKEND_INPUT_FILES)
-	@$(PYTHON) $(MOZDEPTH)/config.status -n
+	@$(PYTHON) $(DEPTH)/config.status -n
 	@$(TOUCH) $@
 endif
 
 endif # MOZBUILD_DERIVED
 
 ###############################################################################
 # Bunch of things that extend the 'export' rule (in order):
 ###############################################################################
@@ -1203,17 +1203,17 @@ endif
 endif
 
 ################################################################################
 # Install a linked .xpt into the appropriate place.
 # This should ideally be performed by the non-recursive idl make file. Some day.
 ifdef XPT_NAME #{
 
 ifndef NO_DIST_INSTALL
-_XPT_NAME_FILES := $(MOZDEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
+_XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
 _XPT_NAME_DEST := $(FINAL_TARGET)/components
 INSTALL_TARGETS += _XPT_NAME
 
 ifndef NO_INTERFACES_MANIFEST
 libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
 	$(call py_action,buildlist,$(FINAL_TARGET)/components/interfaces.manifest 'interfaces $(XPT_NAME)')
 	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest components/interfaces.manifest')
 endif
--- a/config/static-checking-config.mk
+++ b/config/static-checking-config.mk
@@ -18,17 +18,17 @@ TREEHYDRA_MODULES = \
   $(MOZILLA_SRCDIR)/xpcom/analysis/stack.js \
   $(MOZILLA_SRCDIR)/xpcom/analysis/flow.js \
   $(MOZILLA_SRCDIR)/js/src/jsstack.js \
   $(MOZILLA_SRCDIR)/layout/generic/frame-verify.js \
   $(NULL)
 
 DEHYDRA_ARGS = \
   --topsrcdir=$(topsrcdir) \
-  --objdir=$(MOZDEPTH) \
+  --objdir=$(DEPTH) \
   --dehydra-modules=$(subst $(NULL) ,$(COMMA),$(strip $(DEHYDRA_MODULES))) \
   --treehydra-modules=$(subst $(NULL) ,$(COMMA),$(strip $(TREEHYDRA_MODULES))) \
   $(NULL)
 
 DEHYDRA_FLAGS = -fplugin=$(DEHYDRA_PATH) -fplugin-arg='$(DEHYDRA_SCRIPT) $(DEHYDRA_ARGS)'
 
 ifdef DEHYDRA_PATH
 OS_CXXFLAGS += $(DEHYDRA_FLAGS)
--- a/config/version.mk
+++ b/config/version.mk
@@ -10,17 +10,17 @@ INCLUDED_VERSION_MK=1
 # TODO:
 # PBI      : Private build info.  Not used currently.
 #            Guessing the best way would be to set an env var.
 # BINARY   : Binary name.  Not used currently.
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifndef RESFILE
 RCFILE=./module.rc
 RESFILE=./module.res
-_RC_STRING = -QUIET 1 -DEPTH $(MOZDEPTH) -TOPSRCDIR $(MOZILLA_SRCDIR) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION)
+_RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(MOZILLA_SRCDIR) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION)
 ifdef MOZILLA_OFFICIAL
 _RC_STRING += -OFFICIAL 1
 endif
 ifdef MOZ_DEBUG
 _RC_STRING += -DEBUG 1
 endif
 ifdef MODULE
 _RC_STRING += -MODNAME $(MODULE)
--- a/im/app/Makefile.in
+++ b/im/app/Makefile.in
@@ -197,18 +197,18 @@ GARBAGE += module.ver
 libs:: $(srcdir)/profile/prefs.js
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
 
 ifdef ENABLE_TESTS
 # XXX This is a hack to ensure that we get the right xpcshell.ini for our tests.
 # mozilla-central does this in testing/xpcshell-tests which means that it is very
 # hard for anyone to specify anything else.
 libs::
-	$(INSTALL) $(topsrcdir)/im/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell
-	cp $(topsrcdir)/im/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list
+	$(INSTALL) $(topsrcdir)/im/test/xpcshell.ini $(DEPTH)/_tests/xpcshell
+	cp $(topsrcdir)/im/test/xpcshell.ini $(DEPTH)/_tests/xpcshell/all-test-dirs.list
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
 
 ifdef MOZ_DEBUG
 MAC_APP_NAME := $(MAC_APP_NAME)Debug
--- a/mail/test/mozmill/Makefile.in
+++ b/mail/test/mozmill/Makefile.in
@@ -12,17 +12,17 @@ relativesrcdir = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 # We're installing to _tests/mozmill
 TARGET_DEPTH = ../..
 include $(MOZILLA_DIR)/build/automation-build.mk
 
-_DEST_DIR = $(MOZDEPTH)/_tests/mozmill
+_DEST_DIR = $(DEPTH)/_tests/mozmill
 
 _HARNESS_FILES = \
 	$(srcdir)/runtest.py \
 	$(srcdir)/runtestlist.py \
 	$(srcdir)/mozmilltests.list \
 	automation.py \
 	$(MOZILLA_DIR)/build/automationutils.py \
 	$(NULL)
@@ -60,9 +60,9 @@ mozmill-virtualenv:
 
 libs:: mozmill-virtualenv
 
 PKG_STAGE = $(DIST)/test-stage
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/mozmill/
 	@(cd $(topsrcdir)/mail/test/mozmill && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mozmill/ && tar -xf -)
-	@(cd $(MOZDEPTH)/_tests/mozmill && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mozmill/ && tar -xf -)
+	@(cd $(DEPTH)/_tests/mozmill && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mozmill/ && tar -xf -)
--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -11,11 +11,11 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 PREF_JS_EXPORTS = $(srcdir)/mailnews.js
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef ENABLE_TESTS
 libs::
-	$(INSTALL) $(wildcard $(srcdir)/test/resources/*.js) $(MOZDEPTH)/_tests/xpcshell/mailnews/resources
-	$(INSTALL) $(wildcard $(srcdir)/test/data/*) $(MOZDEPTH)/_tests/xpcshell/mailnews/data
+	$(INSTALL) $(wildcard $(srcdir)/test/resources/*.js) $(DEPTH)/_tests/xpcshell/mailnews/resources
+	$(INSTALL) $(wildcard $(srcdir)/test/data/*) $(DEPTH)/_tests/xpcshell/mailnews/data
 endif
--- a/suite/browser/test/Makefile.in
+++ b/suite/browser/test/Makefile.in
@@ -90,15 +90,15 @@ ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 _BROWSER_FILES += browser_bug462289.js
 endif
 
 _CHROME_FILES = \
                  test_maxSniffing.html \
     $(NULL)
 
 libs:: $(addprefix mochitest/, $(_TEST_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
 libs:: $(addprefix browser/, $(_BROWSER_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 
 libs:: $(addprefix chrome/, $(_CHROME_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
--- a/suite/common/dataman/tests/Makefile.in
+++ b/suite/common/dataman/tests/Makefile.in
@@ -14,9 +14,9 @@ include $(topsrcdir)/config/rules.mk
     browser_dataman_basics.js \
     dataman_storage.appcache \
     dataman_storage.appcache^headers^ \
     dataman_storage.html \
     browser_dataman_callviews.js \
     $(NULL)
 
 libs:: $(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
--- a/suite/common/downloads/tests/Makefile.in
+++ b/suite/common/downloads/tests/Makefile.in
@@ -32,12 +32,12 @@ include $(topsrcdir)/config/rules.mk
     test_space_key_retries.xul \
     test_ui_stays_open_on_alert_clickback.xul \
     $(NULL)
 
 _BROWSER_FILES = browser_nsISuiteDownloadManagerUI.js \
     $(NULL)
 
 libs:: $(addprefix chrome/, $(_CHROME_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
 
 libs:: $(addprefix browser/, $(_BROWSER_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
--- a/suite/common/places/tests/Makefile.in
+++ b/suite/common/places/tests/Makefile.in
@@ -34,12 +34,12 @@ include $(topsrcdir)/config/rules.mk
     browser_library_open_leak.js \
     browser_library_left_pane_commands.js \
     browser_drag_bookmarks_on_toolbar.js \
     browser_library_views_liveupdate.js \
     browser_library_infoBox.js \
     $(NULL)
 
 libs:: $(addprefix chrome/, $(_CHROME_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
 
 libs:: $(addprefix browser/, $(_BROWSER_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
--- a/suite/common/tests/browser/Makefile.in
+++ b/suite/common/tests/browser/Makefile.in
@@ -82,9 +82,9 @@ include $(topsrcdir)/config/rules.mk
 	browser_isempty.js \
 	browser_markPageAsFollowedLink.js \
 	framedPage.html \
 	frameLeft.html \
 	frameRight.html \
 	$(NULL)
 
 libs:: $(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
--- a/suite/common/tests/chrome/Makefile.in
+++ b/suite/common/tests/chrome/Makefile.in
@@ -12,9 +12,9 @@ relativesrcdir  = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = 	test_idcheck.xul \
 		$(topsrcdir)/mailnews/test/resources/mailTestUtils.js \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
--- a/suite/common/tests/preferences/Makefile.in
+++ b/suite/common/tests/preferences/Makefile.in
@@ -11,9 +11,9 @@ relativesrcdir  = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_FILES = \
     browser_bug410900.js \
     $(NULL)
 
 libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
--- a/suite/smile/test/Makefile.in
+++ b/suite/smile/test/Makefile.in
@@ -19,9 +19,9 @@ include $(topsrcdir)/config/rules.mk
 	browser_Bookmarks.js \
 	browser_Browser.js \
 	ContentA.html \
 	ContentB.html \
 	ContentWithFrames.html \
 	$(NULL)
 
 libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)