2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
Remove reference to old directory.
* PrettyPatch/PrettyPatch.rb:
2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
Update references to WebCore.
* WebKit.grd:
* WebKit.gyp:
2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
Update documentation to reference new location of WebCore.
* docs/qtwebkit.qdoc:
2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
* GNUmakefile.am:
2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
* WebKit.vcproj/WebKit.sln:
2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
* bindings/python/wscript:
* wscript:
2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
Update project files to understand WebCore's new location. I suspect
there will be some follow-up patches after we land this patch.
* Android.derived.jscbindings.mk:
* Android.jscbindings.mk:
* Android.v8bindings.mk:
* GNUmakefile.am:
* WebCore.gyp/WebCore.gyp:
* WebCore.pri:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcproj/WebCoreGeneratedCairo.vsprops:
* WebCore.vcproj/WebCoreGeneratedCommon.vsprops:
2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
Update build files and metadata to point to WebCore's new location.
* .gitattributes:
* .gitignore:
* Android.mk:
* CMakeLists.txt:
* DerivedSources.pro:
* GNUmakefile.am:
* Makefile:
* Source/autotools/webkit.m4:
* Source/cmake/OptionsEfl.cmake:
* WebKit.pri:
* WebKit.pro:
* configure.ac:
* wscript:
2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
Update the tools to understand WebCore's new location.
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
* DumpRenderTree/wscript:
* GNUmakefile.am:
* Scripts/build-webkit:
* Scripts/do-file-rename:
* Scripts/do-webcore-rename:
* Scripts/generate-qt-inspector-resource:
* Scripts/prepare-ChangeLog:
* Scripts/run-bindings-tests:
* Scripts/update-iexploder-cssproperties:
* Scripts/update-sources-list.py:
* Scripts/update-webkit-localizable-strings:
* Scripts/webkitdirs.pm:
* Scripts/webkitpy/common/config/build.py:
* Scripts/webkitpy/common/config/build_unittest.py:
* Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py:
* Scripts/webkitpy/style/checker.py:
* Scripts/webkitpy/style/checker_unittest.py:
* WebKitTestRunner/DerivedSources.pro:
* WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
* iExploder/iexploder-1.7.2/tools/update_html_tags_from_sources.sh:
* wx/browser/wscript:
* wx/build/settings.py:
2011-01-07 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebCore to Source
https://bugs.webkit.org/show_bug.cgi?id=52050
* WebKit2.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75313 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/wscript b/wscript
index ff60062..2915f09 100644
--- a/wscript
+++ b/wscript
@@ -32,23 +32,24 @@
if build_port == "wx":
webcore_dirs.extend(['WebKit/wx', 'WebKit/wx/WebKitSupport'])
-wk_includes = ['.', 'WebCore', 'WebCore/DerivedSources',
+wk_includes = ['.',
os.path.join(wk_root, 'Source', 'JavaScriptCore'),
os.path.join(wk_root, 'Source', 'JavaScriptCore', 'wtf', 'text'),
- os.path.join(wk_root, 'WebCore'),
+ os.path.join(wk_root, 'Source', 'WebCore'),
+ os.path.join(wk_root, 'Source', 'WebCore', 'DerivedSources'),
+ os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'image-decoders'),
+ os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'win'),
+ os.path.join(wk_root, 'Source', 'WebCore', 'workers'),
os.path.join(output_dir),
- 'WebCore/platform/image-decoders',
- 'WebCore/platform/win',
- 'WebCore/workers',
]
if build_port == "wx":
- wk_includes.append(os.path.join(wk_root, 'WebKit/wx'))
- wk_includes.append('WebCore/platform/wx/wxcode')
+ wk_includes.append(os.path.join(wk_root, 'WebKit', 'wx'))
+ wk_includes.append(os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'wx', 'wxcode')
if sys.platform.startswith("win"):
- wk_includes.append(os.path.join(wk_root, 'WebCore','platform','win'))
- wk_includes.append(os.path.join(wk_root, 'WebCore','platform','graphics','win'))
+ wk_includes.append(os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'win'))
+ wk_includes.append(os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'graphics', 'win'))
windows_deps = [
'lib/pthreadVC2.dll',
@@ -60,56 +61,57 @@
webcore_sources = {}
if build_port == "wx":
- webcore_sources['wx'] = ['WebCore/platform/KillRingNone.cpp', 'WebCore/bindings/cpp/WebDOMEventTarget.cpp']
+ webcore_sources['wx'] = ['Source/WebCore/platform/KillRingNone.cpp',
+ 'Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp']
if building_on_win32:
# make sure platform/wx comes after this so we get the right
# FontPlatformData.h
- webcore_dirs.extend(['WebCore/platform/wx/wxcode/win', 'WebCore/plugins/win'])
+ webcore_dirs.extend(['Source/WebCore/platform/wx/wxcode/win', 'Source/WebCore/plugins/win'])
webcore_sources['wx-win'] = [
- 'WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp',
- 'WebCore/platform/graphics/win/TransformationMatrixWin.cpp',
- 'WebCore/platform/ScrollAnimatorWin.cpp',
+ 'Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp',
+ 'Source/WebCore/platform/graphics/win/TransformationMatrixWin.cpp',
+ 'Source/WebCore/platform/ScrollAnimatorWin.cpp',
# wxTimer on Windows has a bug that causes it to eat crashes in callbacks
# so we need to use the Win port's implementation until the wx bug fix is
# widely available (it was fixed in 2.8.10).
- 'WebCore/platform/win/SharedTimerWin.cpp',
- 'WebCore/platform/win/WebCoreInstanceHandle.cpp',
+ 'Source/WebCore/platform/win/SharedTimerWin.cpp',
+ 'Source/WebCore/platform/win/WebCoreInstanceHandle.cpp',
# Use the Windows plugin architecture
- #'WebCore/plugins/win/PluginDataWin.cpp',
- 'WebCore/plugins/win/PluginDatabaseWin.cpp',
- 'WebCore/plugins/win/PluginMessageThrottlerWin.cpp',
- 'WebCore/plugins/win/PluginPackageWin.cpp',
- 'WebCore/plugins/win/PluginViewWin.cpp',
+ #'Source/WebCore/plugins/win/PluginDataWin.cpp',
+ 'Source/WebCore/plugins/win/PluginDatabaseWin.cpp',
+ 'Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp',
+ 'Source/WebCore/plugins/win/PluginPackageWin.cpp',
+ 'Source/WebCore/plugins/win/PluginViewWin.cpp',
]
elif sys.platform.startswith('darwin'):
- webcore_dirs.append('WebCore/plugins/mac')
- webcore_dirs.append('WebCore/platform/wx/wxcode/mac/carbon')
- webcore_dirs.append('WebCore/platform/mac')
- webcore_dirs.append('WebCore/platform/text/mac')
+ webcore_dirs.append('Source/WebCore/plugins/mac')
+ webcore_dirs.append('Source/WebCore/platform/wx/wxcode/mac/carbon')
+ webcore_dirs.append('Source/WebCore/platform/mac')
+ webcore_dirs.append('Source/WebCore/platform/text/mac')
webcore_sources['wx-mac'] = [
- 'WebCore/platform/mac/PurgeableBufferMac.cpp',
- 'WebCore/platform/mac/WebCoreNSStringExtras.mm',
- 'WebCore/platform/mac/WebCoreSystemInterface.mm',
- 'WebCore/platform/graphics/cg/FloatSizeCG.cpp',
- 'WebCore/platform/graphics/mac/ComplexTextController.cpp',
- 'WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp',
- 'WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp',
- 'WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp',
- 'WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm',
- 'WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp',
- 'WebCore/platform/graphics/wx/FontPlatformDataWxMac.mm',
- 'WebCore/platform/text/mac/ShapeArabic.c',
- 'WebCore/platform/wx/wxcode/mac/carbon/fontprops.mm',
- 'WebCore/plugins/mac/PluginPackageMac.cpp',
- 'WebCore/plugins/mac/PluginViewMac.mm'
+ 'Source/WebCore/platform/mac/PurgeableBufferMac.cpp',
+ 'Source/WebCore/platform/mac/WebCoreNSStringExtras.mm',
+ 'Source/WebCore/platform/mac/WebCoreSystemInterface.mm',
+ 'Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp',
+ 'Source/WebCore/platform/graphics/mac/ComplexTextController.cpp',
+ 'Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp',
+ 'Source/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp',
+ 'Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp',
+ 'Source/WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm',
+ 'Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp',
+ 'Source/WebCore/platform/graphics/wx/FontPlatformDataWxMac.mm',
+ 'Source/WebCore/platform/text/mac/ShapeArabic.c',
+ 'Source/WebCore/platform/wx/wxcode/mac/carbon/fontprops.mm',
+ 'Source/WebCore/plugins/mac/PluginPackageMac.cpp',
+ 'Source/WebCore/plugins/mac/PluginViewMac.mm'
]
else:
webcore_sources['wx-gtk'] = [
- 'WebCore/plugins/PluginViewNone.cpp',
- 'WebCore/plugins/PluginPackageNone.cpp'
+ 'Source/WebCore/plugins/PluginViewNone.cpp',
+ 'Source/WebCore/plugins/PluginPackageNone.cpp'
]
- webcore_dirs.append('WebCore/platform/wx/wxcode/gtk')
+ webcore_dirs.append('Source/WebCore/platform/wx/wxcode/gtk')
import TaskGen
from TaskGen import taskgen, feature, after
@@ -166,7 +168,7 @@
generate_jscore_derived_sources()
generate_webcore_derived_sources()
if build_port == "wx" and sys.platform.startswith('win'):
- graphics_dir = os.path.join(wk_root, 'WebCore', 'platform', 'graphics')
+ graphics_dir = os.path.join(wk_root, 'Source', '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
# win/FontPlatformData.h, which breaks wx compilation. So we copy the files to the wx dir.
@@ -176,7 +178,7 @@
webcore_out_dir = os.path.join(output_dir, 'WebCore')
if not os.path.exists(webcore_out_dir):
os.makedirs(webcore_out_dir)
- shutil.copy('WebCore/platform/mac/WebCoreSystemInterface.h', os.path.join(output_dir, 'WebCore', 'WebCoreSystemInterface.h'))
+ shutil.copy('Source/WebCore/platform/mac/WebCoreSystemInterface.h', os.path.join(output_dir, 'WebCore', 'WebCoreSystemInterface.h'))
jscore_out_dir = os.path.join(output_dir, 'JavaScriptCore')
if not os.path.exists(jscore_out_dir):
os.makedirs(jscore_out_dir)
