* Add support for remove.binonly.sh script, drop previous cleaning system.

  Logs are preserved inside the tarball (as REMOVED+nobinonly.txt).
  - add remove.binonly.sh
  - update Makefile

1 files changed, 8 insertions, 68 deletions

diff --git a/Makefile b/Makefile
index 7dc49a0..ce82c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,58 +17,8 @@ DEBIAN_CO_TAG     = -r $(DEBIAN_BRANCH)
 endif
 endif
 
-DEBIAN_EXCLUDE  := \
-	mozilla/README/mozilla/README.os2 \
-	mozilla/browser/app/apprunner-beos.rsrc \
-	mozilla/browser/app/macbuild \
-	mozilla/browser/app/*-os2.ico \
-	mozilla/browser/branding/unofficial/*-os2.ico \
-	mozilla/other-licenses/branding/firefox/*-os2.ico \
-	mozilla/other-licenses/7zstub \
-	mozilla/build/unix/vms \
-	mozilla/build/package/mac_osx \
-	mozilla/build/wince \
-	mozilla/config/*.exe \
-	mozilla/intl/locale/src/os2 \
-	mozilla/extensions/manticore \
-	mozilla/toolkit/crashreporter/client/macbuild \
-	mozilla/toolkit/crashreporter/google-breakpad/src/processor/testdata \
-	mozilla/toolkit/crashreporter/google-breakpad/src/tools/mac \
-	mozilla/toolkit/crashreporter/google-breakpad/src/tools/windows \
-	mozilla/toolkit/crashreporter/tools/win32 \
-	mozilla/toolkit/mozapps/installer/windows \
-	mozilla/toolkit/mozapps/update/src/updater/macbuild \
-	mozilla/toolkit/xre/nsNativeAppSupportOS2.* \
-	mozilla/extensions/universalchardet/doc/UniversalCharsetDetection.doc \
-	mozilla/layout/doc/*.sda \
-	mozilla/embedding/browser/activex \
-	mozilla/embedding/wrappers/DotNETEmbed \
-	mozilla/gfx/src/mac \
-	mozilla/*/test \
-	mozilla/*/tests \
-	mozilla/*/*/test \
-	mozilla/*/*/tests \
-	mozilla/*/*/*/test \
-	mozilla/*/*/*/tests \
-	mozilla/nsprpub/pr/src/md/os2 \
-	mozilla/embedding/components/printingui/src/os2 \
-	mozilla/modules/plugin/samples/default/os2 \
-	mozilla/modules/plugin/tools/tester/os2 \
-	mozilla/uriloader/exthandler/os2 \
-	mozilla/xpfe/global/resources/content/os2 \
-	mozilla/xpfe/global/resources/locale/en-US/os2 \
-	mozilla/widget/src/os2 \
-	mozilla/widget/src/cocoa \
-	mozilla/embedding/browser/cocoa \
-	mozilla/xpcom/typelib/xpidl/macplugin \
-	mozilla/plugin/oji \
-	mozilla/modules/plugin/samples/default/mac \
-	mozilla/modules/plugin/tools/sdk/samples/*/mac \
-	mozilla/xpfe/bootstrap/appleevents \
-	mozilla/embedding/qa/testembed/testembed.aps \
-	mozilla/js/src/fdlibm/fdlibm.mdp \
-	mozilla/js/src/js.mdp \
-	$(NULL)
+DEBIAN_EXCLUDE_SCRIPT := remove.binonly.sh
+NOBINONLY             := nobinonly
 
 ############################################################################
 DEBIAN_FF3_TARGET   := firefox-orig
@@ -188,9 +138,7 @@ $(DEBIAN_FF3_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_FF3_FILE)
 	DEBIAN_FF3_VERSION="`cat $(DEBIAN_FF3_FILE) | sed -e 's/pre//; s/a\([0-9]*\)/~alpha\1/; s/b\([0-9]*\)/~b\1/; s/$$/~cvs'"$$DEBIAN_FF3_DATE"'/'`" ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=xulbrowser MOZ_CO_DATE="$$DEBIAN_FF3_CO_DATE" ; \
 	fi ; \
-	for EXCL in $(DEBIAN_EXCLUDE) ; do \
-	 rm -rf $$EXCL ; \
-	done ; \
+	( cd mozilla ; sh ../$(DEBIAN_EXCLUDE_SCRIPT) > REMOVED+$(NOBINONLY).txt 2>&1 ) ; \
 	rm -rf $(DEBIAN_FF3_APPNAME)-$$DEBIAN_FF3_VERSION $(DEBIAN_FF3_APPNAME)_$$DEBIAN_FF3_VERSION.orig.tar.gz && \
 	mkdir $(DEBIAN_FF3_APPNAME)-$$DEBIAN_FF3_VERSION && \
 	echo "Creating $(DEBIAN_FF3_APPNAME)-$$DEBIAN_FF3_VERSION/browser-snapshot-$$DEBIAN_FF3_DATE.tar.bz2 ..." && \
@@ -212,9 +160,7 @@ $(DEBIAN_XUL_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_XUL_FILE)
 	DEBIAN_XUL_VERSION="`tail -1 $(DEBIAN_XUL_FILE) | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'`~cvs$$DEBIAN_XUL_DATE" ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=xulrunner MOZ_CO_DATE="$$DEBIAN_XUL_CO_DATE" ; \
 	fi ; \
-	for EXCL in $(DEBIAN_EXCLUDE) ; do \
-	 rm -rf $$EXCL ; \
-	done ; \
+	( cd mozilla ; sh ../$(DEBIAN_EXCLUDE_SCRIPT) > REMOVED+$(NOBINONLY).txt 2>&1 ) ; \
 	mkdir $(DEBIAN_XUL_APPNAME)-$$DEBIAN_XUL_VERSION && \
 	mv mozilla $(DEBIAN_XUL_APPNAME)-$$DEBIAN_XUL_VERSION && \
 	rm -f $(DEBIAN_XUL_APPNAME)_$$DEBIAN_XUL_VERSION.orig.tar.gz && \
@@ -234,9 +180,7 @@ $(DEBIAN_TB_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_TB_FILE)
 	DEBIAN_TB_VERSION="`tail -1 $(DEBIAN_TB_FILE) | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'`~cvs$$DEBIAN_TB_DATE" ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=mail MOZ_CO_DATE="$$DEBIAN_TB_CO_DATE" ; \
 	fi ; \
-	for EXCL in $(DEBIAN_EXCLUDE) ; do \
-	 rm -rf $$EXCL ; \
-	done ; \
+	( cd mozilla ; sh ../$(DEBIAN_EXCLUDE_SCRIPT) > REMOVED+$(NOBINONLY).txt 2>&1 ) ; \
 	mkdir $(DEBIAN_TB_APPNAME)-$$DEBIAN_TB_VERSION && \
 	mv mozilla $(DEBIAN_TB_APPNAME)-$$DEBIAN_TB_VERSION && \
 	rm -f $(DEBIAN_TB_APPNAME)_$$DEBIAN_TB_VERSION.orig.tar.gz && \
@@ -256,7 +200,7 @@ $(DEBIAN_SM2_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_SM2_FILE)
 	DEBIAN_SM2_VERSION="`tail -1 $(DEBIAN_SM2_FILE) | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'`~cvs$$DEBIAN_SM2_DATE" ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=suite MOZ_CO_DATE="$$DEBIAN_SM2_CO_DATE" ; \
 	fi ; \
-	echo "### DONT DO EXCLUSIONS FOR NOW ###" ; \
+	( cd mozilla ; sh ../$(DEBIAN_EXCLUDE_SCRIPT) > REMOVED+$(NOBINONLY).txt 2>&1 ) ; \
 	mv mozilla $(DEBIAN_SM2_APPNAME)-$$DEBIAN_SM2_VERSION && \
 	rm -f $(DEBIAN_SM2_APPNAME)_$$DEBIAN_SM2_VERSION.orig.tar.gz && \
 	echo "Creating $(DEBIAN_SM2_APPNAME)_$$DEBIAN_SM2_VERSION.orig.tar.gz ..." && \
@@ -275,9 +219,7 @@ $(DEBIAN_NSS_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_NSS_FILE)
 	DEBIAN_NSS_VERSION="`grep -E '^\#define NSS_V(MAJOR|MINOR|PATCH)' $(DEBIAN_NSS_FILE) | awk '{print $$3}' | tr '\n' '.' | sed -e 's,\.$$,,'`~cvs$$DEBIAN_NSS_DATE" ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=nss MOZ_CO_DATE="$$DEBIAN_NSS_CO_DATE" ; \
 	fi ; \
-	for EXCL in $(DEBIAN_EXCLUDE) ; do \
-	 rm -rf $$EXCL ; \
-	done ; \
+	( cd mozilla ; sh ../$(DEBIAN_EXCLUDE_SCRIPT) > REMOVED+$(NOBINONLY).txt 2>&1 ) ; \
 	mkdir $(DEBIAN_NSS_APPNAME)-$$DEBIAN_NSS_VERSION && \
 	mv mozilla $(DEBIAN_NSS_APPNAME)-$$DEBIAN_NSS_VERSION && \
 	rm -f $(DEBIAN_NSS_APPNAME)_$$DEBIAN_NSS_VERSION.orig.tar.gz && \
@@ -297,9 +239,7 @@ $(DEBIAN_NSPR_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_NSPR_FILE)
 	DEBIAN_NSPR_VERSION="`grep -E '^MOD_(MAJOR|MINOR|PATCH)_VERSION' $(DEBIAN_NSPR_FILE) | cut -d= -f2 | tr '\n' '.' | sed -e 's,\.$$,,'`~cvs$$DEBIAN_NSPR_DATE" ; \
 	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=nspr MOZ_CO_DATE="$$DEBIAN_NSPR_CO_DATE" ; \
 	fi ; \
-	for EXCL in $(DEBIAN_EXCLUDE) ; do \
-	 rm -rf $$EXCL ; \
-	done ; \
+	( cd mozilla ; sh ../$(DEBIAN_EXCLUDE_SCRIPT) > REMOVED+$(NOBINONLY).txt 2>&1 ) ; \
 	mkdir $(DEBIAN_NSPR_APPNAME)-$$DEBIAN_NSPR_VERSION && \
 	mv mozilla $(DEBIAN_NSPR_APPNAME)-$$DEBIAN_NSPR_VERSION && \
 	rm -f $(DEBIAN_NSPR_APPNAME)_$$DEBIAN_NSPR_VERSION.orig.tar.gz && \