X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=distmaker%2Fdistmaker.sh;h=179c54aacd731e30ddccff9ce6c87b842fd383dc;hb=a49aa7dd0f16ecff2a7d7c2d9fdb93813ae8c323;hp=6c0072eb8c42fc3d260cca502ea380467ae37cff;hpb=24f8127938dec80960d388e50fd5b89aa450b494;p=civicrm-core.git

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index 6c0072eb8c..179c54aacd 100755
--- a/distmaker/distmaker.sh
+++ b/distmaker/distmaker.sh
@@ -41,58 +41,58 @@ L10NPACK=0
 # Display usage
 display_usage()
 {
-	echo
-	echo "Usage: "
-	echo "  distmaker.sh OPTION"
-	echo
-	echo "Options available:"
-	echo "  all  - generate all available tarballs"
-	echo "  l10n - generate internationalization data"
-	echo "  d5   - generate Drupal7 PHP5 module"
-	echo "  d5.6 - generate Drupal6 PHP5 module"
-	echo "  j5   - generate Joomla PHP5 module"
-	echo "  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
+  echo
+  echo "Usage: "
+  echo "  distmaker.sh OPTION"
+  echo
+  echo "Options available:"
+  echo "  all  - generate all available tarballs"
+  echo "  l10n - generate internationalization data"
+  echo "  d5   - generate Drupal7 PHP5 module"
+  echo "  d5.6 - generate Drupal6 PHP5 module"
+  echo "  j5   - generate Joomla PHP5 module"
+  echo "  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
 }
 
 
 # Check if config is ok.
 check_conf()
 {
-	# 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;
-		display_usage
-		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;
-		fi
-		for k in "$DM_GENFILESDIR" "$DM_TARGETDIR" "$DM_TMPDIR"; do
-			if [ -z "$k" ] ; then
-				echo; echo "ERROR! " $k "directory not found!"; echo "(if you get empty directory name, it might mean that one of necessary variables is not set)"; echo;
-				exit 1
-			fi
-			if [ ! -d "$k" ]; then
-				mkdir -p "$k"
-			fi
-		done
-	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;
+    display_usage
+    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;
+    fi
+    for k in "$DM_GENFILESDIR" "$DM_TARGETDIR" "$DM_TMPDIR"; do
+      if [ -z "$k" ] ; then
+        echo; echo "ERROR! " $k "directory not found!"; echo "(if you get empty directory name, it might mean that one of necessary variables is not set)"; echo;
+        exit 1
+      fi
+      if [ ! -d "$k" ]; then
+        mkdir -p "$k"
+      fi
+    done
+  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
+  if [ ! $PHP4GENERATED = 1 ]; then
+    echo; echo "ERROR! Cannot package PHP4 version without running conversion!"; echo;
+    exit 1
+  fi
 }
 
 # Let's go.
@@ -101,58 +101,58 @@ check_conf
 
 # Figure out what to do
 case $1 in
-	# L10N PHP5
-	l10n)
-	echo; echo "Generating L10N module"; echo;
-	L10NPACK=1
-	;;
-
-	# DRUPAL7 PHP5
-	d5)
-	echo; echo "Generating Drupal7 PHP5 module"; echo;
-	D5PACK=1
-	;;
-
-	# DRUPAL7 PHP5 StarterKit package
-	sk)
-	echo; echo "Generating Drupal7 PHP5 starter kit minimal module"; echo;
-	SKPACK=1
-	;;
-
-	# DRUPAL6 PHP5
-	d5.6)
-	echo; echo "Generating Drupal6 PHP5 module"; echo;
-	D56PACK=1
-	;;
-
-	# JOOMLA PHP5
-	j5)
-	echo; echo "Generating Joomla PHP5 module"; echo;
-	J5PACK=1
-	;;
-
-	# WORDPRESS PHP5
-	wp5)
-	echo; echo "Generating Wordpress PHP5 module"; echo;
-	WP5PACK=1
-	;;
-
-	# ALL
-	all)
-	echo; echo "Generating all we've got."; echo;
-	D5PACK=1
-	D56PACK=1
-	J5PACK=1
-	WP5PACK=1
-	SKPACK=1
-	L10NPACK=1
-	;;
-
-	# USAGE
-	*)
-	display_usage
-	exit 0
-	;;
+  # L10N PHP5
+  l10n)
+  echo; echo "Generating L10N module"; echo;
+  L10NPACK=1
+  ;;
+
+  # DRUPAL7 PHP5
+  d5)
+  echo; echo "Generating Drupal7 PHP5 module"; echo;
+  D5PACK=1
+  ;;
+
+  # DRUPAL7 PHP5 StarterKit package
+  sk)
+  echo; echo "Generating Drupal7 PHP5 starter kit minimal module"; echo;
+  SKPACK=1
+  ;;
+
+  # DRUPAL6 PHP5
+  d5.6)
+  echo; echo "Generating Drupal6 PHP5 module"; echo;
+  D56PACK=1
+  ;;
+
+  # JOOMLA PHP5
+  j5)
+  echo; echo "Generating Joomla PHP5 module"; echo;
+  J5PACK=1
+  ;;
+
+  # WORDPRESS PHP5
+  wp5)
+  echo; echo "Generating Wordpress PHP5 module"; echo;
+  WP5PACK=1
+  ;;
+
+  # ALL
+  all)
+  echo; echo "Generating all we've got."; echo;
+  D5PACK=1
+  D56PACK=1
+  J5PACK=1
+  WP5PACK=1
+  SKPACK=1
+  L10NPACK=1
+  ;;
+
+  # USAGE
+  *)
+  display_usage
+  exit 0
+  ;;
 
 esac
 
@@ -163,46 +163,50 @@ dm_git_checkout "$DM_SOURCEDIR/packages" "$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
 dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
 
+## Get latest dependencies
+dm_generate_vendor "$DM_SOURCEDIR"
+dm_generate_bower "$DM_SOURCEDIR"
+
 # Before anything - regenerate DAOs
 
 cd $DM_SOURCEDIR/xml
-$DM_PHP GenCode.php schema/Schema.xml $DM_VERSION
+${DM_PHP:-php} GenCode.php schema/Schema.xml $DM_VERSION
 
 cd $ORIGPWD
 
 if [ "$L10NPACK" = 1 ]; then
-	echo; echo "Packaging for L10N"; echo;
-	bash $P/dists/l10n.sh
+  echo; echo "Packaging for L10N"; echo;
+  bash $P/dists/l10n.sh
 fi
 
 if [ "$D56PACK" = 1 ]; then
-	echo; echo "Packaging for Drupal6, PHP5 version"; echo;
-	dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL6"
-	bash $P/dists/drupal6_php5.sh
+  echo; echo "Packaging for Drupal6, PHP5 version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL6"
+  bash $P/dists/drupal6_php5.sh
 fi
 
 if [ "$D5PACK" = 1 ]; then
-	echo; echo "Packaging for Drupal7, PHP5 version"; echo;
-	dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
-	bash $P/dists/drupal_php5.sh
+  echo; echo "Packaging for Drupal7, PHP5 version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
+  bash $P/dists/drupal_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"
-	bash $P/dists/drupal_sk_php5.sh
+  echo; echo "Packaging for Drupal7, PHP5 StarterKit version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
+  bash $P/dists/drupal_sk_php5.sh
 fi
 
 if [ "$J5PACK" = 1 ]; then
-	echo; echo "Packaging for Joomla, PHP5 version"; echo;
-	dm_git_checkout "$DM_SOURCEDIR/joomla" "$DM_REF_JOOMLA"
-	bash $P/dists/joomla_php5.sh
+  echo; echo "Packaging for Joomla, PHP5 version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/joomla" "$DM_REF_JOOMLA"
+  bash $P/dists/joomla_php5.sh
 fi
 
 if [ "$WP5PACK" = 1 ]; then
-	echo; echo "Packaging for Wordpress, PHP5 version"; echo;
-	dm_git_checkout "$DM_SOURCEDIR/WordPress" "$DM_REF_WORDPRESS"
-	bash $P/dists/wordpress_php5.sh
+  echo; echo "Packaging for Wordpress, PHP5 version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/WordPress" "$DM_REF_WORDPRESS"
+  bash $P/dists/wordpress_php5.sh
 fi
 
 unset DM_SOURCEDIR DM_GENFILESDIR DM_TARGETDIR DM_TMPDIR DM_PHP DM_RSYNC DM_VERSION DM_ZIP