Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16

[civicrm-core.git] / distmaker / dists / drupal_php5.sh

diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index 151342576593f6301ad4a7718df022d7e581e941..ac2c512180148bf818626237a2fafafb5fb1225e 100755 (executable)
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 # This script assumes
 # that DAOs are generated
@@ -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
@@ -61,10 +61,17 @@ set -e
 cp $SRC/agpl-3.0.txt $TRG
 cp $SRC/gpl.txt $TRG
 cp $SRC/README.txt $TRG
-cp $SRC/Sponsors.txt $TRG
+cp $SRC/CONTRIBUTORS.txt $TRG
 cp $SRC/agpl-3.0.exception.txt $TRG
 cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php
 
+# set full version in .info files
+MODULE_DIRS=`find "$DM_SOURCEDIR/drupal" -type f -name "*.info"`
+for INFO in $MODULE_DIRS; do
+  sed -i "s/version = [1-9.]*/version = $DM_VERSION/g" $INFO
+done
+
+
 # final touch
 echo "<?php
 function civicrmVersion( ) {