fixed generated data for CRM-15934

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

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index fea13e5c9072d84ff5773530b2d99afaba2589f5..179c54aacd731e30ddccff9ce6c87b842fd383dc 100755 (executable)
--- a/distmaker/distmaker.sh
+++ b/distmaker/distmaker.sh
@@ -156,9 +156,6 @@ case $1 in
 
 esac
 
-## Install npm packages
-dm_npm_install "$DM_SOURCEDIR"
-
 ## 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"
@@ -166,10 +163,14 @@ 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