@@ -47,7 +47,6 @@ if /i "%1"=="clean" set target=Clean&goto arg-ok
47
47
if /i " %1 " == " ia32" set target_arch = x86& goto arg-ok
48
48
if /i " %1 " == " x86" set target_arch = x86& goto arg-ok
49
49
if /i " %1 " == " x64" set target_arch = x64& goto arg-ok
50
- if /i " %1 " == " vc2013" set target_env = vc2013& goto arg-ok
51
50
if /i " %1 " == " vc2015" set target_env = vc2015& goto arg-ok
52
51
if /i " %1 " == " noprojgen" set noprojgen = 1& goto arg-ok
53
52
if /i " %1 " == " nobuild" set nobuild = 1& goto arg-ok
@@ -133,53 +132,28 @@ if defined noprojgen if defined nobuild if defined nosign if not defined msi got
133
132
134
133
@ rem Set environment for msbuild
135
134
136
- if defined target_env if " %target_env% " NEQ " vc2015" goto vc-set-2013
137
135
@ rem Look for Visual Studio 2015
138
136
echo Looking for Visual Studio 2015
139
- if not defined VS140COMNTOOLS goto vc-set-2013
140
- if not exist " %VS140COMNTOOLS% \..\..\vc\vcvarsall.bat" goto vc-set-2013
137
+ if not defined VS140COMNTOOLS goto msbuild-not-found
138
+ if not exist " %VS140COMNTOOLS% \..\..\vc\vcvarsall.bat" goto msbuild-not-found
141
139
echo Found Visual Studio 2015
142
140
if defined msi (
143
141
echo Looking for WiX installation for Visual Studio 2015...
144
142
if not exist " %WIX% \SDK\VS2015" (
145
143
echo Failed to find WiX install for Visual Studio 2015
146
144
echo VS2015 support for WiX is only present starting at version 3.10
147
- goto vc-set-2013
145
+ goto wix-not-found
148
146
)
149
147
)
150
148
if " %VCVARS_VER% " NEQ " 140" (
151
149
call " %VS140COMNTOOLS% \..\..\vc\vcvarsall.bat"
152
150
SET VCVARS_VER = 140
153
151
)
154
- if not defined VCINSTALLDIR goto vc-set-2013
152
+ if not defined VCINSTALLDIR goto msbuild-not-found
155
153
set GYP_MSVS_VERSION = 2015
156
154
set PLATFORM_TOOLSET = v140
157
155
goto msbuild-found
158
156
159
- :vc-set-2013
160
- if defined target_env if " %target_env% " NEQ " vc2013" goto msbuild-not-found
161
- @ rem Look for Visual Studio 2013
162
- echo Looking for Visual Studio 2013
163
- if not defined VS120COMNTOOLS goto msbuild-not-found
164
- if not exist " %VS120COMNTOOLS% \..\..\vc\vcvarsall.bat" goto msbuild-not-found
165
- echo Found Visual Studio 2013
166
- if defined msi (
167
- echo Looking for WiX installation for Visual Studio 2013...
168
- if not exist " %WIX% \SDK\VS2013" (
169
- echo Failed to find WiX install for Visual Studio 2013
170
- echo VS2013 support for WiX is only present starting at version 3.8
171
- goto wix-not-found
172
- )
173
- )
174
- if " %VCVARS_VER% " NEQ " 120" (
175
- call " %VS120COMNTOOLS% \..\..\vc\vcvarsall.bat"
176
- SET VCVARS_VER = 120
177
- )
178
- if not defined VCINSTALLDIR goto msbuild-not-found
179
- set GYP_MSVS_VERSION = 2013
180
- set PLATFORM_TOOLSET = v120
181
- goto msbuild-found
182
-
183
157
:msbuild-not-found
184
158
echo Failed to find Visual Studio installation.
185
159
goto exit
@@ -388,7 +362,7 @@ echo Failed to create vc project files.
388
362
goto exit
389
363
390
364
:help
391
- echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-inspector/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]
365
+ echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-inspector/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]
392
366
echo Examples:
393
367
echo vcbuild.bat : builds release build
394
368
echo vcbuild.bat debug : builds debug build
0 commit comments