[NaCl SDK] Update Windows build to use vs2013 from depot_tools.

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 431 matching lines @@
       if tc == 'newlib' and xarch == 'arm' and 'bionic' in toolchains:
         bionic_dir = GetOutputToolchainLib(pepperdir, 'bionic', xarch)
         InstallFiles(src_dir, bionic_dir, TOOLCHAIN_LIBS['bionic'])
 
       if tc != 'pnacl':
         src_dir = GetGypToolchainLib(tc, xarch)
         InstallFiles(src_dir, dst_dir, ['crt1.o'])
 
 
 def GypNinjaBuild_NaCl(rel_out_dir):
-  gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
+  # TODO(binji): gyp_nacl doesn't build properly on Windows anymore; it only
+  # can use VS2010, not VS2013 which is now required by the Chromium repo. NaCl
+  # needs to be updated to perform the same logic as Chromium in detecting VS,
+  # which can now exist in the depot_tools directory.
+  # See https://code.google.com/p/nativeclient/issues/detail?id=4022
+  #
+  # For now, let's use gyp_chromium to build these components.
+#  gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
+  gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
   nacl_core_sdk_gyp = os.path.join(NACL_DIR, 'build', 'nacl_core_sdk.gyp')
   all_gyp = os.path.join(NACL_DIR, 'build', 'all.gyp')
 
   out_dir = MakeNinjaRelPath(rel_out_dir)
   out_dir_arm = MakeNinjaRelPath(rel_out_dir + '-arm')
   GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir)
   GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_arm)
   GypNinjaBuild(None, gyp_py, all_gyp, 'ncval_new', out_dir)
 
   platform = getos.GetPlatform()
@@ skipping 93 matching lines @@
 def NinjaBuild(targets, out_dir):
   if type(targets) is not list:
     targets = [targets]
   out_config_dir = os.path.join(out_dir, 'Release')
   buildbot_common.Run(['ninja', '-C', out_config_dir] + targets, cwd=SRC_DIR)
 
 
 def BuildStepBuildToolchains(pepperdir, toolchains):
   buildbot_common.BuildStep('SDK Items')
 
+  # Remove all gypbuild-* dirs.
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR))
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR) + '-arm')
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR) + '-64')
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR) + '-pnacl-ia32')
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR) + '-pnacl-arm')

[Sam Clegg, 2014/12/15 23:17:41]

Why?

[binji, 2014/12/16 01:08:33]

When I first rebuilt on Windows, the previous pdb files were from VS2010, but
the new ones were for VS2013, so the build failed.

We should have been cleaning these directories anyway on the buildbots (although
it does mean that the build will be slower). Perhaps this should be on a flag?

+
   GypNinjaBuild_NaCl(GYPBUILD_DIR)
   GypNinjaBuild_Breakpad(GYPBUILD_DIR)
 
   platform = getos.GetPlatform()
   newlibdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_newlib')
   glibcdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_glibc')
   armdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_newlib')
   pnacldir = os.path.join(pepperdir, 'toolchain', platform + '_pnacl')
   bionicdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_bionic')
 
@@ skipping 488 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')