Skip to content

Update build components of v1.x #2101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rvagg wants to merge 9 commits into from
Closed

Update build components of v1.x #2101

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
649a3db
build: simplify execution of built binary
jbergstroem Jun 12, 2015
693a516
build: don't run lint from test-ci
jbergstroem Jun 13, 2015
7e99b78
build: remove lint from test-ci on windows
jbergstroem Jun 17, 2015
3e3a7b8
build,win: set env before generating projects
orangemocha Apr 23, 2015
16017ad
build: add MSVS 2015 support
rvagg Apr 16, 2015
5dca556
build: fix cherry-pick ooops, fix comment wording
rvagg Jun 23, 2015
3b6b730
build: update build targets for io.js
rvagg Jun 10, 2015
ec8d4ba
deps: copy all openssl header files to include dir
Jun 19, 2015
516d1b3
build: add tar-headers target for headers-only tar
rvagg Jun 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build: add MSVS 2015 support 
PR-URL: #2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
  • Loading branch information
@rvagg
rvagg committed Jul 3, 2015
commit 16017adf31ac17c9f18a8abafe3191bd9d0f4ea9
12 changes: 12 additions & 0 deletions vcbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,18 @@ if defined NIGHTLY set TAG=nightly-%NIGHTLY%

@rem Set environment for msbuild

@rem Look for Visual Studio 2015
if not defined VS140COMNTOOLS goto vc-set-2013
if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2013
if "%VCVARS_VER%" NEQ "140" (
call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat"
SET VCVARS_VER=140
)
if not defined VCINSTALLDIR goto vc-set-2013
set GYP_MSVS_VERSION=2015
goto msbuild-found

:vc-set-2013
@rem Look for Visual Studio 2013
if not defined VS120COMNTOOLS goto msbuild-not-found
if not exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found
Expand Down