* Rework exclusion list so it applies to all tarballs

  - update Makefile

1 files changed, 50 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 50a9f8b..033eecb 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,7 @@ DEBIAN_CO_TAG     = -r $(DEBIAN_BRANCH)
 endif
 endif
 
-############################################################################
-DEBIAN_FF3_TARGET   := firefox-orig
-DEBIAN_FF3_APPNAME  := firefox-3.0
-DEBIAN_FF3_FILE     := mozilla/browser/config/version.txt
-DEBIAN_FF3_URL      := 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot'
-DEBIAN_FF3_EXCLUDE  := \
+DEBIAN_EXCLUDE  := \
 	mozilla/README/mozilla/README.os2 \
 	mozilla/browser/app/apprunner-beos.rsrc \
 	mozilla/browser/app/macbuild \
@@ -35,8 +30,7 @@ DEBIAN_FF3_EXCLUDE  := \
 	mozilla/build/wince \
 	mozilla/config/*.exe \
 	mozilla/intl/locale/src/os2 \
-	mozilla/toolkit/components/downloads/test \
-	mozilla/toolkit/components/passwordmgr/test \
+	mozilla/extensions/manticore \
 	mozilla/toolkit/crashreporter/client/macbuild \
 	mozilla/toolkit/crashreporter/google-breakpad/src/processor/testdata \
 	mozilla/toolkit/crashreporter/google-breakpad/src/tools/mac \
@@ -45,9 +39,43 @@ DEBIAN_FF3_EXCLUDE  := \
 	mozilla/toolkit/mozapps/installer/windows \
 	mozilla/toolkit/mozapps/update/src/updater/macbuild \
 	mozilla/toolkit/xre/nsNativeAppSupportOS2.* \
-	mozilla/xpinstall/test \
+	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_FF3_TARGET   := firefox-orig
+DEBIAN_FF3_APPNAME  := firefox-3.0
+DEBIAN_FF3_FILE     := mozilla/browser/config/version.txt
+DEBIAN_FF3_URL      := 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot'
+
 DEBIAN_XUL_TARGET   := xulrunner-orig
 DEBIAN_XUL_APPNAME  := xulrunner-1.9
 DEBIAN_XUL_FILE     := mozilla/config/milestone.txt
@@ -152,7 +180,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_FF3_EXCLUDE) ; do \
+	for EXCL in $(DEBIAN_EXCLUDE) ; do \
 	 rm -rf $$EXCL ; \
 	done ; \
 	rm -rf $(DEBIAN_FF3_APPNAME)-$$DEBIAN_FF3_VERSION $(DEBIAN_FF3_APPNAME)_$$DEBIAN_FF3_VERSION.orig.tar.gz && \
@@ -176,6 +204,9 @@ $(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 ; \
 	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 && \
@@ -195,6 +226,9 @@ $(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 ; \
 	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 && \
@@ -214,6 +248,9 @@ $(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 ; \
 	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 && \
@@ -233,6 +270,9 @@ $(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 ; \
 	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 && \