Bug 1298719 - Fix the m-* revision in the sourcestamp file. r=ewong,philipp a=ewong a=jorgk
authoraleth <aleth@instantbird.org>
Mon, 10 Oct 2016 20:23:13 +0200
changeset 25682 195a354299cae5bfefa740b64262d783712082a9
parent 25681 6fad5ffd4d96c7ea0a5591431674ab5881f63f64
child 25683 cc8bac76b04d5b18669cc1f6048eea2d7809637c
push id1739
push usermozilla@jorgk.com
push dateWed, 12 Oct 2016 15:21:32 +0000
treeherdercomm-beta@cc8bac76b04d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewong, philipp, ewong, jorgk
bugs1298719
Bug 1298719 - Fix the m-* revision in the sourcestamp file. r=ewong,philipp a=ewong a=jorgk
im/installer/Makefile.in
mail/installer/Makefile.in
suite/installer/Makefile.in
--- a/im/installer/Makefile.in
+++ b/im/installer/Makefile.in
@@ -194,12 +194,13 @@ ifdef MOZ_PKG_MANIFEST_P
 	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 endif
 
 installer::
 ifdef INSTALLER_DIR
 	$(MAKE) -C $(INSTALLER_DIR)
 endif
 
-APP_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node}\n" 2>/dev/null))
-APP_SOURCE_REPO = $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
+# The comm-* source stamp is already there.
+PLATFORM_SOURCE_STAMP = $(firstword $(shell hg -R "$(MOZILLA_SRCDIR)" parent --template="{node}\n" 2>/dev/null))
+PLATFORM_SOURCE_REPO = $(shell hg -R "$(MOZILLA_SRCDIR)" showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
 make-sourcestamp-file::
-	@echo "$(APP_SOURCE_REPO)/rev/$(APP_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)
+	@echo "$(PLATFORM_SOURCE_REPO)/rev/$(PLATFORM_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -197,12 +197,13 @@ ifdef MOZ_PKG_MANIFEST_P
 	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 endif
 
 installer::
 ifdef INSTALLER_DIR
 	$(MAKE) -C $(INSTALLER_DIR)
 endif
 
-APP_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node}\n" 2>/dev/null))
-APP_SOURCE_REPO = $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
+# The comm-* source stamp is already there.
+PLATFORM_SOURCE_STAMP = $(firstword $(shell hg -R "$(MOZILLA_SRCDIR)" parent --template="{node}\n" 2>/dev/null))
+PLATFORM_SOURCE_REPO = $(shell hg -R "$(MOZILLA_SRCDIR)" showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
 make-sourcestamp-file::
-	@echo "$(APP_SOURCE_REPO)/rev/$(APP_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)
+	@echo "$(PLATFORM_SOURCE_REPO)/rev/$(PLATFORM_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -231,12 +231,13 @@ ifdef MOZ_PKG_MANIFEST_P
 	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 endif
 
 installer:
 ifdef INSTALLER_DIR
 	$(MAKE) -C $(INSTALLER_DIR)
 endif
 
-APP_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
-APP_SOURCE_REPO = $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
+# The comm-* source stamp is already there.
+PLATFORM_SOURCE_STAMP = $(firstword $(shell hg -R "$(MOZILLA_SRCDIR)" parent --template="{node|short}\n" 2>/dev/null))
+PLATFORM_SOURCE_REPO = $(shell hg -R "$(MOZILLA_SRCDIR)" showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
 make-sourcestamp-file::
-	@echo "$(APP_SOURCE_REPO)/rev/$(APP_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)
+	@echo "$(PLATFORM_SOURCE_REPO)/rev/$(PLATFORM_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)