Run gyp on Win with --no-parallel -G config=$(BUILDTYPE), fix pylint

Run gyp on Win with --no-parallel -G config=$(BUILDTYPE), fix pylint

The previous change didn't affect Windows...

BUG=skia:3287
R=mtklein@google.com

Committed: https://skia.googlesource.com/skia/+/030854eb92a9745ffbfe874e1f57d6a2423903eb

[borenet, 2015-03-03 17:44:38]

borenet@google.com changed reviewers:
+ bsalomon@google.com, bungeman@google.com, mtklein@google.com

[mtklein, 2015-03-03 17:47:47]

lgtm.

Might as well revert the first one?

[borenet, 2015-03-03 17:51:34]

On 2015/03/03 17:47:47, mtklein wrote:
> lgtm.
> 
> Might as well revert the first one?

Eh, if it's not causing any harm, why don't we keep it around?  It's saving us
some marginal amount of work.

[borenet, 2015-03-03 17:51:36]

The CQ bit was checked by borenet@google.com

[commit-bot: I haz the power, 2015-03-03 17:51:53]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/975803002/1

[commit-bot: I haz the power, 2015-03-03 17:51:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-03 17:51:55]

Failed to apply patch for make.py:
While running git apply --index -3 -p1;
  error: patch failed: make.py:61
  Falling back to three-way merge...
  error: patch failed: make.py:61
  error: make.py: patch does not apply

Patch:       make.py
Index: make.py
diff --git a/make.py b/make.py
index
414cc9f5bb4fbf817fcfbc8c113258e9e6b4ddb0..fcf81b59463b0c1d479156eaff14cae1203484a9
100644
--- a/make.py
+++ b/make.py
@@ -61,11 +61,8 @@ def CheckWindowsEnvironment():
     it displays an error message and exits.
     """
     # If we already have the proper environment variables, nothing to do here.
-    try:
-        env_DevEnvDir = os.environ['DevEnvDir']
-        return  # found it, so we are done
-    except KeyError:
-        pass # go on and run the rest of this function
+    if os.environ.get('DevEnvDir'):
+      return
 
     print ('\nCould not find Visual Studio environment variables.'
            '\nPerhaps you have not yet run vcvars32.bat as described at'
@@ -98,7 +95,7 @@ def MakeWindows(targets):
 
     # Run gyp_skia to prepare Visual Studio projects.
     cd(SCRIPT_DIR)
-    runcommand('python gyp_skia')
+    runcommand('python gyp_skia --no-parallel -G config=%s' % BUILDTYPE)
 
     # We already built the gypfiles...
     while TARGET_GYP in targets:
@@ -125,9 +122,11 @@ def Make(args):
 
     targets = []
     for arg in args:
-        # If user requests "make all", chain to our explicitly-declared
"everything"
-        # target. See https://code.google.com/p/skia/issues/detail?id=932 ("gyp
-        # automatically creates "all" target on some build flavors but not
others")
+        # If user requests "make all", chain to our explicitly-declared
+        # "everything" target. See
+        # https://code.google.com/p/skia/issues/detail?id=932 ("gyp
+        # automatically creates "all" target on some build flavors but not
+        # others")
         if arg == TARGET_ALL:
             targets.append('everything')
         elif arg == TARGET_CLEAN:
@@ -149,16 +148,16 @@ def Make(args):
         sys.exit(0)
     elif os.name == 'posix':
         if sys.platform == 'darwin':
-            print 'Mac developers should not run this script; see ' \
-                'https://skia.org/user/quick/macos'
+            print ('Mac developers should not run this script; see '
+                   'https://skia.org/user/quick/macos')
             sys.exit(1)
         elif sys.platform == 'cygwin':
-            print 'Windows development on Cygwin is not currently supported;
see ' \
-                'https://skia.org/user/quick/windows'
+            print ('Windows development on Cygwin is not currently supported; '
+                   'see https://skia.org/user/quick/windows')
             sys.exit(1)
         else:
-            print 'Unix developers should not run this script; see ' \
-                'https://skia.org/user/quick/linux'
+            print ('Unix developers should not run this script; see '
+                   'https://skia.org/user/quick/linux')
             sys.exit(1)
     else:
         print 'unknown platform (os.name=%s, sys.platform=%s); see %s' % (

[borenet, 2015-03-03 17:53:36]

The CQ bit was checked by borenet@google.com

[borenet, 2015-03-03 17:53:37]

The patchset sent to the CQ was uploaded after l-g-t-m from mtklein@google.com
Link to the patchset: https://codereview.chromium.org/975803002/#ps20001 (title:
"Re-upload?")

[commit-bot: I haz the power, 2015-03-03 17:53:54]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/975803002/20001

[commit-bot: I haz the power, 2015-03-03 17:53:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-03 17:53:58]

Failed to apply patch for make.py:
While running git apply --index -3 -p1;
  error: patch failed: make.py:61
  Falling back to three-way merge...
  error: patch failed: make.py:61
  error: make.py: patch does not apply

Patch:       make.py
Index: make.py
diff --git a/make.py b/make.py
index
414cc9f5bb4fbf817fcfbc8c113258e9e6b4ddb0..fcf81b59463b0c1d479156eaff14cae1203484a9
100644
--- a/make.py
+++ b/make.py
@@ -61,11 +61,8 @@ def CheckWindowsEnvironment():
     it displays an error message and exits.
     """
     # If we already have the proper environment variables, nothing to do here.
-    try:
-        env_DevEnvDir = os.environ['DevEnvDir']
-        return  # found it, so we are done
-    except KeyError:
-        pass # go on and run the rest of this function
+    if os.environ.get('DevEnvDir'):
+      return
 
     print ('\nCould not find Visual Studio environment variables.'
            '\nPerhaps you have not yet run vcvars32.bat as described at'
@@ -98,7 +95,7 @@ def MakeWindows(targets):
 
     # Run gyp_skia to prepare Visual Studio projects.
     cd(SCRIPT_DIR)
-    runcommand('python gyp_skia')
+    runcommand('python gyp_skia --no-parallel -G config=%s' % BUILDTYPE)
 
     # We already built the gypfiles...
     while TARGET_GYP in targets:
@@ -125,9 +122,11 @@ def Make(args):
 
     targets = []
     for arg in args:
-        # If user requests "make all", chain to our explicitly-declared
"everything"
-        # target. See https://code.google.com/p/skia/issues/detail?id=932 ("gyp
-        # automatically creates "all" target on some build flavors but not
others")
+        # If user requests "make all", chain to our explicitly-declared
+        # "everything" target. See
+        # https://code.google.com/p/skia/issues/detail?id=932 ("gyp
+        # automatically creates "all" target on some build flavors but not
+        # others")
         if arg == TARGET_ALL:
             targets.append('everything')
         elif arg == TARGET_CLEAN:
@@ -149,16 +148,16 @@ def Make(args):
         sys.exit(0)
     elif os.name == 'posix':
         if sys.platform == 'darwin':
-            print 'Mac developers should not run this script; see ' \
-                'https://skia.org/user/quick/macos'
+            print ('Mac developers should not run this script; see '
+                   'https://skia.org/user/quick/macos')
             sys.exit(1)
         elif sys.platform == 'cygwin':
-            print 'Windows development on Cygwin is not currently supported;
see ' \
-                'https://skia.org/user/quick/windows'
+            print ('Windows development on Cygwin is not currently supported; '
+                   'see https://skia.org/user/quick/windows')
             sys.exit(1)
         else:
-            print 'Unix developers should not run this script; see ' \
-                'https://skia.org/user/quick/linux'
+            print ('Unix developers should not run this script; see '
+                   'https://skia.org/user/quick/linux')
             sys.exit(1)
     else:
         print 'unknown platform (os.name=%s, sys.platform=%s); see %s' % (

[mtklein, 2015-03-03 17:55:07]

> Eh, if it's not causing any harm, why don't we keep it around?  It's saving us
> some marginal amount of work.

Oh, right, I was thinking it'd be making things slower with --no-parallel, but
if we're only gyping one config anyway, I agree.

[borenet, 2015-03-03 18:09:21]

The CQ bit was checked by borenet@google.com

[borenet, 2015-03-03 18:09:22]

The patchset sent to the CQ was uploaded after l-g-t-m from mtklein@google.com
Link to the patchset: https://codereview.chromium.org/975803002/#ps60001 (title:
"Back to CRLF")

[commit-bot: I haz the power, 2015-03-03 18:10:13]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/975803002/60001

[commit-bot: I haz the power, 2015-03-03 18:10:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-03 18:10:15]

Failed to apply patch for make.py:
While running git apply --index -3 -p1;
  error: patch failed: make.py:61
  Falling back to three-way merge...
  error: patch failed: make.py:61
  error: make.py: patch does not apply

Patch:       make.py
Index: make.py
diff --git a/make.py b/make.py
index
414cc9f5bb4fbf817fcfbc8c113258e9e6b4ddb0..fcf81b59463b0c1d479156eaff14cae1203484a9
100644
--- a/make.py
+++ b/make.py
@@ -61,11 +61,8 @@ def CheckWindowsEnvironment():
     it displays an error message and exits.
     """
     # If we already have the proper environment variables, nothing to do here.
-    try:
-        env_DevEnvDir = os.environ['DevEnvDir']
-        return  # found it, so we are done
-    except KeyError:
-        pass # go on and run the rest of this function
+    if os.environ.get('DevEnvDir'):
+      return
 
     print ('\nCould not find Visual Studio environment variables.'
            '\nPerhaps you have not yet run vcvars32.bat as described at'
@@ -98,7 +95,7 @@ def MakeWindows(targets):
 
     # Run gyp_skia to prepare Visual Studio projects.
     cd(SCRIPT_DIR)
-    runcommand('python gyp_skia')
+    runcommand('python gyp_skia --no-parallel -G config=%s' % BUILDTYPE)
 
     # We already built the gypfiles...
     while TARGET_GYP in targets:
@@ -125,9 +122,11 @@ def Make(args):
 
     targets = []
     for arg in args:
-        # If user requests "make all", chain to our explicitly-declared
"everything"
-        # target. See https://code.google.com/p/skia/issues/detail?id=932 ("gyp
-        # automatically creates "all" target on some build flavors but not
others")
+        # If user requests "make all", chain to our explicitly-declared
+        # "everything" target. See
+        # https://code.google.com/p/skia/issues/detail?id=932 ("gyp
+        # automatically creates "all" target on some build flavors but not
+        # others")
         if arg == TARGET_ALL:
             targets.append('everything')
         elif arg == TARGET_CLEAN:
@@ -149,16 +148,16 @@ def Make(args):
         sys.exit(0)
     elif os.name == 'posix':
         if sys.platform == 'darwin':
-            print 'Mac developers should not run this script; see ' \
-                'https://skia.org/user/quick/macos'
+            print ('Mac developers should not run this script; see '
+                   'https://skia.org/user/quick/macos')
             sys.exit(1)
         elif sys.platform == 'cygwin':
-            print 'Windows development on Cygwin is not currently supported;
see ' \
-                'https://skia.org/user/quick/windows'
+            print ('Windows development on Cygwin is not currently supported; '
+                   'see https://skia.org/user/quick/windows')
             sys.exit(1)
         else:
-            print 'Unix developers should not run this script; see ' \
-                'https://skia.org/user/quick/linux'
+            print ('Unix developers should not run this script; see '
+                   'https://skia.org/user/quick/linux')
             sys.exit(1)
     else:
         print 'unknown platform (os.name=%s, sys.platform=%s); see %s' % (

[borenet, 2015-03-03 18:15:43]

Committed patchset #4 (id:60001) manually as
030854eb92a9745ffbfe874e1f57d6a2423903eb (presubmit successful).