Bug 1298719 - Ensure platform.ini contains the correct m-* source revision. r=ewong,philipp draft
authoraleth <aleth@instantbird.org>
Mon, 10 Oct 2016 01:42:34 +0200
changeset 42681 574d5d1a2132314cd19065a1b84c4bcec895c455
parent 42676 01cab5bea179ebf9edf84fc94d5ee642666eb467
child 42682 113860c6e90b5276fd60ae4d207b86057753da2b
child 42684 c0627a05bbe3cf91a6422ff223f1098312b809a5
push id3786
push useraleth@instantbird.org
push dateMon, 10 Oct 2016 08:37:51 +0000
treeherdertry-comm-central@626545fc4435 [default view] [failures only]
reviewersewong, philipp
bugs1298719
Bug 1298719 - Ensure platform.ini contains the correct m-* source revision. r=ewong,philipp
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 "$(topsrcdir)/mozilla" 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 "$(topsrcdir)/mozilla" 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 "$(topsrcdir)/mozilla" 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