Fix electron artifact builds

pull/8601/head
murgatroid99 8 years ago
parent e8b1fd0cba
commit b19ac96487
  1. 2
      binding.gyp
  2. 2
      templates/binding.gyp.template
  3. 2
      tools/run_tests/artifacts/build_artifact_node.bat
  4. 4
      tools/run_tests/artifacts/build_artifact_node.sh

@ -54,7 +54,7 @@
'GRPC_UV' 'GRPC_UV'
] ]
}], }],
['runtime=="electron"', { ['OS!="win" && runtime=="electron"', {
"defines": [ "defines": [
'OPENSSL_NO_THREADS' 'OPENSSL_NO_THREADS'
] ]

@ -56,7 +56,7 @@
'GRPC_UV' 'GRPC_UV'
] ]
}], }],
['runtime=="electron"', { ['OS!="win" && runtime=="electron"', {
"defines": [ "defines": [
'OPENSSL_NO_THREADS' 'OPENSSL_NO_THREADS'
] ]

@ -51,7 +51,7 @@ for %%v in (%node_versions%) do (
) )
for %%v in (%electron_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 xcopy /Y /I /S build\stage\* artifacts\ || goto :error
) )

@ -52,8 +52,8 @@ do
cp -r build/stage/* artifacts/ cp -r build/stage/* artifacts/
done done
for version in ${node_versions[@]} for version in ${electron_versions[@]}
do 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/ cp -r build/stage/* artifacts/
done done

Loading…
Cancel
Save