Merge pull request #9510 from colemanw/CRM-19709-b

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

diff --git a/distmaker/dists/drupal_sk_php5.sh b/distmaker/dists/drupal_sk_php5.sh
index f52f282f3c24974c102ea15a0ada1745d26c0b40..6c55a71335682620fd2e9903dd876b86ef89b1e0 100755 (executable)
--- a/distmaker/dists/drupal_sk_php5.sh
+++ b/distmaker/dists/drupal_sk_php5.sh
@@ -1,44 +1,28 @@
 #!/bin/bash
 set -ex
 
-# This script assumes
-# that DAOs are generated
-# and all the necessary conversions had place!
-
 P=`dirname $0`
 CFFILE=$P/../distmaker.conf
-
 if [ ! -f $CFFILE ] ; then
        echo "NO DISTMAKER.CONF FILE!"
        exit 1
 else
        . $CFFILE
 fi
-
 . "$P/common.sh"
 
-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_DRUPAL"
-popd
-
-# make sure and clean up before
-if [ -d $TRG ] ; then
-       rm -rf $TRG/*
-fi
-
 # copy all the stuff
+dm_reset_dirs "$TRG"
+cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php
+dm_generate_version "$TRG/civicrm-version.php" Drupal
 dm_install_core "$SRC" "$TRG"
 dm_install_packages "$SRC/packages" "$TRG/packages"
-for CODE in drupal; do
-  echo $CODE
-  [ -d $SRC/$CODE ] && $RSYNCCOMMAND $SRC/$CODE $TRG
-done
+dm_install_vendor "$SRC/vendor" "$TRG/vendor"
+dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
+dm_install_drupal "$SRC/drupal" "$TRG/drupal"
 
 # delete packages that distributions on Drupal.org repalce if present
 # also delete stuff that we dont really use and should not be included
@@ -47,20 +31,6 @@ rm -rf $TRG/packages/IDS
 rm -rf $TRG/packages/jquery
 rm -rf $TRG/packages/ckeditor
 rm -rf $TRG/packages/tinymce
-rm -rf $TRG/joomla
-rm -rf $TRG/WordPress
-
-# copy docs
-cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php
-
-# final touch
-echo "<?php
-function civicrmVersion( ) {
-  return array( 'version'  => '$DM_VERSION',
-                'cms'      => 'Drupal',
-                'revision' => '$DM_REVISION' );
-}
-" > $TRG/civicrm-version.php
 
 # gen tarball
 cd $TRG/..