From 84012c99e06ec78888f201ff934b40dc53542582 Mon Sep 17 00:00:00 2001 From: Alexis Campailla Date: Wed, 8 Jul 2015 12:31:30 +0200 Subject: [PATCH] build: fix vcbuild merge issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit configure was getting called twice. We also erroneously introduced support for VS2010, and were picking 2010 before other versions. PR-URL: https://github.com/nodejs/io.js/pull/2131 Reviewed-By: Ben Noordhuis Reviewed-By: Johan Bergström --- vcbuild.bat | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/vcbuild.bat b/vcbuild.bat index 077fb21c5e..e452849dfd 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -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