Moving dgen_ scripts out of validator_arm into a common directory.

src/trusted/validator_arm/build.scons

 # -*- python -*-
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 Import('env')
 
 if not env.Bit('linux'): Return()
 
@@ skipping 13 matching lines @@
 #
 #   valgen : Regenerate any deleted source files. Note: some generated
 #       source files do understand dependencies and do not need to be
 #       deleted before calling valgen. However, do not count on this,
 #       as some dependencies are not caught. To be safe, if you have
 #       modified a file that effects source generation, run "valclean"
 #       followed by a "valgen" to guarantee that generated sources are
 #       up to date.
 gen_env = env.Clone();
 
+# Defines dgen directory inside of common arch-independent validator directory.
+DGEN_SRC_DIR = '${MAIN_DIR}/src/trusted/validator/dgen'
+
 # Defines this source directory.
 GEN_SRC_DIR = '${MAIN_DIR}/src/trusted/validator_arm/gen'
 
 # Defines the full file name for a generated file.
 def _gen_file(filename):
   return '%s/%s' % (GEN_SRC_DIR, filename)
 
+# Defines the full file name for a file inside dgen directory.
+def _dgen_dir_file(filename):
+  return '%s/%s' % (DGEN_SRC_DIR, filename)
+
 # Set of generated source files.
 GEN_LIST = [_gen_file(x) for x in
             ['arm32_decode.cc', 'arm32_decode.h',
              'arm32_decode_named.cc' ,
              'arm32_decode_named_classes.h',
              'arm32_decode_named_decoder.h',
              'arm32_decode_tests.cc']]
 
 generate = False
 gen_env = env.Clone();
 if 'valgen' in COMMAND_LINE_TARGETS: generate = True
 if 'valclean' in COMMAND_LINE_TARGETS: generate = True
 
 if generate:
   gen_env.AlwaysBuild(gen_env.Alias('valgen', GEN_LIST))
   gen_env.AlwaysBuild(
     gen_env.Alias('valclean', action=[Delete(x) for x in GEN_LIST]))
 
 def _generate_source(filename):
   env.Command(target=filename,
               source=['armv7.table',
-                      'generate_decoder.py',
-                      'dgen_core.py',
-                      'dgen_input.py',
-                      'dgen_opt.py',
-                      'dgen_output.py',
-                      'dgen_decoder_output.py',
-                      'dgen_test_output.py',
+                      _dgen_dir_file('generate_decoder.py'),
+                      _dgen_dir_file('dgen_core.py'),
+                      _dgen_dir_file('dgen_input.py'),
+                      _dgen_dir_file('dgen_opt.py'),
+                      _dgen_dir_file('dgen_output.py'),
+                      _dgen_dir_file('dgen_decoder_output.py'),
+                      _dgen_dir_file('dgen_test_output.py'),
                       ],
               action=['${SOURCES[1].abspath} ${SOURCES[0].abspath} '
                       '${TARGET.abspath} Arm32DecoderState'])
 
 for f in GEN_LIST:
   _generate_source(f)
 
 env.ComponentLibrary('arm_validator_core',
                      ['address_set.cc',
                       'inst_classes.cc',
@@ skipping 81 matching lines @@
     EXTRA_LIBS=['decoder_test_tools', 'arm_validator_core'])
 
 decoder_test_node = gtest_env.CommandTest(
     'arm32_decode_tests.out',
     command=[decoder_tests_exe],
     scale_timeout=100)
 
 gtest_env.AddNodeToTestSuite(decoder_test_node,
                              ['huge_tests', 'arm_decoder_tests'],
                               'run_arm_decoder_tests')