From 56688472f48ff806bc24e74ac0ab5252be65b784 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Thu, 26 Aug 2010 03:25:24 +0000 Subject: [PATCH] 2010-08-25 Kwang Yul Seo Reviewed by Kevin Ollivier. [BREWMP] Add build system https://bugs.webkit.org/show_bug.cgi?id=44645 Make waf script portable so that we can add more ports. * wscript: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@66076 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 11 +++++++++++ wscript | 14 +++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e80120..f13459a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-08-25 Kwang Yul Seo + + Reviewed by Kevin Ollivier. + + [BREWMP] Add build system + https://bugs.webkit.org/show_bug.cgi?id=44645 + + Make waf script portable so that we can add more ports. + + * wscript: + 2010-08-25 Xan Lopez Reviewed by Martin Robinson. diff --git a/wscript b/wscript index 3fac8e2..94ac739 100644 --- a/wscript +++ b/wscript @@ -29,20 +29,23 @@ import Options from settings import * -webcore_dirs.extend(['WebKit/wx', 'WebKit/wx/WebKitSupport']) +if build_port == "wx": + webcore_dirs.extend(['WebKit/wx', 'WebKit/wx/WebKitSupport']) wk_includes = ['.', 'WebCore', 'WebCore/DerivedSources', os.path.join(wk_root, 'JavaScriptCore'), os.path.join(wk_root, 'JavaScriptCore', 'wtf', 'text'), os.path.join(wk_root, 'WebCore'), - os.path.join(wk_root, 'WebKit/wx'), os.path.join(output_dir), 'WebCore/platform/image-decoders', 'WebCore/platform/win', - 'WebCore/platform/wx/wxcode', 'WebCore/workers', ] +if build_port == "wx": + wk_includes.append(os.path.join(wk_root, 'WebKit/wx')) + wk_includes.append('WebCore/platform/wx/wxcode') + if sys.platform.startswith("win"): wk_includes.append(os.path.join(wk_root, 'WebCore','platform','win')) @@ -160,7 +163,7 @@ def configure(conf): common_configure(conf) generate_jscore_derived_sources() generate_webcore_derived_sources() - if sys.platform.startswith('win'): + if build_port == "wx" and sys.platform.startswith('win'): graphics_dir = os.path.join(wk_root, 'WebCore', 'platform', 'graphics') # HACK ALERT: MSVC automatically adds the source file's directory as the first entry in the # path. Unfortunately, that means when compiling these files we will end up including @@ -309,4 +312,5 @@ def build(bld): bld.add_group() - bld.add_subdirs(['WebKitTools/DumpRenderTree', 'WebKitTools/wx/browser', 'WebKit/wx/bindings/python']) + if build_port == "wx": + bld.add_subdirs(['WebKitTools/DumpRenderTree', 'WebKitTools/wx/browser', 'WebKit/wx/bindings/python']) -- 1.8.3.1