Skip to content

Commit

Permalink
build: fix vcbuild merge issues
Browse files Browse the repository at this point in the history
configure was getting called twice.
We also erroneously introduced support for VS2010,
and were picking 2010 before other versions.

PR-URL: nodejs#2131
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
  • Loading branch information
orangemocha committed Jul 10, 2015
1 parent 59f6b5d commit 84012c9
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,6 @@ if "%i18n_arg%"=="intl-none" set i18n_arg=--with-intl=none
call :getnodeversion || exit /b 1

@rem Set environment for msbuild
:project-gen
@rem Skip project generation if requested.
if defined noprojgen goto msbuild

@rem Generate the VS project.
SETLOCAL
if defined VS100COMNTOOLS call "%VS100COMNTOOLS%\VCVarsQueryRegistry.bat"
python configure %download_arg% %i18n_arg% %debug_arg% %snapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG%
if errorlevel 1 goto create-msvs-files-failed
if not exist node.sln goto create-msvs-files-failed
echo Project files generated.
ENDLOCAL

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

0 comments on commit 84012c9

Please sign in to comment.