appveyor build cleanup

scripts/build-appveyor.bat

@@ -4,15 +4,12 @@ SET EL=0
 
 ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-IF /I "%msvs_toolset%"=="" ECHO msvs_toolset unset, defaulting to 12 && SET msvs_toolset=12
-SET NODE_MAJOR=%nodejs_version:~0,1%
-IF %NODE_MAJOR% GTR 4 ECHO detected node v5, forcing msvs_toolset 14 && SET msvs_toolset=14
+IF /I "%msvs_toolset%"=="" ECHO msvs_toolset unset, defaulting to 14 && SET msvs_toolset=14
+IF /I "%msvs_version%"=="" ECHO msvs_version unset, defaulting to 2015 && SET msvs_version=2015
 
 SET PATH=%CD%;%PATH%
-SET msvs_version=2015
 IF "%msvs_toolset%"=="12" SET msvs_version=2013
 
-
 ECHO APPVEYOR^: %APPVEYOR%
 ECHO nodejs_version^: %nodejs_version%
 ECHO platform^: %platform%
@@ -20,7 +17,6 @@ ECHO msvs_toolset^: %msvs_toolset%
 ECHO msvs_version^: %msvs_version%
 ECHO TOOLSET_ARGS^: %TOOLSET_ARGS%
 
-
 ECHO activating VS command prompt
 :: NOTE this call makes the x64 -> X64
 IF /I "%platform%"=="x64" ECHO x64 && CALL "C:\Program Files (x86)\Microsoft Visual Studio %msvs_toolset%.0\VC\vcvarsall.bat" amd64
@@ -33,23 +29,11 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO using MSBuild^: && CALL msbuild /version && ECHO.
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-
 ECHO downloading/installing node
-::only use Install-Product when using VS2013
-::IF /I "%APPVEYOR%"=="True" IF /I "%msvs_toolset%"=="12" powershell Install-Product node $env:nodejs_version $env:Platform
-::TESTING:
-::always install (get npm matching node), but delete installed programfiles node.exe afterwards for VS2015 (using custom node.exe)
-IF /I "%APPVEYOR%"=="True" GOTO APPVEYOR_INSTALL
-GOTO SKIP_APPVEYOR_INSTALL
-
-:APPVEYOR_INSTALL
 IF /I "%platform%"=="x64" powershell Install-Product node $env:nodejs_version x64
 IF /I "%platform%"=="x86" powershell Install-Product node $env:nodejs_version x86
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-ECHO node major version^: %NODE_MAJOR%
-IF %NODE_MAJOR% GTR 0 ECHO node version greater than zero, not updating npm && GOTO SKIP_APPVEYOR_INSTALL
-
 powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
@@ -82,9 +66,6 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 IF /I "%NPM_BIN_DIR%"=="%CD%" ECHO ERROR npm bin -g equals local directory && SET ERRORLEVEL=1 && GOTO ERROR
 ECHO ===== where npm puts stuff END ============
 
-
-IF "%nodejs_version:~0,1%"=="0" CALL npm install https://github.com/springmeyer/node-gyp/tarball/v3.x
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 IF "%nodejs_version:~0,1%"=="4" CALL npm install node-gyp@3.x
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 IF "%nodejs_version:~0,1%"=="5" CALL npm install node-gyp@3.x
@@ -113,10 +94,6 @@ CALL npm test
 ECHO ==========================================
 ECHO ==========================================
 ECHO ==========================================
-ECHO using iojs, not checking test result!!!!!!!!!
-ECHO ==========================================
-ECHO ==========================================
-ECHO ==========================================
 
 GOTO NPM_TEST_FINISHED