diff options
| author | julien.waechter <julien.waechter@gmail.com> | 2016-01-12 09:21:46 +0100 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2016-01-14 14:54:02 +0000 |
| commit | 8182ec094d25f86d57803a2c17e3847f98050e94 (patch) | |
| tree | 2a281a455e6811b8862a8e50e49457ba5057c473 /vcbuild.bat | |
| parent | d91646b9c7534b2bc15a46f569e2a3a599119dc7 (diff) | |
| download | android-node-v8-8182ec094d25f86d57803a2c17e3847f98050e94.tar.gz android-node-v8-8182ec094d25f86d57803a2c17e3847f98050e94.tar.bz2 android-node-v8-8182ec094d25f86d57803a2c17e3847f98050e94.zip | |
build: add option to select VS version
This changes vcbuild.bat to accept a new parameter (vc2015 or vc2013)
to select the version of Visual Studio to use.
PR-URL: https://github.com/nodejs/node/pull/4645
Reviewed-By: João Reis <reis@janeasystems.com>
Diffstat (limited to 'vcbuild.bat')
| -rw-r--r-- | vcbuild.bat | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index e33f8cb652..260a86000b 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -15,6 +15,7 @@ if /i "%1"=="/?" goto help set config=Release set target=Build set target_arch=x86 +set target_env= set noprojgen= set nobuild= set nosign= @@ -44,6 +45,8 @@ if /i "%1"=="clean" set target=Clean&goto arg-ok if /i "%1"=="ia32" set target_arch=x86&goto arg-ok if /i "%1"=="x86" set target_arch=x86&goto arg-ok if /i "%1"=="x64" set target_arch=x64&goto arg-ok +if /i "%1"=="vc2013" set target_env=vc2013&goto arg-ok +if /i "%1"=="vc2015" set target_env=vc2015&goto arg-ok if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok if /i "%1"=="nobuild" set nobuild=1&goto arg-ok if /i "%1"=="nosign" set nosign=1&goto arg-ok @@ -110,6 +113,7 @@ call :getnodeversion || exit /b 1 @rem Set environment for msbuild +if defined target_env if "%target_env%" NEQ "vc2015" goto vc-set-2013 @rem Look for Visual Studio 2015 echo Looking for Visual Studio 2015 if not defined VS140COMNTOOLS goto vc-set-2013 @@ -133,6 +137,7 @@ set PLATFORM_TOOLSET=v140 goto msbuild-found :vc-set-2013 +if defined target_env if "%target_env%" NEQ "vc2013" goto msbuild-not-found @rem Look for Visual Studio 2013 echo Looking for Visual Studio 2013 if not defined VS120COMNTOOLS goto msbuild-not-found @@ -262,7 +267,7 @@ echo Failed to create vc project files. goto exit :help -echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/intl-none] [nobuild] [nosign] [x86/x64] [download-all] [enable-vtune] +echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/intl-none] [nobuild] [nosign] [x86/x64] [vc2013/vc2015] [download-all] [enable-vtune] echo Examples: echo vcbuild.bat : builds release build echo vcbuild.bat debug : builds debug build |