Missing .exe in windows build.

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 540 matching lines @@
   skip_update = skip and not options.only_updater
   skip_untar = skip
   skip_build = skip
   skip_test_updater = skip
   skip_tar = skip or options.skip_tar
 
   if options.archive and (options.only_examples or options.skip_tar):
     parser.error('Incompatible arguments with archive.')
 
   pepper_ver = str(int(build_utils.ChromeMajorVersion()))
+  pepper_old = str(int(build_utils.ChromeMajorVersion()) - 1)
   clnumber = lastchange.FetchVersionInfo(None).revision
   if options.release:
     pepper_ver = options.release
   print 'Building PEPPER %s at %s' % (pepper_ver, clnumber)
 
   if not skip_build:
     buildbot_common.BuildStep('Rerun hooks to get toolchains')
     buildbot_common.Run(['gclient', 'runhooks'],
                         cwd=SRC_DIR, shell=(platform=='win'))
 
+  buildbot_common.BuildStep('Clean Pepper Dirs')
   pepperdir = os.path.join(SRC_DIR, 'out', 'pepper_' + pepper_ver)
+  pepperold = os.path.join(SRC_DIR, 'out', 'pepper_' + pepper_old)
+  buildbot_common.RemoveDir(pepperold)
   if not skip_untar:
-    buildbot_common.BuildStep('Clean Pepper Dir')
     buildbot_common.RemoveDir(pepperdir)
     buildbot_common.MakeDir(os.path.join(pepperdir, 'toolchain'))
     buildbot_common.MakeDir(os.path.join(pepperdir, 'tools'))
   else:
     buildbot_common.MakeDir(pepperdir)
 
   if not skip_build:
     buildbot_common.BuildStep('Add Text Files')
     files = ['AUTHORS', 'COPYING', 'LICENSE', 'NOTICE', 'README']
     files = [os.path.join(SDK_SRC_DIR, filename) for filename in files]
     oshelpers.Copy(['-v'] + files + [pepperdir])
 
 
   # Clean out the temporary toolchain untar directory
   if not skip_untar:
     UntarToolchains(pepperdir, platform, arch, toolchains)
 
   if not skip_build:
     BuildToolchains(pepperdir, platform, arch, pepper_ver, toolchains)
 
   if not skip_build:
     buildbot_common.BuildStep('Copy make OS helpers')
     buildbot_common.CopyDir(os.path.join(SDK_SRC_DIR, 'tools', '*.py'),
         os.path.join(pepperdir, 'tools'))
     if platform == 'win':
       buildbot_common.BuildStep('Add MAKE')
       http_download.HttpDownload(GSTORE + MAKE,
                                  os.path.join(pepperdir, 'tools' ,'make.exe'))
+      rename_list = ['ncval_x86_32', 'ncval_x86_64',
+                     'sel_ldr_x86_32', 'sel_ldr_x86_64']
+      tools = os.path.join(pepperdir, 'tools')
+      for name in rename_list:
+          src = os.path.join(pepperdir, 'tools', name)
+          dst = os.path.join(pepperdir, 'tools', name + '.exe')
+          buildbot_common.Move(src, dst)
 
   if not skip_examples:
     CopyExamples(pepperdir, toolchains)
 
   tarname = 'naclsdk_' + platform + '.bz2'
   if 'pnacl' in toolchains:
     tarname = 'p' + tarname
   tarfile = os.path.join(OUT_DIR, tarname)
 
   if not skip_tar:
@@ skipping 95 matching lines @@
         manifest_snippet_stream.write(bundle.ToJSON())
 
       buildbot_common.Archive(tarname + '.json', bucket_path, OUT_DIR,
                               step_link=False)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))