distmaker - Remove dead code. Shift comments.

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index 69e9b82d9f5212a273302a0f11eef4c299075bdd..407152a8b45041b42f9668c4e507980eed8aab4d 100755 (executable)
--- a/distmaker/distmaker.sh
+++ b/distmaker/distmaker.sh
@@ -29,17 +29,6 @@ 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 packages/git-footnote"
-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/common.sh b/distmaker/dists/common.sh
index c9a0687e9e6a0008978d3a110f1e242d6917e720..3f3dec42b51cff768d9570ecb0eab442551288ae 100644 (file)
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -9,7 +9,7 @@ function dm_install_dir() {
   if [ ! -d "$to" ]; then
     mkdir -p "$to"
   fi
-  rsync -avC --exclude=.git --exclude=.svn "$from/./"  "$to/./"
+  $DM_RSYNC -avC --exclude=.git --exclude=.svn "$from/./"  "$to/./"
 }
 
 ## Copy listed files
@@ -75,8 +75,13 @@ function dm_install_packages() {
     excludes_rsync="--exclude=${exclude} ${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
+
   [ ! -d "$to" ] && mkdir "$to"
-  rsync -avC $excludes_rsync --include=core "$repo/./" "$to/./"
+  $DM_RSYNC -avC $excludes_rsync --include=core "$repo/./" "$to/./"
 }
 
 ## Copy Drupal-integration module

diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh
index 8ccec51bfbee1ab005de845005d832b6de2bc6c0..84cc6af47e554a6066d6643a788690219522db21 100755 (executable)
--- a/distmaker/dists/drupal6_php5.sh
+++ b/distmaker/dists/drupal6_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
-RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 

diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index c656c86814fd5c67c62510688a1359a392fc0c65..fcea93646603c934cf5ca7463362a22b6ec88829 100755 (executable)
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-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 b1c6ee2c6a1b2e2943957a65dbfc7c227c856b9a..de8a3b945e9cb7a5f0521763131be1cc0d1527ca 100755 (executable)
--- a/distmaker/dists/drupal_sk_php5.sh
+++ b/distmaker/dists/drupal_sk_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-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 50994a53023cde098cbef1498aaf1cfb8e07ea72..620ae6cc5505f4a009207ceec6b0ff857089a9ca 100755 (executable)
--- a/distmaker/dists/joomla_php5.sh
+++ b/distmaker/dists/joomla_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-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 6666b31baa5b14c8f53ef5a4168bc2a454df5071..7106101f53ce522e09d033615246c9f71e7fc058 100644 (file)
--- a/distmaker/dists/l10n.sh
+++ b/distmaker/dists/l10n.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-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 ddb19bf99ce863179d862beb08ae5aa834652701..628bc84fce320ae25ada0ac5300886deb9c565d5 100644 (file)
--- a/distmaker/dists/wordpress_php5.sh
+++ b/distmaker/dists/wordpress_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
-RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm