Backed out changeset 8d2a0d1f2231 (bug 1338099) for causing Bug 1342383
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 03 Mar 2017 11:27:04 +0100
changeset 394620 9732cd019a8b94c49a275661320c1b742635a3d6
parent 394619 b23d6277acca34a4b1be9a4c24efd3b999e47ec3
child 394700 31c09bb63b697089f9866b7cbfa57b8900df2b1d
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1338099, 1342383
milestone54.0a1
backs out8d2a0d1f223178383805aba9d4fcaac3f5c88fda
first release with
nightly linux32
9732cd019a8b / 54.0a1 / 20170303110153 / files
nightly linux64
9732cd019a8b / 54.0a1 / 20170303110153 / files
nightly mac
9732cd019a8b / 54.0a1 / 20170303030202 / files
nightly win32
9732cd019a8b / 54.0a1 / 20170303030202 / files
nightly win64
9732cd019a8b / 54.0a1 / 20170303030202 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8d2a0d1f2231 (bug 1338099) for causing Bug 1342383
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -94,17 +94,18 @@ make-package-internal: prepare-package m
 
 make-package: FORCE
 	$(MAKE) make-package-internal
 	$(TOUCH) $@
 
 GARBAGE += make-package
 
 make-sourcestamp-file::
-	@awk '$$2 == "MOZ_BUILDID" {print $$3}' $(DEPTH)/buildid.h > $(MOZ_SOURCESTAMP_FILE)
+	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
+	@echo '$(BUILDID)' > $(MOZ_SOURCESTAMP_FILE)
 ifdef MOZ_INCLUDE_SOURCE_INFO
 	@awk '$$2 == "MOZ_SOURCE_URL" {print $$3}' $(DEPTH)/source-repo.h >> $(MOZ_SOURCESTAMP_FILE)
 endif
 
 .PHONY: make-buildinfo-file
 make-buildinfo-file:
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/informulate.py \
 		$(MOZ_BUILDINFO_FILE) \
@@ -154,17 +155,17 @@ upload: checksum
 		$(CHECKSUM_FILES)
 
 # source-package creates a source tarball from the files in MOZ_PKG_SRCDIR,
 # which is either set to a clean checkout or defaults to $topsrcdir
 source-package:
 	@echo 'Generate the sourcestamp file'
 	# Make sure to have repository information available and then generate the
 	# sourcestamp file.
-	$(MAKE) -C $(DEPTH) 'source-repo.h' 'buildid.h'
+	$(MAKE) -C $(DEPTH) 'source-repo.h'
 	$(MAKE) make-sourcestamp-file
 	@echo 'Packaging source tarball...'
 	# We want to include the sourcestamp file in the source tarball, so copy it
 	# in the root source directory. This is useful to enable telemetry submissions
 	# from builds made from the source package with the correct revision information.
 	# Don't bother removing it as this is only used by automation.
 	@cp $(MOZ_SOURCESTAMP_FILE) '$(MOZ_PKG_SRCDIR)/sourcestamp.txt'
 	$(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH)