Commit 8ac7e159 authored by abarth@webkit.org's avatar abarth@webkit.org

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
parent 462cd43f
......@@ -187,28 +187,34 @@ LayoutTests/tables/mozilla_expected_failures/images/aboutHeader.gif -crlf
LayoutTests/tables/mozilla_expected_failures/images/main-horizontal-scroll.gif -crlf
LayoutTests/wml/resources/enter-card-with-events.wml -crlf
LayoutTests/wml/resources/enter-first-card-with-events.wml -crlf
PageLoadTests/svg/files/Harvey_Rayner.svg -crlf
PageLoadTests/svg/files/cacuts_01.svg -crlf
PageLoadTests/svg/files/crawfish2_ganson.svg -crlf
PageLoadTests/svg/files/france.svg -crlf
PageLoadTests/svg/files/mtsthelens.svg -crlf
PageLoadTests/svg/files/worldcup.svg -crlf
PlanetWebKit/planet/LICENCE -crlf
SunSpider/tests/parse-only/jquery-1.3.2.js -crlf
WebCore/accessibility/AccessibilityAllInOne.cpp -crlf
WebCore/bindings/js/JSExceptionBase.cpp -crlf
WebCore/bindings/js/JSExceptionBase.h -crlf
WebCore/manual-tests/DOMContextMenuEvent.html -crlf
WebCore/manual-tests/cursor-max-size.html -crlf
WebCore/manual-tests/drag-with-div-or-image-as-data-image.html -crlf
WebCore/manual-tests/empty-script-crash.html -crlf
WebCore/manual-tests/remove-form-node-with-radio-buttons-crash.html -crlf
WebCore/manual-tests/select-delete-item.html -crlf
WebCore/manual-tests/textarea-caret-position-after-auto-spell-correct.html -crlf
WebCore/platform/chromium/SuddenTerminationChromium.cpp -crlf
WebCore/platform/network/win/NetworkStateNotifierWin.cpp -crlf
WebCore/platform/wx/wxcode/non-kerned-drawing.h -crlf
WebCore/rendering/RenderThemeChromiumWin.h -crlf
PerformanceTests/PageLoad/svg/files/Harvey_Rayner.svg -crlf
PerformanceTests/PageLoad/svg/files/cacuts_02.svg -crlf
PerformanceTests/PageLoad/svg/files/crawfish2_ganson.svg -crlf
PerformanceTests/PageLoad/svg/files/france.svg -crlf
PerformanceTests/PageLoad/svg/files/mtsthelens.svg -crlf
PerformanceTests/PageLoad/svg/files/worldcup.svg -crlf
PerformanceTests/SunSpider/tests/parse-only/jquery-1.3.2.js -crlf
Source/WebCore/accessibility/AccessibilityAllInOne.cpp -crlf
Source/WebCore/bindings/js/JSExceptionBase.cpp -crlf
Source/WebCore/bindings/js/JSExceptionBase.h -crlf
Source/WebCore/manual-tests/DOMContextMenuEvent.html -crlf
Source/WebCore/manual-tests/cursor-max-size.html -crlf
Source/WebCore/manual-tests/drag-with-div-or-image-as-data-image.html -crlf
Source/WebCore/manual-tests/empty-script-crash.html -crlf
Source/WebCore/manual-tests/remove-form-node-with-radio-buttons-crash.html -crlf
Source/WebCore/manual-tests/select-delete-item.html -crlf
Source/WebCore/manual-tests/textarea-caret-position-after-auto-spell-correct.html -crlf
Source/WebCore/platform/chromium/SuddenTerminationChromium.cpp -crlf
Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp -crlf
Source/WebCore/platform/wx/wxcode/non-kerned-drawing.h -crlf
Source/WebCore/rendering/RenderThemeChromiumWin.h -crlf
Tools/BuildSlaveSupport/win/kill-old-processes -crlf
Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp -crlf
Tools/FindSafari/Safari.exe.manifest -crlf
Tools/MiniBrowser/win/MiniBrowser.rc -crlf
Tools/TestResultServer/index.yaml -crlf
Tools/WinLauncher/WinLauncher.h -crlf
Tools/record-memory-win/main.cpp -crlf
WebKit/chromium/src/EventListenerWrapper.cpp -crlf
WebKit/chromium/src/EventListenerWrapper.h -crlf
WebKit/chromium/src/WebEventListener.cpp -crlf
......@@ -227,6 +233,7 @@ WebKit/win/WebCoreSupport/EmbeddedWidget.h -crlf
WebKit/win/WebCoreSupport/WebInspectorDelegate.h -crlf
WebKit/win/WebIconFetcher.cpp -crlf
WebKit/win/WebIconFetcher.h -crlf
Websites/planet.webkit.org/planet/LICENCE -crlf
Websites/webkit.org/blog/license.txt -crlf
Websites/webkit.org/blog/wp-config-sample.php -crlf
Websites/webkit.org/blog/wp-config.php -crlf
......@@ -235,10 +242,3 @@ Websites/webkit.org/blog/wp-includes/js/scriptaculous/MIT-LICENSE -crlf
Websites/webkit.org/blog/wp-includes/js/swfupload/plugins/swfupload.speed.js -crlf
Websites/webkit.org/blog/wp-includes/js/tinymce/license.txt -crlf
Websites/webkit.org/perf/slickspeed/frameworks/DomQuery.js -crlf
Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp -crlf
Tools/FindSafari/Safari.exe.manifest -crlf
Tools/WinLauncher/WinLauncher.h -crlf
Tools/record-memory-win/main.cpp -crlf
Tools/TestResultServer/index.yaml -crlf
Tools/BuildSlaveSupport/win/kill-old-processes -crlf
Tools/MiniBrowser/win/MiniBrowser.rc -crlf
......@@ -19,13 +19,13 @@ Source/JavaScriptCore/JavaScriptCore.gyp/*.mk
Source/JavaScriptCore/JavaScriptCore.gyp/*.sln
Source/JavaScriptCore/JavaScriptCore.gyp/*.vcproj*
Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj
WebCore/WebCore.gyp/*.Makefile
WebCore/WebCore.gyp/*.mk
WebCore/WebCore.gyp/*.rules
WebCore/WebCore.gyp/*.sln
WebCore/WebCore.gyp/*.tmp
WebCore/WebCore.gyp/*.vcproj*
WebCore/WebCore.gyp/WebCore.xcodeproj
Source/WebCore/WebCore.gyp/*.Makefile
Source/WebCore/WebCore.gyp/*.mk
Source/WebCore/WebCore.gyp/*.rules
Source/WebCore/WebCore.gyp/*.sln
Source/WebCore/WebCore.gyp/*.tmp
Source/WebCore/WebCore.gyp/*.vcproj*
Source/WebCore/WebCore.gyp/WebCore.xcodeproj
WebKit/chromium/*.Makefile
WebKit/chromium/*.mk
WebKit/chromium/*.sln
......
......@@ -89,45 +89,45 @@ LOCAL_C_INCLUDES := \
frameworks/base/core/jni/android/graphics
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/WebCore \
$(LOCAL_PATH)/WebCore/accessibility \
$(LOCAL_PATH)/WebCore/bindings/generic \
$(LOCAL_PATH)/WebCore/css \
$(LOCAL_PATH)/WebCore/dom \
$(LOCAL_PATH)/WebCore/editing \
$(LOCAL_PATH)/WebCore/history \
$(LOCAL_PATH)/WebCore/history/android \
$(LOCAL_PATH)/WebCore/html \
$(LOCAL_PATH)/WebCore/html/canvas \
$(LOCAL_PATH)/WebCore/inspector \
$(LOCAL_PATH)/WebCore/loader \
$(LOCAL_PATH)/WebCore/loader/appcache \
$(LOCAL_PATH)/WebCore/loader/icon \
$(LOCAL_PATH)/WebCore/notifications \
$(LOCAL_PATH)/WebCore/page \
$(LOCAL_PATH)/WebCore/page/android \
$(LOCAL_PATH)/WebCore/page/animation \
$(LOCAL_PATH)/WebCore/platform \
$(LOCAL_PATH)/WebCore/platform/android \
$(LOCAL_PATH)/WebCore/platform/animation \
$(LOCAL_PATH)/WebCore/platform/graphics \
$(LOCAL_PATH)/WebCore/platform/graphics/android \
$(LOCAL_PATH)/WebCore/platform/graphics/network \
$(LOCAL_PATH)/WebCore/platform/graphics/skia \
$(LOCAL_PATH)/WebCore/platform/graphics/transforms \
$(LOCAL_PATH)/WebCore/platform/image-decoders \
$(LOCAL_PATH)/WebCore/platform/mock \
$(LOCAL_PATH)/WebCore/platform/network \
$(LOCAL_PATH)/WebCore/platform/network/android \
$(LOCAL_PATH)/WebCore/platform/sql \
$(LOCAL_PATH)/WebCore/platform/text \
$(LOCAL_PATH)/WebCore/plugins \
$(LOCAL_PATH)/WebCore/plugins/android \
$(LOCAL_PATH)/WebCore/rendering \
$(LOCAL_PATH)/WebCore/rendering/style \
$(LOCAL_PATH)/WebCore/storage \
$(LOCAL_PATH)/WebCore/workers \
$(LOCAL_PATH)/WebCore/xml
$(LOCAL_PATH)/Source/WebCore \
$(LOCAL_PATH)/Source/WebCore/accessibility \
$(LOCAL_PATH)/Source/WebCore/bindings/generic \
$(LOCAL_PATH)/Source/WebCore/css \
$(LOCAL_PATH)/Source/WebCore/dom \
$(LOCAL_PATH)/Source/WebCore/editing \
$(LOCAL_PATH)/Source/WebCore/history \
$(LOCAL_PATH)/Source/WebCore/history/android \
$(LOCAL_PATH)/Source/WebCore/html \
$(LOCAL_PATH)/Source/WebCore/html/canvas \
$(LOCAL_PATH)/Source/WebCore/inspector \
$(LOCAL_PATH)/Source/WebCore/loader \
$(LOCAL_PATH)/Source/WebCore/loader/appcache \
$(LOCAL_PATH)/Source/WebCore/loader/icon \
$(LOCAL_PATH)/Source/WebCore/notifications \
$(LOCAL_PATH)/Source/WebCore/page \
$(LOCAL_PATH)/Source/WebCore/page/android \
$(LOCAL_PATH)/Source/WebCore/page/animation \
$(LOCAL_PATH)/Source/WebCore/platform \
$(LOCAL_PATH)/Source/WebCore/platform/android \
$(LOCAL_PATH)/Source/WebCore/platform/animation \
$(LOCAL_PATH)/Source/WebCore/platform/graphics \
$(LOCAL_PATH)/Source/WebCore/platform/graphics/android \
$(LOCAL_PATH)/Source/WebCore/platform/graphics/network \
$(LOCAL_PATH)/Source/WebCore/platform/graphics/skia \
$(LOCAL_PATH)/Source/WebCore/platform/graphics/transforms \
$(LOCAL_PATH)/Source/WebCore/platform/image-decoders \
$(LOCAL_PATH)/Source/WebCore/platform/mock \
$(LOCAL_PATH)/Source/WebCore/platform/network \
$(LOCAL_PATH)/Source/WebCore/platform/network/android \
$(LOCAL_PATH)/Source/WebCore/platform/sql \
$(LOCAL_PATH)/Source/WebCore/platform/text \
$(LOCAL_PATH)/Source/WebCore/plugins \
$(LOCAL_PATH)/Source/WebCore/plugins/android \
$(LOCAL_PATH)/Source/WebCore/rendering \
$(LOCAL_PATH)/Source/WebCore/rendering/style \
$(LOCAL_PATH)/Source/WebCore/storage \
$(LOCAL_PATH)/Source/WebCore/workers \
$(LOCAL_PATH)/Source/WebCore/xml
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/WebKit/android \
......@@ -144,19 +144,19 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/Source/JavaScriptCore/wtf/unicode/icu
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(base_intermediates)/WebCore/ \
$(base_intermediates)/WebCore/css \
$(base_intermediates)/WebCore/html \
$(base_intermediates)/WebCore/platform
$(base_intermediates)/Source/WebCore/ \
$(base_intermediates)/Source/WebCore/css \
$(base_intermediates)/Source/WebCore/html \
$(base_intermediates)/Source/WebCore/platform
ifeq ($(ENABLE_SVG), true)
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/WebCore/platform/graphics/filters \
$(LOCAL_PATH)/WebCore/svg \
$(LOCAL_PATH)/WebCore/svg/animation \
$(LOCAL_PATH)/WebCore/svg/graphics \
$(LOCAL_PATH)/WebCore/svg/graphics/filters \
$(base_intermediates)/WebCore/svg
$(LOCAL_PATH)/Source/WebCore/platform/graphics/filters \
$(LOCAL_PATH)/Source/WebCore/svg \
$(LOCAL_PATH)/Source/WebCore/svg/animation \
$(LOCAL_PATH)/Source/WebCore/svg/graphics \
$(LOCAL_PATH)/Source/WebCore/svg/graphics/filters \
$(base_intermediates)/Source/WebCore/svg
endif
ifeq ($(JAVASCRIPT_ENGINE),v8)
......
......@@ -10,7 +10,7 @@ ENDIF ()
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
......@@ -105,7 +105,7 @@ INCLUDE(WebKitPackaging)
# Add module directories
# -----------------------------------------------------------------------------
ADD_SUBDIRECTORY(Source/JavaScriptCore)
ADD_SUBDIRECTORY(WebCore)
ADD_SUBDIRECTORY(Source/WebCore)
ADD_SUBDIRECTORY(WebKit)
# -----------------------------------------------------------------------------
......
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-06 Martin Robinson <mrobinson@igalia.com>
Reviewed by Eric Seidel.
......
......@@ -3,7 +3,7 @@ CONFIG += ordered
SUBDIRS += \
Source/JavaScriptCore/DerivedSources.pro \
WebCore/DerivedSources.pro \
Source/WebCore/DerivedSources.pro \
WebKit/qt/Api/DerivedSources.pro
webkit2 {
......
......@@ -37,7 +37,7 @@ GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
GENPROGRAMS := $(top_builddir)/Programs
GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
WebCore := $(srcdir)/WebCore
WebCore := $(srcdir)/Source/WebCore
WebKit := $(srcdir)/WebKit/gtk
WebKit2 := $(srcdir)/WebKit2
......@@ -220,12 +220,12 @@ EXTRA_DIST += \
# Include module makefiles
include Source/JavaScriptCore/GNUmakefile.am
include WebCore/GNUmakefile.am
include Source/WebCore/GNUmakefile.am
if ENABLE_WEBKIT2
include WebKit2/GNUmakefile.am
else
include WebKit/gtk/GNUmakefile.am
include WebCore/bindings/gobject/GNUmakefile.am
include Source/WebCore/bindings/gobject/GNUmakefile.am
include Tools/GNUmakefile.am
include WebKit/gtk/po/GNUmakefile.am
endif
......
MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE WebCore WebKit WebKit2 Tools
MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE Source/WebCore WebKit WebKit2 Tools
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
......
......@@ -147,7 +147,7 @@ AC_MSG_RESULT([$with_unicode_backend])
if test "$with_unicode_backend" = "icu"; then
case "$host" in
*-*-darwin*)
UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/WebCore/icu"
UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
UNICODE_LIBS="-licucore"
;;
*-*-mingw*)
......
......@@ -5,8 +5,8 @@ SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_
# -----------------------------------------------------------------------------
# We mention Safari version because many sites check for it.
# Sync with WebCore/Configurations/Version.xcconfig whenever Safari is version
# up.
# Sync with Source/WebCore/Configurations/Version.xcconfig whenever Safari is
# version up.
# -----------------------------------------------------------------------------
SET(USER_AGENT_VERSION_MAJOR 534)
SET(USER_AGENT_VERSION_MINOR 16)
......
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 Maciej Stachowiak <mjs@apple.com>
Reviewed by Sam Weinig.
......@@ -21,8 +21,8 @@ mac {
INCLUDEPATH += ../../../../Source/JavaScriptCore \
../../unix/TestNetscapePlugin/ForwardingHeaders \
../../unix/TestNetscapePlugin/ForwardingHeaders/WebKit \
../../../../WebCore \
../../../../WebCore/bridge \
../../../../Source/WebCore \
../../../../Source/WebCore/bridge \
../../TestNetscapePlugIn
SOURCES = PluginObject.cpp \
......
......@@ -32,8 +32,8 @@ from settings import *
include_paths = [
os.path.join(output_dir),
os.path.join(wk_root, 'Source', 'JavaScriptCore'),
os.path.join(wk_root, 'WebCore'),
os.path.join(wk_root, 'WebCore', 'bindings', 'wx'),
os.path.join(wk_root, 'Source', 'WebCore'),
os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'wx'),
os.path.join(wk_root, 'WebKit', 'wx'),
'.',
'wx'
......
......@@ -6,7 +6,7 @@ noinst_PROGRAMS += \
# GtkLauncher
Programs_GtkLauncher_CPPFLAGS = \
-I$(srcdir)/WebKit/gtk \
-I$(srcdir)/WebCore/platform/network/soup/cache/ \
-I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \
-I$(top_builddir)/WebKit/gtk \
-I$(top_builddir)/DerivedSources \
$(global_cppflags) \
......@@ -38,8 +38,8 @@ dumprendertree_cppflags := \
-I$(srcdir)/Tools/DumpRenderTree/cairo \
-I$(srcdir)/Tools/DumpRenderTree/gtk \
-I$(srcdir)/WebKit/gtk \
-I$(srcdir)/WebCore/platform/gtk \
-I$(srcdir)/WebCore/platform/network/soup/cache/ \
-I$(srcdir)/Source/WebCore/platform/gtk \
-I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \
-I$(top_builddir)/WebKit/gtk \
-I$(top_builddir)/DerivedSources \
$(global_cppflags) \
......@@ -81,7 +81,7 @@ Programs_DumpRenderTree_SOURCES = \
Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \
Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp \
Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp \
WebCore/platform/gtk/GtkVersioning.c
Source/WebCore/platform/gtk/GtkVersioning.c
Programs_DumpRenderTree_CXXFLAGS = \
$(global_cxxflags) \
......@@ -155,9 +155,9 @@ dumprendertree_cppflags += \
TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \
-I$(srcdir)/Tools/DumpRenderTree \
-I$(srcdir)/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders \
-I$(srcdir)/WebCore \
-I$(srcdir)/WebCore/bridge \
-I$(srcdir)/WebCore/plugins \
-I$(srcdir)/Source/WebCore \
-I$(srcdir)/Source/WebCore/bridge \
-I$(srcdir)/Source/WebCore/plugins \
-I$(srcdir)/Tools/DumpRenderTree/TestNetscapePlugIn \
$(global_cppflags) \
$(javascriptcore_cppflags)
......
......@@ -377,7 +377,7 @@ sub unlinkZeroFiles ()
}
# Check that all the project directories are there.
my @projects = ("Source/JavaScriptCore", "WebCore", "WebKit");
my @projects = ("Source/JavaScriptCore", "Source/WebCore", "WebKit");
my @otherDirs = ("WebKitLibraries");
for my $dir (@projects, @otherDirs) {
......
......@@ -45,7 +45,7 @@ my %words;
my @paths;
find(\&wanted, "Source/JavaScriptCore");
find(\&wanted, "Source/JavaScriptGlue");
find(\&wanted, "WebCore");
find(\&wanted, "Source/WebCore");
find(\&wanted, "WebKit");
find(\&wanted, "WebKit2");
......
......@@ -71,7 +71,7 @@ my %directoriesToIgnore = map { $_ => 1 } @directoriesToIgnoreList;
my @paths;
find(\&wanted, "Source/JavaScriptCore");
find(\&wanted, "Source/JavaScriptGlue");
find(\&wanted, "WebCore");
find(\&wanted, "Source/WebCore");
find(\&wanted, "WebKit");
find(\&wanted, "WebKit2");
find(\&wanted, "Tools/DumpRenderTree");
......
......@@ -33,20 +33,20 @@ sub addFiles(@)
my @files = @_;
foreach $file (@files) {
$file =~ s,WebCore/inspector/front-end/,,;
$file =~ s,Source/WebCore/inspector/front-end/,,;
print WEBKIT_QRC " <file>".$file . "</file>\n";
}
}
# Setup
open(WEBKIT_QRC, ">WebCore/inspector/front-end/WebKit.qrc") or die;
open(WEBKIT_QRC, ">Source/WebCore/inspector/front-end/WebKit.qrc") or die;
print WEBKIT_QRC '<!DOCTYPE RCC><RCC version="1.0">'."\n";
print WEBKIT_QRC '<qresource prefix="/webkit/inspector">'."\n";
# Directory with html and js files and the images
addFiles(<WebCore/inspector/front-end/*.{*html,js,css,svg}>);
addFiles(<WebCore/inspector/front-end/Images/*>);
addFiles(<Source/WebCore/inspector/front-end/*.{*html,js,css,svg}>);
addFiles(<Source/WebCore/inspector/front-end/Images/*>);
print WEBKIT_QRC "</qresource>\n";
print WEBKIT_QRC "</RCC>\n";
......
......@@ -319,7 +319,7 @@ foreach my $prefix (keys %files) {
$sortKey = "-, just after top level";
} elsif ($prefixDir eq "WebBrowser") {
$sortKey = lc "WebKit, WebBrowser after";
} elsif ($prefixDir eq "WebCore") {
} elsif ($prefixDir eq "Source/WebCore") {
$sortKey = lc "WebFoundation, WebCore after";
} elsif ($prefixDir eq "LayoutTests") {
$sortKey = lc "~, LayoutTests last";
......
......@@ -39,8 +39,8 @@ from webkitpy.common.checkout import scm
def generate_from_idl(generator, idl_file, output_directory):
cmd = ['perl', '-w',
'-IWebCore/bindings/scripts',
'WebCore/bindings/scripts/generate-bindings.pl',
'-ISource/WebCore/bindings/scripts',
'Source/WebCore/bindings/scripts/generate-bindings.pl',
# idl include directories (path relative to generate-bindings.pl)
'--include', '.',
'--defines', 'TESTING_%s' % generator,
......@@ -120,8 +120,8 @@ def main(argv):
]
for generator in generators:
input_directory = os.path.join('WebCore', 'bindings', 'scripts', 'test')
reference_directory = os.path.join('WebCore', 'bindings', 'scripts', 'test', generator)
input_directory = os.path.join('Source', 'WebCore', 'bindings', 'scripts', 'test')
reference_directory = os.path.join('Source', 'WebCore', 'bindings', 'scripts', 'test', generator)
if not run_tests(generator, input_directory, reference_directory, reset_results):
all_tests_passed = False
......
......@@ -110,7 +110,7 @@ sub update($$)
my ($iexploderPath, $webcorePath) = @_;
$iexploderPath = File::Spec->catfile(sourceDir(), "Tools", "iExploder", "iExploder-1.3.2", "htdocs", split("/", $iexploderPath));
$webcorePath = File::Spec->catfile(sourceDir(), "WebCore", split("/", $webcorePath));
$webcorePath = File::Spec->catfile(sourceDir(), "Source", "WebCore", split("/", $webcorePath));
my @sections = readiExploderFile($iexploderPath);
$sections[0] = generateEntityListFromFile($webcorePath);
......
......@@ -40,7 +40,7 @@ def getWebCoreFilesDict():
"""
sources = {}
sources_prefix = "WEBCORE_"
filepath = os.path.join(wkroot, "WebCore/WebCoreSources.bkl")
filepath = os.path.join(wkroot, "Source", "WebCore", "WebCoreSources.bkl")
assert(os.path.exists(filepath))
doc = minidom.parse(filepath)
......@@ -82,7 +82,7 @@ def generateWebCoreSourcesGTKAndQT(sources):
for key in sources.keys():
makefileString += " \\\n\t\t" + key
outfile = os.path.join(wkroot, "WebCore/sources.inc")
outfile = os.path.join(wkroot, "Source", "WebCore", "sources.inc")
sourcefile = open(outfile, "w")
sourcefile.write(makefileString)
sourcefile.close()
......
......@@ -34,7 +34,7 @@ use FindBin;
use lib $FindBin::Bin;
use webkitdirs;
my @directoriesToScan = ("WebKit/mac", "WebKit/win", "-WebCore/icu", "-WebKit/mac/icu");
my @directoriesToScan = ("WebKit/mac", "WebKit/win", "-Source/WebCore/icu", "-WebKit/mac/icu");
my $fileToUpdate = "WebKit/English.lproj/Localizable.strings";
my $exceptionsFile = "WebKit/StringsNotToBeLocalized.txt";
......
......@@ -87,7 +87,7 @@ sub determineSourceDir
# walks up path checking each directory to see if it is the main WebKit project dir,
# defined by containing Sources, WebCore, and WebKit
until ((-d "$sourceDir/Source" && -d "$sourceDir/WebCore" && -d "$sourceDir/WebKit") || (-d "$sourceDir/Internal" && -d "$sourceDir/OpenSource"))
until ((-d "$sourceDir/Source" && -d "$sourceDir/Source/WebCore" && -d "$sourceDir/WebKit") || (-d "$sourceDir/Internal" && -d "$sourceDir/OpenSource"))
{
if ($sourceDir !~ s|/[^/]+$||) {
die "Could not find top level webkit directory above source directory using FindBin.\n";
......@@ -682,7 +682,7 @@ sub determineQtFeatureDefaults()
return if %qtFeatureDefaults;
die "ERROR: qmake missing but required to build WebKit.\n" if not commandExists("qmake");
my $originalCwd = getcwd();
chdir File::Spec->catfile(sourceDir(), "WebCore");
chdir File::Spec->catfile(sourceDir(), "Source", "WebCore");
my $defaults = `qmake CONFIG+=compute_defaults 2>&1`;
chdir $originalCwd;
......@@ -1177,7 +1177,7 @@ sub dieIfWindowsPlatformSDKNotInstalled
sub copyInspectorFrontendFiles
{
my $productDir = productDir();
my $sourceInspectorPath = sourceDir() . "/WebCore/inspector/front-end/";
my $sourceInspectorPath = sourceDir() . "/Source/WebCore/inspector/front-end/";
my $inspectorResourcesDirPath = $ENV{"WEBKITINSPECTORRESOURCESDIR"};
if (!defined($inspectorResourcesDirPath)) {
......@@ -1590,7 +1590,7 @@ sub buildQMakeProject($@)
my $dsMakefile = "Makefile.DerivedSources";
# Iterate over different source directories manually to workaround a problem with qmake+extraTargets+s60
my @subdirs = ("Source/JavaScriptCore", "WebCore", "WebKit/qt/Api");
my @subdirs = ("Source/JavaScriptCore", "Source/WebCore", "WebKit/qt/Api");
if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
push @subdirs, "WebKit2";
push @subdirs, "Tools/WebKitTestRunner";
......
......@@ -42,7 +42,7 @@ def _should_file_trigger_build(target_platform, file):
directories = [
# Directories that shouldn't trigger builds on any bots.
("PerformanceTests", []),
("WebCore/manual-tests", []),
("Source/WebCore/manual-tests", []),
("Examples", []),
("Websites", []),
("android", []),
......@@ -60,7 +60,7 @@ def _should_file_trigger_build(target_platform, file):
("Source/JavaScriptGlue", ["mac"]),
("LayoutTests/platform/mac", ["mac", "win"]),
("LayoutTests/platform/mac-snowleopard", ["mac-snowleopard", "win"]),
("WebCore/image-decoders", ["chromium"]),
("Source/WebCore/image-decoders", ["chromium"]),
("cairo", ["gtk", "wincairo"]),
("cf", ["chromium-mac", "mac", "qt", "win"]),
("chromium", ["chromium"]),
......
......@@ -27,10 +27,10 @@ from webkitpy.common.config import build
class ShouldBuildTest(unittest.TestCase):
_should_build_tests = [
(["Websites/bugs.webkit.org/foo", "WebCore/bar"], ["*"]),
(["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
(["Websites/bugs.webkit.org/foo"], []),
(["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-leopard", "mac-snowleopard"]),
(["Source/JavaScriptGlue/foo", "WebCore/bar"], ["*"]),
(["Source/JavaScriptGlue/foo", "Source/WebCore/bar"], ["*"]),
(["Source/JavaScriptGlue/foo"], ["mac-leopard", "mac-snowleopard"]),
(["LayoutTests/foo"], ["*"]),
(["LayoutTests/platform/chromium-linux/foo"], ["chromium-linux"]),
......@@ -42,13 +42,13 @@ class ShouldBuildTest(unittest.TestCase):
(["LayoutTests/platform/win-xp/foo"], ["win"]),
(["LayoutTests/platform/win-wk2/foo"], ["win"]),
(["LayoutTests/platform/win/foo"], ["win"]),
(["WebCore/mac/foo"], ["chromium-mac", "mac-leopard", "mac-snowleopard"]),
(["WebCore/win/foo"], ["chromium-win", "win"]),
(["WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-snowleopard"]),
(["WebCore/platform/wx/wxcode/win/foo"], []),
(["WebCore/rendering/RenderThemeMac.mm", "WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac-snowleopard"]),
(["WebCore/rendering/RenderThemeChromiumLinux.h"], ["chromium-linux"]),
(["WebCore/rendering/RenderThemeWinCE.h"], []),
(["Source/WebCore/mac/foo"], ["chromium-mac", "mac-leopard", "mac-snowleopard"]),
(["Source/WebCore/win/foo"], ["chromium-win", "win"]),
(["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-snowleopard"]),