Make make.bat and gyp_skia work with VS 2012.

Make make.bat and gyp_skia work with VS 2012.

Landed as r9045

[bsalomon, 2013-05-06 19:34:49]

Several of us are now using VS2012 to build Skia. These changes allow make.bat
and gyp_skia to work with VS2012.

[bungeman-skia, 2013-05-06 20:05:38]

On 2013/05/06 19:34:49, bsalomon wrote:
> Several of us are now using VS2012 to build Skia. These changes allow make.bat
> and gyp_skia to work with VS2012.

I just wanted to chime in and say that I have almost checked in this gyp_skia
change multiple times by accident.

[epoger, 2013-05-07 15:19:17]

https://codereview.chromium.org/14963005/diff/2001/gyp_skia
File gyp_skia (left):

https://codereview.chromium.org/14963005/diff/2001/gyp_skia#oldcode117
gyp_skia:117: # - msvs_version forces generation of Visual Studio 2010 project
so that we
I take it that "make <target>" still works after this change, in both 2010 and
2012?  (I'm looking at the comment about msbuild.exe ...)

$ svn blame gyp_skia | grep msvs_version
  1853 epoger@google.com   # - msvs_version forces generation of Visual Studio
2010 project so that we
  1853 epoger@google.com   args.extend(['-Gmsvs_version=2010'])

which leads me to https://code.google.com/p/skia/source/detail?r=1853

which leads me to https://codereview.appspot.com/4717044/ ('enable "make XXX"
command-line builds on Windows')

[bsalomon, 2013-05-07 15:35:30]

On 2013/05/07 15:19:17, epoger wrote:
> https://codereview.chromium.org/14963005/diff/2001/gyp_skia
> File gyp_skia (left):
> 
> https://codereview.chromium.org/14963005/diff/2001/gyp_skia#oldcode117
> gyp_skia:117: # - msvs_version forces generation of Visual Studio 2010 project
> so that we
> I take it that "make <target>" still works after this change, in both 2010 and
> 2012?  (I'm looking at the comment about msbuild.exe ...)
> 
> $ svn blame gyp_skia | grep msvs_version
>   1853 mailto:epoger@google.com   # - msvs_version forces generation of Visual
Studio
> 2010 project so that we
>   1853 mailto:epoger@google.com   args.extend(['-Gmsvs_version=2010'])
> 
> which leads me to https://code.google.com/p/skia/source/detail?r=1853
> 
> which leads me to https://codereview.appspot.com/4717044/ ('enable "make XXX"
> command-line builds on Windows')

I tested "make gyp" and "make gm" on 2010 and 2012. Both commands work with both
VS versions.

I think the reason we were originally forcing 2010 is that many Skia developers
had both 2008 and 2010 installed. 2010 for Skia and 2008 for Chromium (which
used to require 2005 or 2008 and not work with 2010). We all had our
GYP_MSVS_VERSION (or whatever it's called) env var set to 2008 or else Chromium
would emit a 2010 project. It's no longer an issue.

[epoger, 2013-05-07 15:37:08]

LGTM

On 2013/05/07 15:35:30, bsalomon wrote:
> I think the reason we were originally forcing 2010 is that many Skia
developers
> had both 2008 and 2010 installed. 2010 for Skia and 2008 for Chromium (which
> used to require 2005 or 2008 and not work with 2010). We all had our
> GYP_MSVS_VERSION (or whatever it's called) env var set to 2008 or else
Chromium
> would emit a 2010 project. It's no longer an issue.

Gotcha, makes sense.  Thanks.

[commit-bot: I haz the power, 2013-05-07 15:40:13]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/bsalomon@google.com/14963005/2001

[commit-bot: I haz the power, 2013-05-07 15:40:16]

Failed to apply patch for make.bat:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file make.bat
  Hunk #1 FAILED at 2.
  1 out of 1 hunk FAILED -- saving rejects to file make.bat.rej

Patch:       make.bat
Index: make.bat
diff --git a/make.bat b/make.bat
index
fbe0a352f1c52c418c6fc27bdccc38e6da61a83f..a9961074e347cdcc4abb42cfeb0559b234ee7cc0
100644
--- a/make.bat
+++ b/make.bat
@@ -2,25 +2,31 @@
 @rem
 @rem    Use of this source code is governed by a BSD-style license that can be
 @rem    found in the LICENSE file.
+@ECHO OFF
 
-@rem Launches make.py on Windows, after setting Visual Studio environment
variables.
-@rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows
+rem Launches make.py on Windows, after setting Visual Studio environment
variables.
+rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows
 
-@if "%DevEnvDir%"=="" goto setup_env_vars
+if "%DevEnvDir%"=="" goto setup_env_vars
 
 :run_python
-@rem Run make.py and propagate its return value.
+rem Run make.py and propagate its return value.
 python make.py %*
-@exit /B %ERRORLEVEL%
+exit /B %ERRORLEVEL%
 
 :setup_env_vars
-@rem Visual Studio environment variables aren't set yet, so run vcvars32.bat
-@if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLS
-call "%VS100COMNTOOLS%..\..\VC\bin\vcvars32.bat"
-@if %ERRORLEVEL% neq 0 exit /B %ERRORLEVEL%
-@goto run_python
+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_VS100COMNTOOLS
-@echo ERROR: VS100COMNTOOLS environment variable not set.
-@echo Are you sure Visual Studio 2010 is installed?
-@exit /B 1
+: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