From 29d6c1315bfbb0e47fceb6d206e4dc5b3b84a533 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sun, 21 Feb 2010 21:55:51 -0800
Subject: [PATCH] Bug 547599 - Port the comm-central "make package-compare",
 r=ted

--HG--
extra : rebase_source : 47c1811b5c3328c40c26143e930095c61d772682
---
 browser/build.mk              |  3 +++
 browser/installer/Makefile.in | 28 +++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/browser/build.mk b/browser/build.mk
index 9f2f26f9d6a4..aa2a57dbadc2 100644
--- a/browser/build.mk
+++ b/browser/build.mk
@@ -55,6 +55,9 @@ installer:
 package:
 	@$(MAKE) -C browser/installer
 
+package-compare:
+	@$(MAKE) -C browser/installer package-compare
+
 install::
 	@$(MAKE) -C browser/installer install
 
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index f1664d8f53ea..29ea17e5ec41 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -109,20 +109,38 @@ endif
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
 ifeq (bundle, $(MOZ_FS_LAYOUT))
-DEFINES += \
-  -DBINPATH=$(_BINPATH) \
-  -DAPPNAME=$(_APPNAME) \
-  $(NULL)
+BINPATH = $(_BINPATH)
+DEFINES += -DAPPNAME=$(_APPNAME)
 else
 # Every other platform just winds up in dist/bin
-DEFINES += -DBINPATH=bin
+BINPATH = bin
 endif
+DEFINES += -DBINPATH=$(BINPATH)
 
 libs::
 	$(MAKE) -C $(DEPTH)/browser/locales langpack PKG_LANGPACK_PATH=
 
 UPLOAD_EXTRA_FILES += $(PKG_LANGPACK_BASENAME).xpi
 
+ifeq (WINNT,$(OS_ARCH))
+PKGCOMP_FIND_OPTS =
+else
+PKGCOMP_FIND_OPTS = -L
+endif
+ifeq (Darwin, $(OS_ARCH))
+FINDPATH = $(_APPNAME)/Contents/MacOS
+else
+FINDPATH=bin
+endif
+
+package-compare:: $(MOZ_PKG_MANIFEST)
+ifdef MOZ_PKG_MANIFEST_P
+	cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt
+	grep "^$(BINPATH)" $(MOZ_PKG_MANIFEST) | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
+	-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
+	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
+endif
+
 installer:: removed-files
 ifdef INSTALLER_DIR
 	$(MAKE) -C $(INSTALLER_DIR)