2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* WebKit.grd:
* WebKit.gyp:
2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* Api/DerivedSources.pro:
* declarative/declarative.pro:
* docs/docs.pri:
* tests/tests.pri:
2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* GNUmakefile.am:
2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* GNUmakefile.am:
2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* Makefile:
* scripts/generate-webkitversion.pl:
2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* WebKit.vcproj/Interfaces.vcproj:
* WebKit.vcproj/WebKit.sln:
* WebKit.vcproj/WebKit.vcproj:
* WebKit.vcproj/WebKitGUID.vcproj:
2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* Android.mk:
* CMakeLists.txt:
* DerivedSources.pro:
* GNUmakefile.am:
* Makefile:
* WebKit.pri:
* WebKit.pro:
* configure.ac:
* wscript:
2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h:
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
* DumpRenderTree/qt/DumpRenderTreeQt.h:
* DumpRenderTree/qt/GCControllerQt.cpp:
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
* DumpRenderTree/qt/PlainTextControllerQt.cpp:
* DumpRenderTree/qt/TextInputControllerQt.cpp:
* DumpRenderTree/wscript:
* QtTestBrowser/launcherwindow.h:
* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* JavaScriptCore.gyp/JavaScriptCore.gyp:
2011-01-16 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit into Source
https://bugs.webkit.org/show_bug.cgi?id=52530
* WebCore.gyp/WebCore.gyp:
* WebCore.pri:
* WebCore.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75908 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/wscript b/wscript
index ff9e208..d0c1fae 100644
--- a/wscript
+++ b/wscript
@@ -30,7 +30,7 @@
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 @@
]
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"):
@@ -187,7 +187,7 @@
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):
@@ -310,8 +310,8 @@
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 +327,4 @@
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'])