[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit eb10ce7ac144fcc5a50cb25f7b00c190663d8aba
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 03:25:24 2010 +0000

    2010-08-25  Kwang Yul Seo  <skyul at company100.net>
    
            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: http://svn.webkit.org/repository/webkit/trunk@66076 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 1e80120..f13459a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-25  Kwang Yul Seo  <skyul at company100.net>
+
+        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  <xlopez at igalia.com>
 
         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'])

-- 
WebKit Debian packaging