From ee7523477191ab1e291bd14daf9bccffcc29e9ac Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 5 Mar 2013 16:12:53 -0500
Subject: [PATCH] CRM-11658 - distmaker - Centralize exclude list; exclude
 various files that originated in SVN's "tools/packages"

---
 distmaker/distmaker.sh            | 11 +++++++++++
 distmaker/dists/drupal6_php5.sh   |  3 ++-
 distmaker/dists/drupal_php5.sh    |  2 +-
 distmaker/dists/drupal_sk_php5.sh |  2 +-
 distmaker/dists/joomla_php5.sh    |  2 +-
 distmaker/dists/l10n.sh           |  2 +-
 distmaker/dists/wordpress_php5.sh |  2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index a685b8695c..713912fa6e 100755
--- a/distmaker/distmaker.sh
+++ b/distmaker/distmaker.sh
@@ -29,6 +29,17 @@ P=`dirname $0`
 # Current dir
 ORIGPWD=`pwd`
 
+# List of files to exclude from all tarballs
+DM_EXCLUDES=".git .svn packages/_ORIGINAL_ packages/SeleniumRC packages/PHPUnit packages/PhpDocumentor packages/SymfonyComponents packages/amavisd-new"
+for DM_EXCLUDE in $DM_EXCLUDES ; do
+  DM_EXCLUDES_RSYNC="--exclude=${DM_EXCLUDE} ${DM_EXCLUDES_RSYNC}"
+done
+## Note: These small folders have items that previously were not published,
+## but there's no real cost to including them, and excluding them seems
+## likely to cause confusion as the codebase evolves:
+##   packages/Files packages/PHP packages/Text
+export DM_EXCLUDES DM_EXCLUDES_RSYNC
+
 # Set no actions by default
 D5PACK=0
 D56PACK=0
diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh
index 68c321e5e9..50b910c784 100755
--- a/distmaker/dists/drupal6_php5.sh
+++ b/distmaker/dists/drupal6_php5.sh
@@ -15,11 +15,12 @@ else
 	. $CFFILE
 fi
 
-RSYNCOPTIONS="-avC --exclude=svn --exclude=.git --exclude=_ORIGINAL_ --include=core"
+RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
 RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
+
 # checkout the right code revisions
 pushd "$DM_SOURCEDIR/drupal"
 git checkout "$DM_REF_DRUPAL6"
diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index 1513425765..9221c24637 100755
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -15,7 +15,7 @@ else
 	. $CFFILE
 fi
 
-RSYNCOPTIONS="-avC --exclude=svn --exclude=.git --exclude=_ORIGINAL_ --include=core"
+RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
 RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
diff --git a/distmaker/dists/drupal_sk_php5.sh b/distmaker/dists/drupal_sk_php5.sh
index 9a648c70f8..7e91fa0ce3 100755
--- a/distmaker/dists/drupal_sk_php5.sh
+++ b/distmaker/dists/drupal_sk_php5.sh
@@ -15,7 +15,7 @@ else
 	. $CFFILE
 fi
 
-RSYNCOPTIONS="-avC --exclude=svn --exclude=.git --exclude=_ORIGINAL_ --include=core"
+RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
 RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
diff --git a/distmaker/dists/joomla_php5.sh b/distmaker/dists/joomla_php5.sh
index fd727b2344..2e1afd7b18 100755
--- a/distmaker/dists/joomla_php5.sh
+++ b/distmaker/dists/joomla_php5.sh
@@ -15,7 +15,7 @@ else
 	. $CFFILE
 fi
 
-RSYNCOPTIONS="-avC --exclude=svn --exclude=.git --exclude=_ORIGINAL_ --include=core"
+RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
 RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
diff --git a/distmaker/dists/l10n.sh b/distmaker/dists/l10n.sh
index 731ef57ce9..f843b5c5b3 100644
--- a/distmaker/dists/l10n.sh
+++ b/distmaker/dists/l10n.sh
@@ -15,7 +15,7 @@ else
 	. $CFFILE
 fi
 
-RSYNCOPTIONS="-avC --exclude=svn --exclude=.git --include=core"
+RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
 RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh
index e1cc44968b..5e2cdbdbc7 100644
--- a/distmaker/dists/wordpress_php5.sh
+++ b/distmaker/dists/wordpress_php5.sh
@@ -15,7 +15,7 @@ else
 	. $CFFILE
 fi
 
-RSYNCOPTIONS="-avC --exclude=svn --exclude=.git --exclude=_ORIGINAL_ --include=core"
+RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
 RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
-- 
2.25.1