CRM-11658 - distmaker - Centralize exclude list; exclude various files that originate...

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index a685b8695cc993967321f2af9d150672d1db38d1..713912fa6e3e466a8a9039df96ec69a8e23eeb9b 100755 (executable)
--- 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 68c321e5e9f98105c47c7db1fb1b53259c601ded..50b910c78417d219ca937ba1dbe73bcc767d723d 100755 (executable)
--- 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 151342576593f6301ad4a7718df022d7e581e941..9221c246372aa0bb6d9be5e862a5c1b1fbc1c467 100755 (executable)
--- 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 9a648c70f85ba737e81389244855c2d3711cfdd6..7e91fa0ce33fa2715783af23d48fca0b9e50957f 100755 (executable)
--- 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 fd727b23441729e8920770cf0701bce2bfc47352..2e1afd7b182b07d72c6d24c4f368371e493c8547 100755 (executable)
--- 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 731ef57ce911e22e61b174235d397d13b8ed6aef..f843b5c5b322386537f91b594247cdac84e51ecc 100644 (file)
--- 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 e1cc44968bf28ae6ae3e02ea7a10ec219cbeb8eb..5e2cdbdbc760cfe7f919aba32c1e9a3529feb305 100644 (file)
--- 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