change default build (in "make" wrapper) to ninja on all platforms

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://sites.google.com/site/skiadocs/
 #
 # Some usage examples:
 #   make clean
@@ skipping 24 matching lines @@
     print '> cd %s' % path
     if not os.path.isdir(path):
         print 'directory %s does not exist' % path
         sys.exit(1)
     os.chdir(path)
 
 def rmtree(path):
     print '> rmtree %s' % path
     shutil.rmtree(path, ignore_errors=True)
 
-def mkdirs(path):
-    print '> mkdirs %s' % path
-    if not os.path.isdir(path):
-        os.makedirs(path)
-
 def runcommand(command):
     print '> %s' % command
     if os.system(command):
         sys.exit(1)
 
 def MakeClean():
     """Cross-platform "make clean" operation."""
     cd(SCRIPT_DIR)
     rmtree(OUT_SUBDIR)
     # clean up the directory that XCode (on Mac) creates
@@ skipping 32 matching lines @@
         print '\nUnable to find vcvars32.bat on your system.'
     sys.exit(1)
 
 
 def MakeWindows(targets):
     """For Windows: build as appropriate for the command line arguments.
 
     parameters:
         targets: build targets as a list of strings
     """
+    # 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')
 
-    # Prepare final output dir into which we will copy all binaries.
-    msbuild_working_dir = os.path.join(SCRIPT_DIR, OUT_SUBDIR, GYP_SUBDIR)
-    msbuild_output_dir = os.path.join(msbuild_working_dir, BUILDTYPE)
-    final_output_dir = os.path.join(SCRIPT_DIR, OUT_SUBDIR, BUILDTYPE)
-    mkdirs(final_output_dir)
+    # We already built the gypfiles...
+    while TARGET_GYP in targets:
+        targets.remove(TARGET_GYP)
 
-    for target in targets:
-        # We already built the gypfiles...
-        if target == TARGET_GYP:
-            continue
-
-        cd(msbuild_working_dir)
-        runcommand(
-            ('msbuild /nologo /property:Configuration=%s'
-            ' /target:%s /verbosity:minimal %s.sln') % (
-                BUILDTYPE, target, target))
-        runcommand('xcopy /y %s\* %s' % (
-            msbuild_output_dir, final_output_dir))
+    # 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
@@ skipping 41 matching lines @@
             sys.exit(1)
     else:
         print 'unknown platform (os.name=%s, sys.platform=%s); see %s' % (
             os.name, sys.platform, 'https://sites.google.com/site/skiadocs/')
         sys.exit(1)
     sys.exit(0)
 
 
 # main()
 Make(sys.argv[1:])
-
-