diff options
| author | Iain Merrick <husky@google.com> | 2010-08-19 17:55:56 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 11:05:40 +0100 |
| commit | f486d19d62f1bc33246748b14b14a9dfa617b57f (patch) | |
| tree | 195485454c93125455a30e553a73981c3816144d /JavaScriptCore/wscript | |
| parent | 6ba0b43722d16bc295606bec39f396f596e4fef1 (diff) | |
| download | external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2 | |
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'JavaScriptCore/wscript')
| -rw-r--r-- | JavaScriptCore/wscript | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/JavaScriptCore/wscript b/JavaScriptCore/wscript index 8f62349..e50b18d 100644 --- a/JavaScriptCore/wscript +++ b/JavaScriptCore/wscript @@ -29,7 +29,7 @@ import commands from settings import * -jscore_excludes = ['jsc.cpp', 'ucptable.cpp','ProfilerServer.mm', 'ExecutableAllocatorPosix.cpp'] +jscore_excludes = ['chartables.c', 'jsc.cpp', 'ucptable.cpp','ProfilerServer.mm', 'ExecutableAllocatorPosix.cpp'] jscore_excludes.extend(get_excludes(jscore_dir, ['*Brew.cpp', '*CF.cpp', '*Symbian.cpp'])) sources = [] @@ -42,35 +42,6 @@ if building_on_win32: else: jscore_excludes.append('JSStringRefBSTR.cpp') jscore_excludes.extend(get_excludes(jscore_dir, ['*Win.cpp'])) - -def generate_jscore_derived_sources(): - # build the derived sources - js_dir = jscore_dir - if building_on_win32: - js_dir = get_output('cygpath --unix "%s"' % js_dir) - derived_sources_dir = os.path.join(jscore_dir, 'DerivedSources') - if not os.path.exists(derived_sources_dir): - os.mkdir(derived_sources_dir) - - olddir = os.getcwd() - os.chdir(derived_sources_dir) - - # DerivedSources.make expects Cygwin (i.e. Unix-style) python, so use that instead. - if building_on_win32: - oldpath = os.environ["PATH"] - os.environ["PATH"] = "/usr/bin" + os.pathsep + os.environ["PATH"] - command = 'make -f %s/DerivedSources.make JavaScriptCore=%s BUILT_PRODUCTS_DIR=%s all FEATURE_DEFINES="%s"' % (js_dir, js_dir, js_dir, ' '.join(feature_defines)) - os.system(command) - if building_on_win32: - os.environ["PATH"] = oldpath - os.chdir(olddir) - -def set_options(opt): - common_set_options(opt) - -def configure(conf): - common_configure(conf) - generate_jscore_derived_sources() def build(bld): import Options @@ -91,9 +62,8 @@ def build(bld): uselib_local = '', install_path = output_dir) - jscore.find_sources_in_dirs(full_dirs, excludes = jscore_excludes) - - + jscore.find_sources_in_dirs(full_dirs, excludes = jscore_excludes) + obj = bld.new_task_gen( features = 'cxx cprogram', includes = '. .. assembler DerivedSources ForwardingHeaders ' + ' '.join(includes), |