X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=distmaker%2Fdistmaker.sh;h=5471d6ae0dc8fe16524455c3a5a355ee11279746;hb=09a0e7ae4af2cf7160e630659b99ffdcb281a03d;hp=637e120e7a488399a78dc2647225a47cb5961abe;hpb=e1deb4df7d47f5b546215eeb484223607bade976;p=civicrm-core.git diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh index 637e120e7a..5471d6ae0d 100755 --- a/distmaker/distmaker.sh +++ b/distmaker/distmaker.sh @@ -6,13 +6,17 @@ set -e # "Protected by an electric fence and copyright control." # Thanks to Kleptones for moral support when writing this. -# Make sure that you have distmaker.conf file -# in the same directory containing following lines: +# You need to ensure the following variables are defined. They are traditionally defined +# in distmaker.conf but you can also defined them as an environment variable or by +# calling the script with env DM_REF_CORE=4.7 (for example). # # DM_SOURCEDIR=/home/user/svn/civicrm <- sources # DM_GENFILESDIR=/home/user/generated <- generated files # DM_TMPDIR=/tmp <- temporary files (will be deleted afterwards) # DM_TARGETDIR=/tmp/outdir <- target dir for tarballs +# DM_REF_CORE=master <- Git branch/tag name +# +# Optional variables # DM_PHP=/opt/php5/bin/php <- php5 binary # DM_RSYNC=/usr/bin/rsync <- rsync binary # DM_VERSION=trunk.r1234 <- what the version number should be @@ -34,10 +38,12 @@ source "$P/dists/common.sh" BPACK=0 D5PACK=0 D56PACK=0 +D7DIR=0 J5PACK=0 WP5PACK=0 SK5PACK=0 L10NPACK=0 +REPOREPORT=0 # Display usage display_usage() @@ -52,26 +58,71 @@ display_usage() echo " Backdrop - generate Backdrop PHP5 module" echo " Drupal|d5 - generate Drupal7 PHP5 module" echo " Drupal6|d5.6 - generate Drupal6 PHP5 module" + echo " d7_dir - generate Drupal7 PHP5 module, but output to a directory, no tarball" echo " Joomla|j5 - generate Joomla PHP5 module" echo " WordPress|wp5 - generate Wordpress PHP5 module" echo " sk - generate Drupal StarterKit module" echo echo "You also need to have distmaker.conf file in place." echo "See distmaker.conf.dist for example contents." + echo "Alternatively you can set the required variables as " + echo "environment variables, eg. for your machine or by calling " + echo "this script using " + echo + echo "env DM_TARGETDIR=/path/to/output/dir/for/files/or/tarball distmaker.sh all" + echo + echo "optional environmentals:" + echo " DM_SOURCEDIR " + echo " DM_GENFILESDIR (default $TMPDIR/genfiles)" + echo " DM_TARGETDIR= (default $TMPDIR/civicrm)" + echo " DM_OUTPUTDIR= (default $DM_TARGETDIR/civicrm_files)" echo + } +THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"; # Check if config is ok. check_conf() { + if [ -f $P/distmaker.conf ] ; then + source "$P/distmaker.conf" + fi + + if [ -z $DM_SOURCEDIR ] ; then + DM_SOURCEDIR="$THIS_DIR/.."; + echo "Setting source dir to $DM_SOURCEDIR"; + fi + + if [ -z $DM_TMPDIR ] && [ -e $TMPDIR ] ; then + DM_TMPDIR=$TMPDIR/civicrm + fi + + if [ -z $DM_GENFILESDIR ] && [ -e $TMPDIR ] ; then + DM_GENFILESDIR=$TMPDIR/genfiles + fi + + if [ -z $DM_PACKAGESDIR ] ; then + DM_PACKAGESDIR="$DM_SOURCEDIR/packages" + fi + + if [ -z $DM_OUTPUTDIR ] ; then + DM_OUTPUTDIR="$DM_TARGETDIR/civicrm_files" + fi + # Test for distmaker.conf file availability, cannot proceed without it anyway - if [ ! -f $P/distmaker.conf ] ; then - echo; echo "ERROR! No distmaker.conf file available!"; echo; + if [ -z $DM_GENFILESDIR ] || [ -z $DM_TMPDIR ] || [ -z $DM_TARGETDIR ]; then + echo; echo "Required variables not defined!"; echo; display_usage + echo "your variables" + echo "DM_SOURCEDIR : $DM_SOURCEDIR"; + echo "DM_TARGETDIR : $DM_TARGETDIR (required)"; + echo "DM_TMPDIR : $DM_TMPDIR"; + echo "DM_GENFILESDIR : $DM_GENFILESDIR"; + echo "DM_PACKAGESDIR : $DM_PACKAGESDIR"; + echo "Current directory is : $THIS_DIR"; exit 1 else - source "$P/distmaker.conf" export DM_SOURCEDIR DM_GENFILESDIR DM_TMPDIR DM_TARGETDIR DM_PHP DM_RSYNC DM_ZIP DM_VERSION DM_REF_CORE DM_REF_DRUPAL DM_REF_DRUPAL6 DM_REF_JOOMLA DM_REF_WORDPRESS DM_REF_PACKAGES if [ ! -d "$DM_SOURCEDIR" ]; then echo; echo "ERROR! " DM_SOURCEDIR "directory not found!"; echo "(if you get empty directory name, it might mean that one of necessary variables is not set)"; echo; @@ -88,15 +139,6 @@ check_conf() fi } -# Check if PHP4 converstion happened -check_php4() -{ - if [ ! $PHP4GENERATED = 1 ]; then - echo; echo "ERROR! Cannot package PHP4 version without running conversion!"; echo; - exit 1 - fi -} - # Let's go. check_conf @@ -121,6 +163,12 @@ case $1 in D5PACK=1 ;; + # Drupal 7 - Output to directory + d7_dir) + echo; echo "Generating Drupal7 Directory"; echo; + D7DIR=1 + ;; + # DRUPAL7 PHP5 StarterKit package sk) echo; echo "Generating Drupal7 PHP5 starter kit minimal module"; echo; @@ -145,9 +193,15 @@ case $1 in WP5PACK=1 ;; + # REPO REPORT PHP5 + report) + echo; echo "Generating repo report module"; echo; + REPOREPORT=1 + ;; + # ALL all) - echo; echo "Generating all we've got."; echo; + echo; echo "Generating all the tarballs we've got (not the directories). "; echo; BPACK=1 D5PACK=1 D56PACK=1 @@ -155,6 +209,7 @@ case $1 in WP5PACK=1 SKPACK=1 L10NPACK=1 + REPOREPORT=1 ;; # USAGE @@ -167,7 +222,7 @@ esac ## Make sure we have the right branch or tag dm_git_checkout "$DM_SOURCEDIR" "$DM_REF_CORE" -dm_git_checkout "$DM_SOURCEDIR/packages" "$DM_REF_PACKAGES" +dm_git_checkout "$DM_PACKAGESDIR" "$DM_REF_PACKAGES" ## in theory, this shouldn't matter, but GenCode is CMS-dependent, and we've been doing our past builds based on D7 GENCODE_CMS= @@ -182,6 +237,10 @@ fi ## Get latest dependencies dm_generate_vendor "$DM_SOURCEDIR" +## if we already have a bower_compoents dir empty it. +if [ -d "$DM_SOURCEDIR/bower_components" ]; then + rm -rf $DM_SOURCEDIR/bower_components/* +fi dm_generate_bower "$DM_SOURCEDIR" # Before anything - regenerate DAOs @@ -214,6 +273,12 @@ if [ "$D5PACK" = 1 ]; then bash $P/dists/drupal_php5.sh fi +if [ "$D7DIR" = 1 ]; then + echo; echo "Packaging for Drupal7, Directory not tarball, PHP5 version"; echo; + dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL" + bash $P/dists/drupal7_dir_php5.sh +fi + if [ "$SKPACK" = 1 ]; then echo; echo "Packaging for Drupal7, PHP5 StarterKit version"; echo; dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL" @@ -232,5 +297,19 @@ if [ "$WP5PACK" = 1 ]; then bash $P/dists/wordpress_php5.sh fi +if [ "$REPOREPORT" = 1 ]; then + echo; echo "Preparing repository report"; echo; + env \ + L10NPACK="$L10NPACK" \ + BPACK="$BPACK" \ + D56PACK="$D56PACK" \ + D5PACK="$D5PACK" \ + D7DIR="$D7DIR" \ + SKPACK="$SKPACK" \ + J5PACK="$J5PACK" \ + WP5PACK="$WP5PACK" \ + bash $P/dists/repo-report.sh +fi + unset DM_SOURCEDIR DM_GENFILESDIR DM_TARGETDIR DM_TMPDIR DM_PHP DM_RSYNC DM_VERSION DM_ZIP echo;echo "DISTMAKER Done.";echo;