Skip to content

Commit 84012c9

Browse files
committed
build: fix vcbuild merge issues
configure was getting called twice. We also erroneously introduced support for VS2010, and were picking 2010 before other versions. PR-URL: #2131 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
1 parent 59f6b5d commit 84012c9

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

vcbuild.bat

-12
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,6 @@ if "%i18n_arg%"=="intl-none" set i18n_arg=--with-intl=none
8787
call :getnodeversion || exit /b 1
8888

8989
@rem Set environment for msbuild
90-
:project-gen
91-
@rem Skip project generation if requested.
92-
if defined noprojgen goto msbuild
93-
94-
@rem Generate the VS project.
95-
SETLOCAL
96-
if defined VS100COMNTOOLS call "%VS100COMNTOOLS%\VCVarsQueryRegistry.bat"
97-
python configure %download_arg% %i18n_arg% %debug_arg% %snapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG%
98-
if errorlevel 1 goto create-msvs-files-failed
99-
if not exist node.sln goto create-msvs-files-failed
100-
echo Project files generated.
101-
ENDLOCAL
10290

10391
@rem Look for Visual Studio 2015
10492
if not defined VS140COMNTOOLS goto vc-set-2013

0 commit comments

Comments
 (0)