"Brad Lassey" - Bug 445918 - Setting xr version in deb package to gre version + buildid, relanding after backout in de1e95ba7165 r=ted
author"Brad Lassey" <blassey@mozilla.com>
Tue, 05 Aug 2008 10:54:42 -0400
changeset 16391 05e884fdbc009c4cfdebcc903b2c37d1873bbf50
parent 16390 c772ee3d2c4a26b97d19c3f998762f8d70a5553e
child 16392 9a9be5689aebb774ee7926acdecaad50469670ab
push id993
push userblassey@mozilla.com
push dateTue, 05 Aug 2008 14:58:07 +0000
treeherdermozilla-central@05e884fdbc00 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs445918
milestone1.9.1a2pre
"Brad Lassey" - Bug 445918 - Setting xr version in deb package to gre version + buildid, relanding after backout in de1e95ba7165 r=ted
xulrunner/installer/Makefile.in
xulrunner/installer/debian/changelog.in
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -125,22 +125,34 @@ endif
 	chmod 644 $@
 
 install:: $(pkg_config_files)
 	@echo pkg_config_file: $(pkg_config_files)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
 
 GARBAGE += $(MOZILLA_VERSION).system.conf $(pkg_config_files)
 
+GARBAGE += debian/changelog
 
 DEBDESTDIR=debian/$(MOZ_BUILD_APP)
 
+GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
+GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
+MOZ_DEB_TIMESTAMP = "$(shell date  +"%a, %d  %b %Y %T %z" )"
+
+DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) -DMOZ_DEB_TIMESTAMP=$(MOZ_DEB_TIMESTAMP)
+
 
 ifeq ($(OS_TARGET),Linux)
-deb: 
+debian/changelog: $(srcdir)/debian/changelog.in 
+	mkdir -p debian
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+        $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@
+
+deb: debian/changelog
 	$(NSINSTALL)  $(topsrcdir)/$(MOZ_BUILD_APP)/installer/debian .
 	rm -rf $(DEBDESTDIR)/usr/local/*
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/local
 	cd $(DEBDESTDIR)/usr/local; cat ../../../../$(DEPTH)/dist/$(PKG_BASENAME)$(PKG_SUFFIX) | $(UNMAKE_PACKAGE)
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/dbus-1/services/
 	cp debian/$(MOZ_BUILD_APP).service $(DEBDESTDIR)/usr/share/dbus-1/services/org.mozilla.$(MOZ_BUILD_APP).service
 	$(NSINSTALL) debian/postinst $(DEBDESTDIR)/DEBIAN
 	$(NSINSTALL) debian/prerm $(DEBDESTDIR)/DEBIAN
--- a/xulrunner/installer/debian/changelog.in
+++ b/xulrunner/installer/debian/changelog.in
@@ -1,5 +1,6 @@
-xulrunner (@MOZ_APP_VERSION@)  unstable; urgency=low
+#filter substitution
+xulrunner (@GRE_MILESTONE@-@GRE_BUILDID@)  unstable; urgency=low
 
   * Mozilla Nightly (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 
  -- Mozilla xulrunner  <blassey@mozilla.com>  @MOZ_DEB_TIMESTAMP@