Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(966)

Side by Side Diff: make.bat

Issue 14963005: Make make.bat and gyp_skia work with VS 2012. (Closed) Base URL: http://skia.googlecode.com/svn/trunk
Patch Set: remove empty echos Created 7 years, 7 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 | Annotate | Revision Log
« gyp_skia ('K') | « gyp_skia ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 6
6 @rem Launches make.py on Windows, after setting Visual Studio environment variab les. 7 rem Launches make.py on Windows, after setting Visual Studio environment variabl es.
7 @rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows 8 rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows
8 9
9 @if "%DevEnvDir%"=="" goto setup_env_vars 10 if "%DevEnvDir%"=="" goto setup_env_vars
10 11
11 :run_python 12 :run_python
12 @rem Run make.py and propagate its return value. 13 rem Run make.py and propagate its return value.
13 python make.py %* 14 python make.py %*
14 @exit /B %ERRORLEVEL% 15 exit /B %ERRORLEVEL%
15 16
16 :setup_env_vars 17 :setup_env_vars
17 @rem Visual Studio environment variables aren't set yet, so run vcvars32.bat 18 rem Visual Studio environment variables aren't set yet, so run vcvars32.bat
18 @if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLS 19 if DEFINED VS110COMNTOOLS (
19 call "%VS100COMNTOOLS%..\..\VC\bin\vcvars32.bat" 20 call "%VS110COMNTOOLS%..\..\VC\bin\vcvars32.bat"
20 @if %ERRORLEVEL% neq 0 exit /B %ERRORLEVEL% 21 ) else if DEFINED VS100COMNTOOLS (
21 @goto run_python 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
22 28
23 :error_no_VS100COMNTOOLS 29 :error_no_VS
24 @echo ERROR: VS100COMNTOOLS environment variable not set. 30 echo ERROR: Neither VS100COMNTOOLS nor VS110COMNTOOLS environment variable is se t.
25 @echo Are you sure Visual Studio 2010 is installed? 31 echo Are you sure Visual Studio 2010 or 2012 is installed?
26 @exit /B 1 32 exit /B 1
OLDNEW
« gyp_skia ('K') | « gyp_skia ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698