Bug 1235676 - Replace $(abspath $(DIST)) with $(ABS_DIST). r=mshal

sean93park · Dec 30, 2015 · c2d36c7 · c2d36c7
1 parent ae8b4f0
commit c2d36c7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/b2g/gaia/Makefile.in b/b2g/gaia/Makefile.in
@@ -19,4 +19,4 @@ include $(topsrcdir)/config/rules.mk
 libs::
 	+$(MAKE) -j1 -C $(GAIADIR) clean
 	+$(GAIA_OPTIONS) $(MAKE) -j1 -C $(GAIADIR) profile
-	(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -)
+	(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(ABS_DIST)/bin/$(GAIA_PATH) && tar -xf -)
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
@@ -2,7 +2,6 @@
 # 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/.
 
-abs_dist := $(abspath $(DIST))
 webidl_base := $(topsrcdir)/dom/webidl
 
 # Generated by moz.build

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
@@ -475,7 +475,7 @@ update-generated-wrappers:
 # does most of the packaging step, and then updates omni.ja in
 # place. If you're not using an IDE, you should be using |mach build
 # mobile/android && mach package|.
-$(abspath $(DIST)/fennec/$(OMNIJAR_NAME)): FORCE
+$(ABS_DIST)/fennec/$(OMNIJAR_NAME): FORCE
 	$(REPORT_BUILD)
 	$(MAKE) -C ../../../faster
 	$(MAKE) -C ../installer stage-package
@@ -488,7 +488,7 @@ gradle-targets: $(foreach f,$(constants_PP_JAVAFILES),$(f))
 gradle-targets: $(abspath AndroidManifest.xml)
 gradle-targets: $(ANDROID_GENERATED_RESFILES)
 
-gradle-omnijar: $(abspath $(DIST)/fennec/$(OMNIJAR_NAME))
+gradle-omnijar: $(ABS_DIST)/fennec/$(OMNIJAR_NAME)
 
 .PHONY: gradle-targets gradle-omnijar
 

diff --git a/mobile/android/base/locales/Makefile.in b/mobile/android/base/locales/Makefile.in
@@ -18,7 +18,7 @@ STRINGSPATH = $(abspath $(call MERGE_FILE,android_strings.dtd))
 ifeq (,$(XPI_NAME))
 BRANDPATH = $(abspath $(DEPTH)/dist/bin/chrome/$(AB_CD)/locale/branding/brand.dtd)
 else
-BRANDPATH = $(abspath $(DIST)/xpi-stage/$(XPI_NAME)/chrome/$(AB_CD)/locale/branding/brand.dtd)
+BRANDPATH = $(ABS_DIST)/xpi-stage/$(XPI_NAME)/chrome/$(AB_CD)/locale/branding/brand.dtd
 endif
 $(warnIfEmpty,AB_CD) # todo: $(errorIfEmpty )
 

diff --git a/mobile/android/geckoview_library/Makefile.in b/mobile/android/geckoview_library/Makefile.in
@@ -29,16 +29,14 @@ GARBAGE_DIRS = \
 
 include $(topsrcdir)/config/rules.mk
 
-abs_dist = $(abspath $(DIST))
-
-dist_files = $(addprefix $(abs_dist)/bin/, libmozglue.so $(MOZ_CHILD_PROCESS_NAME) $(MOZ_CHILD_PROCESS_NAME_PIE))
+dist_files = $(addprefix $(ABS_DIST)/bin/, libmozglue.so $(MOZ_CHILD_PROCESS_NAME) $(MOZ_CHILD_PROCESS_NAME_PIE))
 
 package: local.properties project.properties AndroidManifest.xml FORCE
 	# Make directory for the zips
-	$(MKDIR) -p $(abs_dist)/geckoview_library
+	$(MKDIR) -p $(ABS_DIST)/geckoview_library
 
 	# Zip the assets into $(DIST)/geckoview_library/geckoview_assets.zip
-	$(call py_action,zip,-C $(abs_dist)/$(MOZ_APP_NAME) $(abs_dist)/geckoview_library/geckoview_assets.zip assets)
+	$(call py_action,zip,-C $(ABS_DIST)/$(MOZ_APP_NAME) $(ABS_DIST)/geckoview_library/geckoview_assets.zip assets)
 
 	# Make empty directories to fit an Android project structure
 	$(MKDIR) -p bin gen libs/$(ANDROID_CPU_ARCH) src
@@ -55,8 +53,8 @@ package: local.properties project.properties AndroidManifest.xml FORCE
 	$(RM) -rf res
 	$(MKDIR) -p res
 	cd res && \
-	$(UNZIP) -q -u -o $(abs_dist)/bin/geckoview_resources.zip
+	$(UNZIP) -q -u -o $(ABS_DIST)/bin/geckoview_resources.zip
 
 	# Zip the directory
 	cd $(DEPTH)/mobile/android && \
-	$(ZIP) -q -r $(abs_dist)/geckoview_library/geckoview_library.zip geckoview_library -x geckoview_library/backend.mk geckoview_library/Makefile
+	$(ZIP) -q -r $(ABS_DIST)/geckoview_library/geckoview_library.zip geckoview_library -x geckoview_library/backend.mk geckoview_library/Makefile
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
@@ -59,7 +59,7 @@ ifndef MOZ_THUNDERBIRD
 	# Package mozharness
 	$(call py_action,test_archive, \
 		mozharness \
-		$(abspath $(DIST))/$(PKG_PATH)$(MOZHARNESS_PACKAGE))
+		$(ABS_DIST)/$(PKG_PATH)$(MOZHARNESS_PACKAGE))
 endif # MOZ_THUNDERBIRD
 ifdef MOZ_PACKAGE_JSSHELL
 	# Package JavaScript Shell

diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in
@@ -11,7 +11,7 @@ STANDALONE_MAKEFILE := 1
 PACKAGE_BASE_DIR	= $(DIST)
 
 # Default output location for update archive
-STAGE_DIR      = $(abspath $(DIST)/$(PKG_UPDATE_PATH))
+STAGE_DIR      = $(ABS_DIST)/$(PKG_UPDATE_PATH)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifdef UNIVERSAL_BINARY