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

make.py

 # Copyright 2011 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # "Makefile" replacement to build skia for Windows.
 # More info at https://skia.org.
 #
 # Some usage examples:
 #   make clean
@@ skipping 43 matching lines @@
 
 
 def CheckWindowsEnvironment():
     """For Windows: check environment variables needed for command-line build.
 
     If those environment variables are missing, try to set them.
     If environment variables can be set up, this function returns; otherwise,
     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'
            '\nhttp://msdn.microsoft.com/en-us/library/f2ccy3wt.aspx ?')
     found_path = None
     try:
         possible_path = os.path.abspath(os.path.join(
             os.environ['VS100COMNTOOLS'], os.path.pardir, os.path.pardir,
             'VC', 'bin', 'vcvars32.bat'))
         if os.path.exists(possible_path):
@@ skipping 12 matching lines @@
 
     parameters:
         targets: build targets as a list of strings
     """
     if os.environ.get('CHROME_HEADLESS', '0') != '1':
         # TODO(epoger): I'm not sure if this is needed for ninja builds.
         CheckWindowsEnvironment()
 
     # 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:
         targets.remove(TARGET_GYP)
 
     # And call ninja to do the work!
     if targets:
         runcommand('ninja -C %s %s' % (
             os.path.join(OUT_SUBDIR, BUILDTYPE), ' '.join(targets)))
 
 
 def Make(args):
     """Main function.
 
     parameters:
         args: command line arguments as a list of strings
     """
     # handle any variable-setting parameters or special targets
     global BUILDTYPE
 
     # if no targets were specified at all, make default target
     if not args:
         args = [TARGET_DEFAULT]
 
     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:
             MakeClean()
         elif arg.startswith('BUILDTYPE='):
             BUILDTYPE = arg[10:]
         elif arg.startswith('GYP_DEFINES='):
             os.environ['GYP_DEFINES'] = arg[12:]
         else:
             targets.append(arg)
 
     # if there are no remaining targets, we're done
     if not targets:
         sys.exit(0)
 
     # dispatch to appropriate Make<Platform>() variant.
     if os.name == 'nt':
         MakeWindows(targets)
         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' % (
             os.name, sys.platform, 'https://skia.org/user/quick')
         sys.exit(1)
     sys.exit(0)
 
 
 # main()
 Make(sys.argv[1:])