Skip to content

Commit 9df7d08

Browse files
committed
build: remove VS 2013 switch from vcbuild.bat
Support for Visual Studio 2013 has officially been dropped, remove the build option for that compiler. Refs: nodejs#7484 Refs: nodejs#8049
1 parent ae1fac2 commit 9df7d08

File tree

1 file changed

+5
-31
lines changed

1 file changed

+5
-31
lines changed

vcbuild.bat

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ if /i "%1"=="clean" set target=Clean&goto arg-ok
4848
if /i "%1"=="ia32" set target_arch=x86&goto arg-ok
4949
if /i "%1"=="x86" set target_arch=x86&goto arg-ok
5050
if /i "%1"=="x64" set target_arch=x64&goto arg-ok
51-
if /i "%1"=="vc2013" set target_env=vc2013&goto arg-ok
5251
if /i "%1"=="vc2015" set target_env=vc2015&goto arg-ok
5352
if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok
5453
if /i "%1"=="nobuild" set nobuild=1&goto arg-ok
@@ -128,53 +127,28 @@ call :getnodeversion || exit /b 1
128127

129128
@rem Set environment for msbuild
130129

131-
if defined target_env if "%target_env%" NEQ "vc2015" goto vc-set-2013
132130
@rem Look for Visual Studio 2015
133131
echo Looking for Visual Studio 2015
134-
if not defined VS140COMNTOOLS goto vc-set-2013
135-
if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2013
132+
if not defined VS140COMNTOOLS goto msbuild-not-found
133+
if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found
136134
echo Found Visual Studio 2015
137135
if defined msi (
138136
echo Looking for WiX installation for Visual Studio 2015...
139137
if not exist "%WIX%\SDK\VS2015" (
140138
echo Failed to find WiX install for Visual Studio 2015
141139
echo VS2015 support for WiX is only present starting at version 3.10
142-
goto vc-set-2013
140+
goto wix-not-found
143141
)
144142
)
145143
if "%VCVARS_VER%" NEQ "140" (
146144
call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat"
147145
SET VCVARS_VER=140
148146
)
149-
if not defined VCINSTALLDIR goto vc-set-2013
147+
if not defined VCINSTALLDIR goto msbuild-not-found
150148
set GYP_MSVS_VERSION=2015
151149
set PLATFORM_TOOLSET=v140
152150
goto msbuild-found
153151

154-
:vc-set-2013
155-
if defined target_env if "%target_env%" NEQ "vc2013" goto msbuild-not-found
156-
@rem Look for Visual Studio 2013
157-
echo Looking for Visual Studio 2013
158-
if not defined VS120COMNTOOLS goto msbuild-not-found
159-
if not exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found
160-
echo Found Visual Studio 2013
161-
if defined msi (
162-
echo Looking for WiX installation for Visual Studio 2013...
163-
if not exist "%WIX%\SDK\VS2013" (
164-
echo Failed to find WiX install for Visual Studio 2013
165-
echo VS2013 support for WiX is only present starting at version 3.8
166-
goto wix-not-found
167-
)
168-
)
169-
if "%VCVARS_VER%" NEQ "120" (
170-
call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat"
171-
SET VCVARS_VER=120
172-
)
173-
if not defined VCINSTALLDIR goto msbuild-not-found
174-
set GYP_MSVS_VERSION=2013
175-
set PLATFORM_TOOLSET=v120
176-
goto msbuild-found
177-
178152
:msbuild-not-found
179153
echo Failed to find Visual Studio installation.
180154
goto exit
@@ -369,7 +343,7 @@ echo Failed to create vc project files.
369343
goto exit
370344

371345
:help
372-
echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [nosign] [x86/x64] [vc2013/vc2015] [download-all] [enable-vtune]
346+
echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [nosign] [x86/x64] [vc2015] [download-all] [enable-vtune]
373347
echo Examples:
374348
echo vcbuild.bat : builds release build
375349
echo vcbuild.bat debug : builds debug build

0 commit comments

Comments
 (0)