Skip to content
Permalink
Browse files
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:


Canonical link: https://commits.webkit.org/65627@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@75313 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Adam Barth committed Jan 8, 2011
1 parent e87b2cb commit 6bc2f1f79adf0043450f85041d58ea448a6c4a23
Showing with 4,042 additions and 3,893 deletions.
  1. +29 −29 .gitattributes
  2. +7 −7 .gitignore
  3. +49 −49 Android.mk
  4. +2 −2 CMakeLists.txt
  5. +23 −0 ChangeLog
  6. +1 −1 DerivedSources.pro
  7. +3 −3 GNUmakefile.am
  8. +1 −1 Makefile
  9. +1 −1 Source/autotools/webkit.m4
  10. +2 −2 Source/cmake/OptionsEfl.cmake
  11. +33 −0 Tools/ChangeLog
  12. +2 −2 Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
  13. +2 −2 Tools/DumpRenderTree/wscript
  14. +7 −7 Tools/GNUmakefile.am
  15. +1 −1 Tools/Scripts/build-webkit
  16. +1 −1 Tools/Scripts/do-file-rename
  17. +1 −1 Tools/Scripts/do-webcore-rename
  18. +4 −4 Tools/Scripts/generate-qt-inspector-resource
  19. +1 −1 Tools/Scripts/prepare-ChangeLog
  20. +4 −4 Tools/Scripts/run-bindings-tests
  21. +1 −1 Tools/Scripts/update-iexploder-cssproperties
  22. +2 −2 Tools/Scripts/update-sources-list.py
  23. +1 −1 Tools/Scripts/update-webkit-localizable-strings
  24. +4 −4 Tools/Scripts/webkitdirs.pm
  25. +2 −2 Tools/Scripts/webkitpy/common/config/build.py
  26. +9 −9 Tools/Scripts/webkitpy/common/config/build_unittest.py
  27. +1 −1 Tools/Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py
  28. +3 −3 Tools/Scripts/webkitpy/style/checker.py
  29. +7 −7 Tools/Scripts/webkitpy/style/checker_unittest.py
  30. +7 −7 Tools/WebKitTestRunner/DerivedSources.pro
  31. +2 −2 Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
  32. +11 −11 Tools/iExploder/iexploder-1.7.2/tools/update_html_tags_from_sources.sh
  33. +1 −1 Tools/wx/browser/wscript
  34. +95 −95 Tools/wx/build/settings.py
  35. +2 −2 WebCore/Android.derived.jscbindings.mk
  36. +10 −10 WebCore/Android.jscbindings.mk
  37. +1 −1 WebCore/Android.v8bindings.mk
  38. +21 −0 WebCore/ChangeLog
  39. +3,351 −3,351 WebCore/GNUmakefile.am
  40. +18 −18 WebCore/WebCore.gyp/WebCore.gyp
  41. +3 −3 WebCore/WebCore.pri
  42. +73 −73 WebCore/WebCore.pro
  43. +6 −6 WebCore/WebCore.vcproj/WebCore.vcproj
  44. +3 −3 WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops
  45. +3 −3 WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops
  46. +1 −1 WebKit.pri
  47. +1 −1 WebKit.pro
  48. +12 −0 WebKit/chromium/ChangeLog
  49. +2 −2 WebKit/chromium/WebKit.grd
  50. +11 −11 WebKit/chromium/WebKit.gyp
  51. +9 −0 WebKit/gtk/ChangeLog
  52. +22 −22 WebKit/gtk/GNUmakefile.am
  53. +11 −0 WebKit/qt/ChangeLog
  54. +1 −1 WebKit/qt/docs/qtwebkit.qdoc
  55. +9 −0 WebKit/win/ChangeLog
  56. +3 −3 WebKit/win/WebKit.vcproj/WebKit.sln
  57. +10 −0 WebKit/wx/ChangeLog
  58. +2 −2 WebKit/wx/bindings/python/wscript
  59. +11 −11 WebKit/wx/wscript
  60. +9 −0 WebKit2/ChangeLog
  61. +57 −57 WebKit2/WebKit2.pro
  62. +11 −0 Websites/bugs.webkit.org/ChangeLog
  63. +0 −1 Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
  64. +2 −2 configure.ac
  65. +47 −45 wscript
@@ -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)

# -----------------------------------------------------------------------------
@@ -1,3 +1,26 @@
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
@@ -1,4 +1,4 @@
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)
@@ -1,3 +1,36 @@
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'

0 comments on commit 6bc2f1f

Please sign in to comment.