| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import os | 5 import os |
| 6 | 6 |
| 7 Import(['env']) | 7 Import(['env']) |
| 8 | 8 |
| 9 env = env.Clone() | 9 env = env.Clone() |
| 10 env_res = env.Clone() | 10 env_res = env.Clone() |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 'SConscript.port', | 204 'SConscript.port', |
| 205 'SConscript.javascriptcore_pcre', | 205 'SConscript.javascriptcore_pcre', |
| 206 'build/JSConfig/SConscript', | 206 'build/JSConfig/SConscript', |
| 207 'build/JavaScriptCore/SConscript', | 207 'build/JavaScriptCore/SConscript', |
| 208 'build/port/SConscript', | 208 'build/port/SConscript', |
| 209 'build/V8Bindings/SConscript', | 209 'build/V8Bindings/SConscript', |
| 210 'default_plugin/SConscript', | 210 'default_plugin/SConscript', |
| 211 'glue/SConscript', | 211 'glue/SConscript', |
| 212 'glue/plugins/test/SConscript', | 212 'glue/plugins/test/SConscript', |
| 213 'tools/npapi_layout_test_plugin/SConscript', | 213 'tools/npapi_layout_test_plugin/SConscript', |
| 214 'tools/test_shell/SConscript', |
| 214 ] | 215 ] |
| 215 if env['PLATFORM'] == 'win32': | 216 if env['PLATFORM'] == 'win32': |
| 216 # These extra dirs aren't win32-specific, they're just the dirs that | 217 # These extra dirs aren't win32-specific, they're just the dirs that |
| 217 # haven't yet been made portable. | 218 # haven't yet been made portable. |
| 218 sconscript_dirs.extend([ | 219 sconscript_dirs.extend([ |
| 219 'activex_shim/SConscript', | 220 'activex_shim/SConscript', |
| 220 'activex_shim_dll/SConscript', | 221 'activex_shim_dll/SConscript', |
| 221 'build/localized_strings/SConscript', | 222 'build/localized_strings/SConscript', |
| 222 'build/WebCore/SConscript', # This almost works on linux. It requires | 223 'build/WebCore/SConscript', # This almost works on linux. It requires |
| 223 # some changes to WebKit that we'll get | 224 # some changes to WebKit that we'll get |
| 224 # in the merge. | 225 # in the merge. |
| 225 'tools/test_shell/SConscript', | |
| 226 ]) | 226 ]) |
| 227 | 227 |
| 228 env.Append( | 228 env.Append( |
| 229 CPPDEFINES = [ | 229 CPPDEFINES = [ |
| 230 '_CRT_SECURE_NO_DEPRECATE', | 230 '_CRT_SECURE_NO_DEPRECATE', |
| 231 '_CRT_NONSTDC_NO_WARNINGS', | 231 '_CRT_NONSTDC_NO_WARNINGS', |
| 232 '_CRT_NONSTDC_NO_DEPRECATE', | 232 '_CRT_NONSTDC_NO_DEPRECATE', |
| 233 ['CRASH', '__debugbreak'], | 233 ['CRASH', '__debugbreak'], |
| 234 '_WIN32_WINNT=0x0600', | 234 '_WIN32_WINNT=0x0600', |
| 235 'WINVER=0x0600', | 235 'WINVER=0x0600', |
| (...skipping 23 matching lines...) Expand all Loading... |
| 259 #env.Alias('webkit', ['.', '../icudt38.dll']) | 259 #env.Alias('webkit', ['.', '../icudt38.dll']) |
| 260 if env['PLATFORM'] == 'win32': | 260 if env['PLATFORM'] == 'win32': |
| 261 env.Alias('webkit', ['../icudt38.dll']) | 261 env.Alias('webkit', ['../icudt38.dll']) |
| 262 | 262 |
| 263 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', | 263 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', |
| 264 ['$WEBCORE_DIR/Configurations/Version.xcconfig', | 264 ['$WEBCORE_DIR/Configurations/Version.xcconfig', |
| 265 '#/../webkit/build/webkit_version.py'], | 265 '#/../webkit/build/webkit_version.py'], |
| 266 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") | 266 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") |
| 267 env.AlwaysBuild(version) | 267 env.AlwaysBuild(version) |
| 268 | 268 |
| OLD | NEW |