Bug 1298719 - Ensure platform.ini contains the correct m-* source revision. r=ewong,philipp a=jorgk
--- 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