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

Side by Side Diff

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

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

Side by Side 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 unified diff | Download patch

OLD	NEW
1 @rem Copyright 2011 Google Inc.	1 @rem Copyright 2011 Google Inc.

2 @rem	2 @rem

3 @rem Use of this source code is governed by a BSD-style license that can be	3 @rem Use of this source code is governed by a BSD-style license that can be

4 @rem found in the LICENSE file.	4 @rem found in the LICENSE file.

5 @ECHO OFF	5 @ECHO OFF

6	6

7 rem Launches make.py on Windows, after setting Visual Studio environment variabl es.	7 rem Launches make.py on Windows
	epoger 2014/06/12 20:43:10 What happens if human developers run this? Will i What happens if human developers run this? Will it still work for them? borenet 2014/06/12 20:50:58 I backpedaled a little in patch set 2. Show quoted text On 2014/06/12 20:43:10, epoger wrote: > What happens if human developers run this? Will it still work for them? I backpedaled a little in patch set 2.
8 rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows	8 rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows

9	9

10 if "%DevEnvDir%"=="" goto setup_env_vars

11

12 :run_python

13 rem Run make.py and propagate its return value.	10 rem Run make.py and propagate its return value.

14 python make.py %*	11 python make.py %*

15 exit /B %ERRORLEVEL%	12 exit /B %ERRORLEVEL%

16

17 :setup_env_vars

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

19 if DEFINED VS110COMNTOOLS (

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

21 ) else if DEFINED VS100COMNTOOLS (

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

23 ) else (

24 goto error_no_VS

25 )

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

27 goto run_python

28

29 :error_no_VS

30 echo ERROR: Neither VS100COMNTOOLS nor VS110COMNTOOLS environment variable is se t.

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

32 exit /B 1

OLD	NEW

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