| 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 13 matching lines...) Expand all Loading... |
| 24 # third_party/WebKit/WebCore | 24 # third_party/WebKit/WebCore |
| 25 # | 25 # |
| 26 # SCons will replicate the compiler and linker -I and -L options so | 26 # SCons will replicate the compiler and linker -I and -L options so |
| 27 # that the tools will find the right .h and library files. This comes | 27 # that the tools will find the right .h and library files. This comes |
| 28 # at the cost of tripling the number of -I or -L options on a command | 28 # at the cost of tripling the number of -I or -L options on a command |
| 29 # line, but with the benefit that the build should "just work" | 29 # line, but with the benefit that the build should "just work" |
| 30 # regardless of which tree the file lives in, and regardless of whether | 30 # regardless of which tree the file lives in, and regardless of whether |
| 31 # or not the file involved is a generated file or checked-in source. | 31 # or not the file involved is a generated file or checked-in source. |
| 32 | 32 |
| 33 port_dir = env.Dir('$WEBKIT_DIR/port') | 33 port_dir = env.Dir('$WEBKIT_DIR/port') |
| 34 port_dir.addRepository(env.Dir('#/../webkit/port')) | 34 port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port')) |
| 35 port_dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore')) | 35 port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore')) |
| 36 | 36 |
| 37 if env['PLATFORM'] == 'win32': | 37 if env['PLATFORM'] == 'win32': |
| 38 env['WEBKIT_PLATFORM_SUBDIR'] = 'win' | 38 env['WEBKIT_PLATFORM_SUBDIR'] = 'win' |
| 39 env['JAVASCRIPTCORE_PLATFORM_SUBDIR'] = 'os-win32' | 39 env['JAVASCRIPTCORE_PLATFORM_SUBDIR'] = 'os-win32' |
| 40 elif env['PLATFORM'] == 'darwin': | 40 elif env['PLATFORM'] == 'darwin': |
| 41 env['WEBKIT_PLATFORM_SUBDIR'] = 'mac' | 41 env['WEBKIT_PLATFORM_SUBDIR'] = 'mac' |
| 42 env['JAVASCRIPTCORE_PLATFORM_SUBDIR'] = 'TODO' | 42 env['JAVASCRIPTCORE_PLATFORM_SUBDIR'] = 'TODO' |
| 43 elif env['PLATFORM'] == 'posix': | 43 elif env['PLATFORM'] == 'posix': |
| 44 env['JAVASCRIPTCORE_PLATFORM_SUBDIR'] = 'TODO' | 44 env['JAVASCRIPTCORE_PLATFORM_SUBDIR'] = 'TODO' |
| 45 env.Append( | 45 env.Append( |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 '$JAVASCRIPTCORE_DIR/wtf', | 134 '$JAVASCRIPTCORE_DIR/wtf', |
| 135 '$JAVASCRIPTCORE_DIR/$JAVASCRIPTCORE_PLATFORM_SUBDIR', | 135 '$JAVASCRIPTCORE_DIR/$JAVASCRIPTCORE_PLATFORM_SUBDIR', |
| 136 | 136 |
| 137 '$WEBKIT_DIR/build', | 137 '$WEBKIT_DIR/build', |
| 138 | 138 |
| 139 '$WEBKIT_DIR/port/DerivedSources', | 139 '$WEBKIT_DIR/port/DerivedSources', |
| 140 '$WEBKIT_DIR/port/svg', | 140 '$WEBKIT_DIR/port/svg', |
| 141 '$WEBKIT_DIR/port/svg/animation', | 141 '$WEBKIT_DIR/port/svg/animation', |
| 142 '$WEBKIT_DIR/port/svg/graphics/filters', | 142 '$WEBKIT_DIR/port/svg/graphics/filters', |
| 143 | 143 |
| 144 '#/..', | 144 '$CHROME_SRC_DIR', |
| 145 ], | 145 ], |
| 146 ) | 146 ) |
| 147 | 147 |
| 148 env.Append( | 148 env.Append( |
| 149 WEBCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/WebCore", | 149 WEBCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/WebCore", |
| 150 PENDING_DIR = "$WEBKIT_DIR/pending", | 150 PENDING_DIR = "$WEBKIT_DIR/pending", |
| 151 PORT_DIR = "$WEBKIT_DIR/port", | 151 PORT_DIR = "$WEBKIT_DIR/port", |
| 152 | 152 |
| 153 JAVASCRIPTCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore", | 153 JAVASCRIPTCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore", |
| 154 WTF_DIR = "$JAVASCRIPTCORE_DIR/wtf", | 154 WTF_DIR = "$JAVASCRIPTCORE_DIR/wtf", |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 # errors when SCons tries to use the entire contents of the | 256 # errors when SCons tries to use the entire contents of the |
| 257 # directory tree as a huge content-signature string. | 257 # directory tree as a huge content-signature string. |
| 258 # Instead we're going to let all the subsidiary SConscript files | 258 # Instead we're going to let all the subsidiary SConscript files |
| 259 # add their own individual targets to the 'webkit' Alias. | 259 # add their own individual targets to the 'webkit' Alias. |
| 260 #env.Alias('webkit', ['.', '../icudt38.dll']) | 260 #env.Alias('webkit', ['.', '../icudt38.dll']) |
| 261 if env['PLATFORM'] == 'win32': | 261 if env['PLATFORM'] == 'win32': |
| 262 env.Alias('webkit', ['../icudt38.dll']) | 262 env.Alias('webkit', ['../icudt38.dll']) |
| 263 | 263 |
| 264 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', | 264 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', |
| 265 ['$WEBCORE_DIR/Configurations/Version.xcconfig', | 265 ['$WEBCORE_DIR/Configurations/Version.xcconfig', |
| 266 '#/../webkit/build/webkit_version.py'], | 266 '$CHROME_SRC_DIR/webkit/build/webkit_version.py'], |
| 267 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") | 267 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") |
| 268 env.AlwaysBuild(version) | 268 env.AlwaysBuild(version) |
| 269 | 269 |
| OLD | NEW |