jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-18 00:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: reuse npm/bower dependencies across builds (#923)

Browse Source 
Currently, we create a "resources app" and install dependencies on it.
This means that to create another "resources app", the whole dependency
installation process needs to be repeated.

As a solution, we cache dependencies at
`release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/` and
copy them to the resources apps as we need them.

This has the additional benefit that the resources app depends on the
dependencies rather than the other way around (dependencies depend on
the resources app), which didn't feel right.

In order to accomodate to these changes, the dependencies scripts are
now in charge of taking their corresponding manifests with them when the
prefix option is passed, given that neither `npm` nor `bower` allow to
customise the output location.

Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
This commit is contained in:
Juan Cruz Viotti 2016-12-01 19:52:07 -04:00 committed by GitHub
parent 2b7f36a3c7
commit 832bfad9d1
4 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -88,21 +88,22 @@ APPLICATION_VERSION_DEBIAN = $(shell echo $(APPLICATION_VERSION) | tr "-" "~")
# Rules # Rules
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app: release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/node_modules: package.json npm-shrinkwrap.json
./scripts/unix/dependencies-npm.sh -p -r "$(TARGET_ARCH)" -v "$(ELECTRON_VERSION)" -x $(dir $@) -t electron
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/bower_components: bower.json
./scripts/unix/dependencies-bower.sh -p -x $(dir $@)
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app: \
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/node_modules \
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/bower_components
./scripts/unix/electron-create-resources-app.sh -s . -f "$(APPLICATION_FILES)" -o $@ ./scripts/unix/electron-create-resources-app.sh -s . -f "$(APPLICATION_FILES)" -o $@
for prerequisite in $^; do \
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app/node_modules:\ cp -rf $$prerequisite $@; \
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app done
./scripts/unix/dependencies-npm.sh -p -r "$(TARGET_ARCH)" -v "$(ELECTRON_VERSION)" -x $< -t electron
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app/bower_components:\
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app
./scripts/unix/dependencies-bower.sh -p -x $<
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app.asar: \ release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app.asar: \
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app \ release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app/node_modules \
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app/bower_components
./scripts/unix/electron-create-asar.sh -d $< -o $@ ./scripts/unix/electron-create-asar.sh -d $< -o $@
release/$(APPLICATION_NAME)-$(TARGET_PLATFORM)-$(TARGET_ARCH): \ release/$(APPLICATION_NAME)-$(TARGET_PLATFORM)-$(TARGET_ARCH): \

2
scripts/unix/dependencies-bower.sh
View File

@ -56,8 +56,10 @@ if [ "$ARGV_PRODUCTION" == "true" ]; then
fi fi
if [ -n "$ARGV_PREFIX" ]; then if [ -n "$ARGV_PREFIX" ]; then
cp "$PWD/bower.json" "$ARGV_PREFIX"
pushd "$ARGV_PREFIX" pushd "$ARGV_PREFIX"
bower install $INSTALL_OPTS bower install $INSTALL_OPTS
rm bower.json
popd popd
else else
bower install $INSTALL_OPTS bower install $INSTALL_OPTS

14
scripts/unix/dependencies-npm.sh
View File

@ -97,12 +97,24 @@ if [ "$ARGV_PRODUCTION" == "true" ]; then
fi fi
if [ -n "$ARGV_PREFIX" ]; then if [ -n "$ARGV_PREFIX" ]; then
mkdir -p "$ARGV_PREFIX"
INSTALL_OPTS="$INSTALL_OPTS --prefix=$ARGV_PREFIX" INSTALL_OPTS="$INSTALL_OPTS --prefix=$ARGV_PREFIX"
cp "$PWD/package.json" "$ARGV_PREFIX"
if [ -f "$PWD/npm-shrinkwrap.json" ]; then
cp "$PWD/npm-shrinkwrap.json" "$ARGV_PREFIX"
fi
fi fi
npm install $INSTALL_OPTS npm install $INSTALL_OPTS
if [ -n "$ARGV_PREFIX" ]; then
rm -f "$ARGV_PREFIX/package.json"
rm -f "$ARGV_PREFIX/npm-shrinkwrap.json"
# Using `--prefix` might cause npm to create an empty `etc` directory # Using `--prefix` might cause npm to create an empty `etc` directory
if [ -n "$ARGV_PREFIX" ] && [ ! "$(ls -A "$ARGV_PREFIX/etc")" ]; then if [ ! "$(ls -A "$ARGV_PREFIX/etc")" ]; then
rm -rf "$ARGV_PREFIX/etc" rm -rf "$ARGV_PREFIX/etc"
fi fi
fi

12
scripts/unix/electron-create-resources-app.sh
View File

@ -51,17 +51,7 @@ fi
mkdir -p "$ARGV_OUTPUT" mkdir -p "$ARGV_OUTPUT"
function copy_file_if_it_exists() { cp "$ARGV_SOURCE_DIRECTORY/package.json" "$ARGV_OUTPUT"
local file=$1
if [ -f "$ARGV_SOURCE_DIRECTORY/$file" ]; then
cp "$ARGV_SOURCE_DIRECTORY/$file" "$ARGV_OUTPUT"
fi
}
copy_file_if_it_exists "package.json"
copy_file_if_it_exists "npm-shrinkwrap.json"
copy_file_if_it_exists "bower.json"
for file in $(echo "$ARGV_FILES" | sed "s/,/ /g"); do for file in $(echo "$ARGV_FILES" | sed "s/,/ /g"); do
cp -rf "$file" "$ARGV_OUTPUT" cp -rf "$file" "$ARGV_OUTPUT"