Bug 1298719 - Ensure platform.ini contains the correct m-* source revision. r=ewong,philipp a=jorgk
authoraleth <aleth@instantbird.org>
Mon, 10 Oct 2016 20:23:11 +0200
changeset 27593 88f589017731a194eb5f890ff2c15617da5ed268
parent 27592 c7792897153ba9fe4a26e3c9a1bb6bdff4f25e6e
child 27594 83942b1cb0724718b52517854635156df038b43c
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewong, philipp, jorgk
bugs1298719
Bug 1298719 - Ensure platform.ini contains the correct m-* source revision. r=ewong,philipp a=jorgk
im/Makefile.in
mail/Makefile.in
suite/Makefile.in
--- a/im/Makefile.in
+++ b/im/Makefile.in
@@ -6,8 +6,20 @@
 include $(topsrcdir)/config/rules.mk
 
 ifdef MAKENSISU
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
 	$(MAKE) -C installer/windows uninstaller
 endif
+
+
+# As a fallout from bug 1247162, the sourcestamp in application.ini and
+# platform.ini are the same, which isn't a problem for Firefox, but
+# it's not right for anything else. So we correct platform.ini here.
+
+MOZ_REV=$(shell hg -R "$(MOZILLA_SRCDIR)" parent --template="{node}" 2>/dev/null)
+
+libs:: $(DIST)/bin/platform.ini
+	sed -e "s/^\(SourceStamp=\).*/\1$(MOZ_REV)/" $(DIST)/bin/platform.ini \
+		> $(DIST)/bin/platform.ini~
+	mv -f $(DIST)/bin/platform.ini~ $(DIST)/bin/platform.ini
--- a/mail/Makefile.in
+++ b/mail/Makefile.in
@@ -22,8 +22,20 @@ ifdef MAKENSISU
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
 	$(MAKE) -C installer/windows uninstaller
 ifdef MOZ_MAINTENANCE_SERVICE
 	$(MAKE) -C installer/windows maintenanceservice_installer
 endif
 endif
+
+
+# As a fallout from bug 1247162, the sourcestamp in application.ini and
+# platform.ini are the same, which isn't a problem for Firefox, but
+# it's not right for anything else. So we correct platform.ini here.
+
+MOZ_REV=$(shell hg -R "$(MOZILLA_SRCDIR)" parent --template="{node}" 2>/dev/null)
+
+libs:: $(DIST)/bin/platform.ini
+	sed -e "s/^\(SourceStamp=\).*/\1$(MOZ_REV)/" $(DIST)/bin/platform.ini \
+		> $(DIST)/bin/platform.ini~
+	mv -f $(DIST)/bin/platform.ini~ $(DIST)/bin/platform.ini
--- a/suite/Makefile.in
+++ b/suite/Makefile.in
@@ -6,8 +6,20 @@
 include $(topsrcdir)/config/rules.mk
 
 ifdef MAKENSISU
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
 	$(MAKE) -C installer/windows uninstaller
 endif
+
+
+# As a fallout from bug 1247162, the sourcestamp in application.ini and
+# platform.ini are the same, which isn't a problem for Firefox, but
+# it's not right for anything else. So we correct platform.ini here.
+
+MOZ_REV=$(shell hg -R "$(MOZILLA_SRCDIR)" parent --template="{node}" 2>/dev/null)
+
+libs:: $(DIST)/bin/platform.ini
+	sed -e "s/^\(SourceStamp=\).*/\1$(MOZ_REV)/" $(DIST)/bin/platform.ini \
+		> $(DIST)/bin/platform.ini~
+	mv -f $(DIST)/bin/platform.ini~ $(DIST)/bin/platform.ini