Skip to content

Commit c9eeb9b

Browse files
author
Dane Springmeyer
committed
attempt to fixup windows builds
1 parent c76d8d8 commit c9eeb9b

2 files changed

Lines changed: 4 additions & 34 deletions

File tree

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ environment:
22
matrix:
33
- nodejs_version: 4
44
platform: x64
5+
msvs_toolset: 12
56
- nodejs_version: 4
67
platform: x86
8+
msvs_toolset: 12
79
- nodejs_version: 5
810
platform: x64
911
- nodejs_version: 5

scripts/build-appveyor.bat

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ SET NODE_MAJOR=%nodejs_version:~0,1%
99
IF %NODE_MAJOR% GTR 4 ECHO detected node v5, forcing msvs_toolset 14 && SET msvs_toolset=14
1010

1111
SET PATH=%CD%;%PATH%
12-
SET msvs_version=2013
13-
IF "%msvs_toolset%"=="14" SET msvs_version=2015
12+
SET msvs_version=2015
13+
IF "%msvs_toolset%"=="12" SET msvs_version=2013
1414

1515

1616
ECHO APPVEYOR^: %APPVEYOR%
@@ -53,38 +53,6 @@ IF %NODE_MAJOR% GTR 0 ECHO node version greater than zero, not updating npm && G
5353
powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
5454
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
5555

56-
:SKIP_APPVEYOR_INSTALL
57-
IF /I "%msvs_toolset%"=="12" GOTO NODE_INSTALLED
58-
IF %NODE_MAJOR% GTR 4 GOTO NODE_INSTALLED
59-
60-
61-
::custom node for VS2015
62-
SET ARCHPATH=
63-
IF "%platform%"=="X64" (SET ARCHPATH=x64/)
64-
IF "%platform%"=="x64" (SET ARCHPATH=x64/)
65-
SET NODE_URL=https://mapbox.s3.amazonaws.com/node-cpp11/v%nodejs_version%/%ARCHPATH%node.exe
66-
ECHO downloading node^: %NODE_URL%
67-
powershell Invoke-WebRequest "${env:NODE_URL}" -OutFile node.exe
68-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
69-
70-
ECHO deleting node ...
71-
SET NODE_EXE_PRG=%ProgramFiles%\nodejs\node.exe
72-
IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, deleting... && DEL /F "%NODE_EXE_PRG%"
73-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
74-
IF EXIST "%ProgramFiles%\nodejs" ECHO copy custom node.exe to %ProgramFiles%\nodejs\ && COPY node.exe "%ProgramFiles%\nodejs\"
75-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
76-
77-
SET NODE_EXE_PRG=%ProgramFiles(x86)%\nodejs\node.exe
78-
IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, deleting... && DEL /F "%NODE_EXE_PRG%"
79-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
80-
IF EXIST "%ProgramFiles(x86)%\nodejs" ECHO copy custom node.exe to %ProgramFiles(x86)%\nodejs\ && COPY node.exe "%ProgramFiles(x86)%\nodejs\"
81-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
82-
83-
ECHO delete node.exe in current directory && DEL node.exe
84-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
85-
86-
:NODE_INSTALLED
87-
8856
ECHO available node.exe^:
8957
call where node
9058
ECHO available npm^:

0 commit comments

Comments
 (0)