hodgepodge for test_shell.cc

webkit/SConscript

 # Copyright (c) 2006-2008 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.
 
 import os
 
 Import(['env'])
 
 env = env.Clone()
 env_res = env.Clone()
@@ skipping 134 matching lines @@
 
 # This list is the SConscripts that work on Windows and Linux.
 sconscript_dirs = [
   'SConscript.port',
   'SConscript.javascriptcore_pcre',
   'build/JSConfig/SConscript',
   'build/JavaScriptCore/SConscript',
   'build/port/SConscript',
   'build/V8Bindings/SConscript',
   'default_plugin/SConscript',
+  'tools/test_shell/SConscript',
 ]
 if env['PLATFORM'] == 'win32':
   # These extra dirs aren't win32-specific, they're just the dirs that
   # haven't yet been made portable.
   sconscript_dirs.extend([
     'activex_shim/SConscript',
     'activex_shim_dll/SConscript',
     'build/localized_strings/SConscript',
     'build/WebCore/SConscript',  # This almost works on linux.  It requires
                                  # some changes to WebKit that we'll get
                                  # in the merge.
     'glue/SConscript',
     'glue/plugins/test/SConscript',
     'tools/npapi_layout_test_plugin/SConscript',
-    'tools/test_shell/SConscript',
     'tools/test_shell/resources/fonts/SConscript',
   ])
 
   env.Append(
     CPPDEFINES = [
       '_CRT_SECURE_NO_DEPRECATE',
       '_CRT_NONSTDC_NO_WARNINGS',
       '_CRT_NONSTDC_NO_DEPRECATE',
       ['CRASH', '__debugbreak'],
       '_WIN32_WINNT=0x0600',
@@ skipping 18 matching lines @@
 #env.Alias('webkit', ['.', '../icudt38.dll'])
 env.Alias('webkit', ['../icudt38.dll'])
 
 
 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
                       ['$WEBCORE_DIR/Configurations/Version.xcconfig',
                        '#/../webkit/build/webkit_version.py'],
                       "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}")
 env.AlwaysBuild(version)