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

chore: set msvs version on dependencies-npm.sh when running on Windows (#943)

Browse Source 
Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
This commit is contained in:
Juan Cruz Viotti 2016-12-05 23:01:04 -04:00 committed by GitHub
parent f889a0862a
commit b63f967d44
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -98,7 +98,12 @@ APPLICATION_VERSION_DEBIAN = $(shell echo $(APPLICATION_VERSION) | tr "-" "~")
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/node_modules: package.json npm-shrinkwrap.json 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 ./scripts/unix/dependencies-npm.sh -p \
-r "$(TARGET_ARCH)" \
-v "$(ELECTRON_VERSION)" \
-x $(dir $@) \
-t electron \
-s "$(TARGET_PLATFORM)"
release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/bower_components: bower.json release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/bower_components: bower.json
./scripts/unix/dependencies-bower.sh -p -x $(dir $@) ./scripts/unix/dependencies-bower.sh -p -x $(dir $@)
@ -200,7 +205,11 @@ electron-develop:
# is defined by the `npm-shrinkwrap.json` file, and will thus # is defined by the `npm-shrinkwrap.json` file, and will thus
# refuse to do anything but install from scratch. # refuse to do anything but install from scratch.
rm -rf node_modules rm -rf node_modules
./scripts/unix/dependencies-npm.sh -r "$(TARGET_ARCH)" -v "$(ELECTRON_VERSION)" -t electron ./scripts/unix/dependencies-npm.sh \
-r "$(TARGET_ARCH)" \
-v "$(ELECTRON_VERSION)" \
-t electron \
-s "$(TARGET_PLATFORM)"
./scripts/unix/dependencies-bower.sh ./scripts/unix/dependencies-bower.sh
ifeq ($(TARGET_PLATFORM),darwin) ifeq ($(TARGET_PLATFORM),darwin)

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

@ -37,6 +37,7 @@ function usage() {
echo " -r <architecture>" echo " -r <architecture>"
echo " -v <target version>" echo " -v <target version>"
echo " -t <target platform (node|electron)>" echo " -t <target platform (node|electron)>"
echo " -s <target operating system>"
echo " -x <install prefix>" echo " -x <install prefix>"
echo " -f force install" echo " -f force install"
echo " -p production install" echo " -p production install"
@ -46,15 +47,17 @@ function usage() {
ARGV_ARCHITECTURE="" ARGV_ARCHITECTURE=""
ARGV_TARGET_VERSION="" ARGV_TARGET_VERSION=""
ARGV_TARGET_PLATFORM="" ARGV_TARGET_PLATFORM=""
ARGV_TARGET_OPERATING_SYSTEM=""
ARGV_PREFIX="" ARGV_PREFIX=""
ARGV_FORCE=false ARGV_FORCE=false
ARGV_PRODUCTION=false ARGV_PRODUCTION=false
while getopts ":r:v:t:x:fp" option; do while getopts ":r:v:t:s:x:fp" option; do
case $option in case $option in
r) ARGV_ARCHITECTURE=$OPTARG ;; r) ARGV_ARCHITECTURE=$OPTARG ;;
v) ARGV_TARGET_VERSION=$OPTARG ;; v) ARGV_TARGET_VERSION=$OPTARG ;;
t) ARGV_TARGET_PLATFORM=$OPTARG ;; t) ARGV_TARGET_PLATFORM=$OPTARG ;;
s) ARGV_TARGET_OPERATING_SYSTEM=$OPTARG ;;
x) ARGV_PREFIX=$OPTARG ;; x) ARGV_PREFIX=$OPTARG ;;
f) ARGV_FORCE=true ;; f) ARGV_FORCE=true ;;
p) ARGV_PRODUCTION=true ;; p) ARGV_PRODUCTION=true ;;
@ -64,11 +67,20 @@ done
if [ -z "$ARGV_ARCHITECTURE" ] \ if [ -z "$ARGV_ARCHITECTURE" ] \
|| [ -z "$ARGV_TARGET_VERSION" ] \ || [ -z "$ARGV_TARGET_VERSION" ] \
|| [ -z "$ARGV_TARGET_PLATFORM" ] || [ -z "$ARGV_TARGET_PLATFORM" ] \
|| [ -z "$ARGV_TARGET_OPERATING_SYSTEM" ]
then then
usage usage
fi fi
if [ "$ARGV_TARGET_OPERATING_SYSTEM" == "win32" ]; then
# We require Visual Studio 2013 specifically since newer versions
# lack command line build tools such as `lib.exe` and `cl.exe`.
export GYP_MSVS_VERSION=2013
fi
if [ "$ARGV_TARGET_PLATFORM" == "electron" ]; then if [ "$ARGV_TARGET_PLATFORM" == "electron" ]; then
# Ensure native addons are compiled with the correct headers # Ensure native addons are compiled with the correct headers