Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

distmaker - Finish migrating bower.json => composer.json #15148

Merged
merged 1 commit into from
Aug 28, 2019
Merged

distmaker - Finish migrating bower.json => composer.json #15148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions distmaker/distmaker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,10 @@ if [ -d "$DM_SOURCEDIR/drupal" ]; then
GENCODE_CMS=Drupal
fi

## Get latest dependencies
## Get fresh dependencies
[ -d "$DM_SOURCEDIR/vendor" ] && rm -rf $DM_SOURCEDIR/vendor
[ -d "$DM_SOURCEDIR/bower_components" ] && rm -rf $DM_SOURCEDIR/bower_components
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

Expand Down
13 changes: 1 addition & 12 deletions distmaker/dists/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function dm_install_core() {
done

dm_install_files "$repo" "$to" {agpl-3.0,agpl-3.0.exception,gpl,CONTRIBUTORS}.txt
dm_install_files "$repo" "$to" composer.json composer.lock bower.json package.json Civi.php README.md release-notes.md extension-compatibility.json
dm_install_files "$repo" "$to" composer.json composer.lock package.json Civi.php README.md release-notes.md extension-compatibility.json

mkdir -p "$to/sql"
pushd "$repo" >> /dev/null
Expand Down Expand Up @@ -192,17 +192,6 @@ function dm_install_wordpress() {
dm_preg_edit '/^Version: [0-9\.]+/m' "Version: $DM_VERSION" "$to/civicrm.php"
}


## Generate the "bower_components" folder.
## usage: dm_generate_bower <repo_path>
function dm_generate_bower() {
local repo="$1"
pushd "$repo"
${DM_NPM:-npm} install
${DM_NODE:-node} node_modules/bower/bin/bower install
popd
}

## Generate the composer "vendor" folder
## usage: dm_generate_vendor <repo_path>
function dm_generate_vendor() {
Expand Down