Make build_command_buffer.py work on Windows

tools/build_command_buffer.py

 #!/usr/bin/python
 
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """
 Script to build the command buffer shared library and copy it to Skia tree
@@ skipping 69 matching lines @@
     sys.exit(args.output_dir + ' exists but is a file.')
   elif not os.path.isdir(args.output_dir):
     if args.make_output_dir:
       os.makedirs(args.output_dir)
     else:
       sys.exit(args.output_dir + ' does not exist (specify --make-output-dir '
           'to create).')
 
   chrome_target_dir_rel = os.path.join('out', args.chrome_build_type)
 
+  # The command buffer shared library will have a different name on Linux,
+  # Mac, and Windows. Also, on Linux it will be in a 'lib' subdirectory and
+  # needs to be placed in a 'lib' subdirectory of the directory containing the
+  # Skia executable. Also, the name of the gclient executable we call out to has
+  # a .bat file extension on Windows.
+  platform = sys.platform
+  if platform == 'cygwin':
+    platform = 'win32'
+
+  shared_lib_name = 'libcommand_buffer_gles2.so'
+  shared_lib_subdir = 'lib'
+  gclient = 'gclient'
+  if platform == 'darwin':
+    shared_lib_name = 'libcommand_buffer_gles2.dylib'
+    shared_lib_subdir = ''
+  elif platform == 'win32':
+    shared_lib_name = 'command_buffer_gles2.dll'
+    shared_lib_subdir = ''
+    gclient = 'gclient.bat'
+
   if not args.no_sync:
     try:
       subprocess.check_call(['git', 'fetch'], cwd=chrome_src_dir)
     except subprocess.CalledProcessError as error:
       sys.exit('Error (ret code: %s) calling "%s" in %s' % error.returncode,
           error.cmd, chrome_src_dir)
 
   try:
     subprocess.check_call(['git', 'checkout', args.chrome_revision],
         cwd=chrome_src_dir)
   except subprocess.CalledProcessError as error:
     sys.exit('Error (ret code: %s) calling "%s" in %s' % error.returncode,
         error.cmd, chrome_src_dir)
 
   if not args.no_sync:
     try:
       os.environ['GYP_GENERATORS'] = 'ninja'
-      subprocess.check_call(['gclient', 'sync', '--reset', '--force'],
+      subprocess.check_call([gclient, 'sync', '--reset', '--force'],
           cwd=chrome_src_dir)
     except subprocess.CalledProcessError as error:
       sys.exit('Error (ret code: %s) calling "%s" in %s' % error.returncode,
           error.cmd, chrome_src_dir)
 
   try:
     subprocess.check_call(['ninja'] + shlex.split(args.extra_ninja_args) +
         ['-C', chrome_target_dir_rel, 'command_buffer_gles2'],
         cwd=chrome_src_dir)
   except subprocess.CalledProcessError as error:
     sys.exit('Error (ret code: %s) calling "%s" in %s' % error.returncode,
         error.cmd, chrome_src_dir)
 
-  # The command buffer shared library will have a different extension on Linux,
-  # Mac, and Windows. Also, on Linux it will be in a 'lib' subdirectory and
-  # needs to be placed in a 'lib' subdirectory of the directory containing the
-  # Skia executable.
-  platform = sys.platform
-  if platform == 'cygwin':
-    platform = 'win32'
-
-  shared_lib_ext = '.so'
-  shared_lib_subdir = 'lib'
-  if platform == 'darwin':
-    shared_lib_ext = '.dylib'
-    shared_lib_subdir = ''
-  elif platform == 'win32':
-    shared_lib_ext = '.dll'
-    shared_lib_subdir = ''
-
   shared_lib_src_dir = os.path.join(chrome_src_dir, chrome_target_dir_rel,
                                     shared_lib_subdir)
   shared_lib_dst_dir = os.path.join(args.output_dir, shared_lib_subdir)
   # Make the subdir for the dst if does not exist
   if shared_lib_subdir and not os.path.isdir(shared_lib_dst_dir):
     os.mkdir(shared_lib_dst_dir)
 
-  shared_lib_name = 'libcommand_buffer_gles2' + shared_lib_ext
   shared_lib_src = os.path.join(shared_lib_src_dir, shared_lib_name)
   shared_lib_dst = os.path.join(shared_lib_dst_dir, shared_lib_name)
 
   if not os.path.isfile(shared_lib_src):
     sys.exit('Command buffer shared library not at expected location: ' +
         shared_lib_src)
 
   shutil.copy2(shared_lib_src, shared_lib_dst)
 
   if not os.path.isfile(shared_lib_dst):
     sys.exit('Command buffer library not copied to ' + shared_lib_dst)
 
   print('Command buffer library copied to ' + shared_lib_dst)
 
 
 if __name__ == '__main__':
   main()