diff options
| -rw-r--r-- | binding.gyp | 2 | ||||
| -rw-r--r-- | templates/binding.gyp.template | 2 | ||||
| -rw-r--r-- | tools/run_tests/artifacts/build_artifact_node.bat | 2 | ||||
| -rwxr-xr-x | tools/run_tests/artifacts/build_artifact_node.sh | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/binding.gyp b/binding.gyp index fd48da875a..d9461dbe00 100644 --- a/binding.gyp +++ b/binding.gyp @@ -54,7 +54,7 @@ 'GRPC_UV' ] }], - ['runtime=="electron"', { + ['OS!="win" && runtime=="electron"', { "defines": [ 'OPENSSL_NO_THREADS' ] diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template index 7570aa5e7e..b0585475ec 100644 --- a/templates/binding.gyp.template +++ b/templates/binding.gyp.template @@ -56,7 +56,7 @@ 'GRPC_UV' ] }], - ['runtime=="electron"', { + ['OS!="win" && runtime=="electron"', { "defines": [ 'OPENSSL_NO_THREADS' ] diff --git a/tools/run_tests/artifacts/build_artifact_node.bat b/tools/run_tests/artifacts/build_artifact_node.bat index f1a5b8aaaf..0a2bc4b9d7 100644 --- a/tools/run_tests/artifacts/build_artifact_node.bat +++ b/tools/run_tests/artifacts/build_artifact_node.bat @@ -51,7 +51,7 @@ for %%v in (%node_versions%) do ( ) for %%v in (%electron_versions%) do ( - call .\node_modules\.bin\node-pre-gyp.cmd configure rebuild package testpackage --runtime=electron --target=%%v --target_arch=%1 || goto :error + cmd /V /C "set "HOME=%HOMEDRIVE%%HOMEPATH%\electron-gyp" && call .\node_modules\.bin\node-pre-gyp.cmd configure rebuild package testpackage --runtime=electron --target=%%v --target_arch=%1 --disturl=https://atom.io/download/electron" || goto :error xcopy /Y /I /S build\stage\* artifacts\ || goto :error ) diff --git a/tools/run_tests/artifacts/build_artifact_node.sh b/tools/run_tests/artifacts/build_artifact_node.sh index bb662d25d4..47b1f339fb 100755 --- a/tools/run_tests/artifacts/build_artifact_node.sh +++ b/tools/run_tests/artifacts/build_artifact_node.sh @@ -52,8 +52,8 @@ do cp -r build/stage/* artifacts/ done -for version in ${node_versions[@]} +for version in ${electron_versions[@]} do - HOME=~/.electron-gyp ./node_modules/.bin/node-pre-gyp configure rebuild package testpackage --runtime=electron --target=$version --target_arch=$NODE_TARGET_ARCH + HOME=~/.electron-gyp ./node_modules/.bin/node-pre-gyp configure rebuild package testpackage --runtime=electron --target=$version --target_arch=$NODE_TARGET_ARCH --disturl=https://atom.io/download/electron cp -r build/stage/* artifacts/ done |