2011-02-22 Chang Shu <cshu@webkit.org>
[WebKit-https.git] / wscript
diff --git a/wscript b/wscript
index ff9e208..72b9121 100644 (file)
--- a/wscript
+++ b/wscript
@@ -30,7 +30,7 @@ import Options
 from settings import *
 
 if build_port == "wx":
-    webcore_dirs.extend(['WebKit/wx', 'WebKit/wx/WebKitSupport'])
+    webcore_dirs.extend(['Source/WebKit/wx', 'Source/WebKit/wx/WebKitSupport'])
 
 wk_includes = ['.',
                 os.path.join(wk_root, 'Source', 'JavaScriptCore'),
@@ -44,7 +44,7 @@ wk_includes = ['.',
         ]
 
 if build_port == "wx":
-    wk_includes.append(os.path.join(wk_root, 'WebKit', 'wx'))
+    wk_includes.append(os.path.join(wk_root, 'Source', 'WebKit', 'wx'))
     wk_includes.append(os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'wx', 'wxcode'))
 
 if sys.platform.startswith("win"):
@@ -61,8 +61,11 @@ windows_deps = [
 webcore_sources = {}
 
 if build_port == "wx":
-    webcore_sources['wx'] = ['Source/WebCore/platform/KillRingNone.cpp',
-                             'Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp']  
+    webcore_sources['wx'] = [
+        'Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp',
+        'Source/WebCore/platform/KillRingNone.cpp',                     
+        'Source/WebCore/platform/text/LocalizedNumberNone.cpp'
+    ]  
 
     if building_on_win32:
         # make sure platform/wx comes after this so we get the right
@@ -187,7 +190,7 @@ def configure(conf):
 
     if build_port == "wx" and Options.options.wxpython:
         common_configure(conf)
-        conf.check_tool('swig', tooldir='WebKit/wx/bindings/python')
+        conf.check_tool('swig', tooldir='Source/WebKit/wx/bindings/python')
         conf.check_swig_version('1.3.29')
 
 def build(bld):  
@@ -195,7 +198,7 @@ def build(bld):
     global wk_includes
 
     # FIXME: Does this need to be Source/JavaScriptCore?
-    bld.add_subdirs('JavaScriptCore')
+    bld.add_subdirs('Source/JavaScriptCore')
 
     if sys.platform.startswith('darwin'):
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cxx']
@@ -223,6 +226,8 @@ def build(bld):
         if os.path.isdir(fullpath) and not item == "os-win32" and not item == 'icu':
             wk_includes.append(fullpath)
 
+    wk_includes.append('Source')
+    wk_includes.append(os.path.join(jscore_dir, 'collector', 'handles'))
     wk_includes.append(os.path.join(jscore_dir, 'wtf', 'unicode'))
     wk_includes.append(os.path.join(jscore_dir, 'wtf', 'unicode', 'icu'))
     wk_includes += common_includes + full_dirs
@@ -310,8 +315,8 @@ def build(bld):
         excludes.append('ResourceErrorCF.cpp')
         
         if sys.platform.startswith('darwin'):
-            webcore.includes += ' WebKit/mac/WebCoreSupport WebCore/platform/mac'
-            webcore.source += " WebKit/mac/WebCoreSupport/WebSystemInterface.mm"
+            webcore.includes += ' Source/WebKit/mac/WebCoreSupport WebCore/platform/mac'
+            webcore.source += ' Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm'
             
         if building_on_win32:
             for wxlib in bld.env['LIB_WX']:
@@ -327,4 +332,4 @@ def build(bld):
     bld.add_group()
     
     if build_port == "wx":    
-        bld.add_subdirs(['Tools/DumpRenderTree', 'Tools/wx/browser', 'WebKit/wx/bindings/python'])
+        bld.add_subdirs(['Tools/DumpRenderTree', 'Tools/wx/browser', 'Source/WebKit/wx/bindings/python'])