diff options
| -rw-r--r-- | webkit/SConscript | 9 | ||||
| -rw-r--r-- | webkit/SConscript.javascriptcore_pcre | 15 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 7 |
3 files changed, 19 insertions, 12 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 8fa2049..72cf78b 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -21,7 +21,7 @@ env_res = env.Clone() # # webkit/Hammer/port/ # webkit/port/ -# third_party/WebKit/WebCore +# third_party/WebKit/WebCore/ # # SCons will replicate the compiler and linker -I and -L options so # that the tools will find the right .h and library files. This comes @@ -29,6 +29,13 @@ env_res = env.Clone() # line, but with the benefit that the build should "just work" # regardless of which tree the file lives in, and regardless of whether # or not the file involved is a generated file or checked-in source. +# +# (Note that because the build/SConscript.main file also calls +# addRepository() for the entire $OBJ_ROOT tree, that adds an +# extra -I or -L option for the webkit/port/ subdirectory, after the +# third_party/WebKit/WebCore/ in the above list. We'd like to +# eliminate that in the future, but that will require some +# deeper magic, and maybe a SCons modification.) port_dir = env.Dir('$WEBKIT_DIR/port') port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port')) diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre index 1961d93..eecfa11 100644 --- a/webkit/SConscript.javascriptcore_pcre +++ b/webkit/SConscript.javascriptcore_pcre @@ -29,10 +29,17 @@ if env['PLATFORM'] == 'win32': ], ) -dir = env.Dir('$PCRE_DIR') - -dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/pending')) -dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/pcre')) +# Map Hammer/webkit/port/JavaScriptCore/pcre so it's backed by +# third_party/WebKit/JavaScriptCore/pcre. +# +# TODO(sgk): This can be refactored to work more naturally if we just +# mirror third_party directory structure under webkit/port, instead of +# mapping Javascript => Javascript (here) and Webkit/WebCore => port +# (over in ../build/SConscript.main). + +obj_dir = env.Dir('$PCRE_DIR') +src_dir = env.Dir('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/pcre') +obj_dir.addRepository(src_dir) input_files = [ '$PCRE_DIR/pcre_compile.cpp', diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index b7b42c6..974e7fb 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -479,13 +479,6 @@ idl_files = [ 'xml/XSLTProcessor.idl', ] -for subdir in set([os.path.dirname(n) for n in idl_files]): - dir = env.Dir('$OBJ_ROOT/webkit/port/' + subdir) - - dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/pending')) - dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port/' + subdir)) - dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore/' + subdir)) - for name in idl_files: env.Bindings('$WEBKIT_DIR/port/' + name) |