Merge pull request #1262 from murgatroid99/windows_build_one_script_fix

Use correct environment variables in new windows build script
This commit is contained in:
Michael Lumish 2020-02-11 16:36:56 -08:00 committed by GitHub
commit b68ffb20c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -45,13 +45,13 @@ if "%RUNTIME%"=="electron" (
set "npm_config_disturl=https://atom.io/download/electron"
)
call .\node_modules\.bin\node-pre-gyp.cmd configure build --target=%%v --target_arch=%%a && goto :EOF
call .\node_modules\.bin\node-pre-gyp.cmd configure build --target=%VERSION% --target_arch=%ARCH% && goto :EOF
@rem Try again after removing openssl headers
rmdir "%USERPROFILE%\.node-gyp\%%v\include\node\openssl" /S /Q
rmdir "%USERPROFILE%\.node-gyp\iojs-%%v\include\node\openssl" /S /Q
rmdir "%USERPROFILE%\AppData\Local\node-gyp\cache\%%v\include\node\openssl" /S /Q
rmdir "%USERPROFILE%\AppData\Local\node-gyp\cache\iojs-%%v\include\node\openssl" /S /Q
call .\node_modules\.bin\node-pre-gyp.cmd build package --target=%%v --target_arch=%%a || goto :error
rmdir "%USERPROFILE%\.node-gyp\%VERSION%\include\node\openssl" /S /Q
rmdir "%USERPROFILE%\.node-gyp\iojs-%VERSION%\include\node\openssl" /S /Q
rmdir "%USERPROFILE%\AppData\Local\node-gyp\cache\%VERSION%\include\node\openssl" /S /Q
rmdir "%USERPROFILE%\AppData\Local\node-gyp\cache\iojs-%VERSION%\include\node\openssl" /S /Q
call .\node_modules\.bin\node-pre-gyp.cmd build package --target=%VERSION% --target_arch=%ARCH% || goto :error
xcopy /Y /I /S build\stage\* %ARTIFACTS_OUT%\ || goto :error