make.bat - Issue 332833002: Enable compiling with automatically-downloaded VS toolchain on Windows bots

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: make.bat

Issue 332833002: Enable compiling with automatically-downloaded VS toolchain on Windows bots (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: make.bat

diff --git a/make.bat b/make.bat

index a9961074e347cdcc4abb42cfeb0559b234ee7cc0..0dd48277253dec3032346847726e5581bb1b7874 100644

--- a/make.bat

+++ b/make.bat

@@ -4,29 +4,9 @@

@rem found in the LICENSE file.

@ECHO OFF

-rem Launches make.py on Windows, after setting Visual Studio environment variables.

+rem Launches make.py on Windows

epoger 2014/06/12 20:43:10 What happens if human developers run this? Will i

borenet 2014/06/12 20:50:58 I backpedaled a little in patch set 2.

rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows

-if "%DevEnvDir%"=="" goto setup_env_vars

-:run_python

rem Run make.py and propagate its return value.

python make.py %*

exit /B %ERRORLEVEL%

-:setup_env_vars

-rem Visual Studio environment variables aren't set yet, so run vcvars32.bat

-if DEFINED VS110COMNTOOLS (

- call "%VS110COMNTOOLS%..\..\VC\bin\vcvars32.bat"

-) else if DEFINED VS100COMNTOOLS (

- call "%VS100COMNTOOLS%..\..\VC\bin\vcvars32.bat"

-) else (

- goto error_no_VS

-if %ERRORLEVEL% neq 0 exit /B %ERRORLEVEL%

-goto run_python

-:error_no_VS

-echo ERROR: Neither VS100COMNTOOLS nor VS110COMNTOOLS environment variable is set.

-echo Are you sure Visual Studio 2010 or 2012 is installed?

-exit /B 1

« gyp_skia ('K') | « gyp_skia ('k') | make.py » ('j') | no next file with comments »