[NaCl SDK] Include Ragel ncval in SDK for all validation.

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 427 matching lines @@
     'libppapi_stub.a',
   ]
 }
 
 
 def GypNinjaInstall(pepperdir, platform, toolchains):
   build_dir = GYPBUILD_DIR
   ninja_out_dir = os.path.join(OUT_DIR, build_dir, 'Release')
   tools_files = [
     ['sel_ldr', 'sel_ldr_x86_32'],
-    ['ncval_x86_32', 'ncval_x86_32'],
-    ['ncval_arm', 'ncval_arm'],
+    ['ncval_new', 'ncval'],
     ['irt_core_newlib_x32.nexe', 'irt_core_x86_32.nexe'],
     ['irt_core_newlib_x64.nexe', 'irt_core_x86_64.nexe'],
   ]
 
   # TODO(binji): dump_syms doesn't currently build on Windows. See
   # http://crbug.com/245456
   if platform != 'win':
     tools_files.append(['dump_syms', 'dump_syms'])
 
   if platform != 'mac':
     # Mac doesn't build 64-bit binaries.
     tools_files.append(['sel_ldr64', 'sel_ldr_x86_64'])
-    tools_files.append(['ncval_x86_64', 'ncval_x86_64'])
 
   if platform == 'linux':
     tools_files.append(['nacl_helper_bootstrap',
                         'nacl_helper_bootstrap_x86_32'])
     tools_files.append(['nacl_helper_bootstrap64',
                         'nacl_helper_bootstrap_x86_64'])
 
   buildbot_common.MakeDir(os.path.join(pepperdir, 'tools'))
 
   # Add .exe extensions to all windows tools
@@ skipping 33 matching lines @@
 
 def GypNinjaBuild_NaCl(platform, rel_out_dir):
   gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
   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('ia32', gyp_py, all_gyp, 'ncval_x86_32', out_dir)
-  GypNinjaBuild(None, gyp_py, all_gyp, 'ncval_arm', out_dir)
+  GypNinjaBuild('ia32', gyp_py, all_gyp, 'ncval_new', out_dir)

[noelallen1, 2013/06/03 18:28:13]

What are we doing for PNaCl?

[binji, 2013/06/03 18:32:33]

pnacl has its own bitcode checker (included with the pnacl toolchain), but
according to dschuff doesn't allow inline asm, so doesn't need ncval.

We could pre-translate the pnacl code and validate that, but we can use the
existing translator for that case.

 
   if platform == 'win':
     NinjaBuild('sel_ldr64', out_dir)
-    NinjaBuild('ncval_x86_64', out_dir)
   elif platform == 'linux':
     out_dir_64 = MakeNinjaRelPath(rel_out_dir + '-64')
     GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'sel_ldr', out_dir_64)
-    GypNinjaBuild('x64', gyp_py, all_gyp, 'ncval_x86_64', out_dir_64)
 
-    # We only need sel_ldr and ncval_x86_64 from the 64-bit out directory.
+    # We only need sel_ldr from the 64-bit out directory.
     # sel_ldr needs to be renamed, so we'll call it sel_ldr64.
     files_to_copy = [
       ('sel_ldr', 'sel_ldr64'),
-      ('ncval_x86_64', 'ncval_x86_64'),
       ('nacl_helper_bootstrap', 'nacl_helper_bootstrap64'),
     ]
 
     for src, dst in files_to_copy:
       buildbot_common.CopyFile(
           os.path.join(SRC_DIR, out_dir_64, 'Release', src),
           os.path.join(SRC_DIR, out_dir, 'Release', dst))
 
 
 def GypNinjaBuild_Breakpad(platform, rel_out_dir):
@@ skipping 438 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')