@@ -47,7 +47,6 @@ if /i "%1"=="clean" set target=Clean&goto arg-ok
4747if /i " %1 " == " ia32" set target_arch = x86& goto arg-ok
4848if /i " %1 " == " x86" set target_arch = x86& goto arg-ok
4949if /i " %1 " == " x64" set target_arch = x64& goto arg-ok
50- if /i " %1 " == " vc2013" set target_env = vc2013& goto arg-ok
5150if /i " %1 " == " vc2015" set target_env = vc2015& goto arg-ok
5251if /i " %1 " == " noprojgen" set noprojgen = 1& goto arg-ok
5352if /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
133132
134133@ rem Set environment for msbuild
135134
136- if defined target_env if " %target_env% " NEQ " vc2015" goto vc-set-2013
137135@ rem Look for Visual Studio 2015
138136echo 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
141139echo Found Visual Studio 2015
142140if defined msi (
143141 echo Looking for WiX installation for Visual Studio 2015...
144142 if not exist " %WIX% \SDK\VS2015" (
145143 echo Failed to find WiX install for Visual Studio 2015
146144 echo VS2015 support for WiX is only present starting at version 3.10
147- goto vc-set-2013
145+ goto wix-not-found
148146 )
149147)
150148if " %VCVARS_VER% " NEQ " 140" (
151149 call " %VS140COMNTOOLS% \..\..\vc\vcvarsall.bat"
152150 SET VCVARS_VER = 140
153151)
154- if not defined VCINSTALLDIR goto vc-set-2013
152+ if not defined VCINSTALLDIR goto msbuild-not-found
155153set GYP_MSVS_VERSION = 2015
156154set PLATFORM_TOOLSET = v140
157155goto msbuild-found
158156
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-
183157:msbuild-not-found
184158echo Failed to find Visual Studio installation.
185159goto exit
@@ -388,7 +362,7 @@ echo Failed to create vc project files.
388362goto exit
389363
390364: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]
392366echo Examples:
393367echo vcbuild.bat : builds release build
394368echo vcbuild.bat debug : builds debug build
0 commit comments