2011-01-16 Adam Barth <abarth@webkit.org>
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jan 2011 05:02:09 +0000 (05:02 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jan 2011 05:02:09 +0000 (05:02 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@75908 268f45cc-cd09-0410-ab3c-d52691b4dbfc

48 files changed:
Android.mk
CMakeLists.txt
ChangeLog
DerivedSources.pro
GNUmakefile.am
Makefile
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.pri
Source/WebCore/WebCore.pro
Tools/ChangeLog
Tools/DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h
Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
Tools/DumpRenderTree/qt/GCControllerQt.cpp
Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
Tools/DumpRenderTree/qt/PlainTextControllerQt.cpp
Tools/DumpRenderTree/qt/TextInputControllerQt.cpp
Tools/DumpRenderTree/wscript
Tools/QtTestBrowser/launcherwindow.h
Tools/Scripts/build-webkit
Tools/Scripts/webkitdirs.pm
WebKit.pri
WebKit.pro
WebKit/ChangeLog
WebKit/Makefile
WebKit/chromium/ChangeLog
WebKit/chromium/WebKit.grd
WebKit/chromium/WebKit.gyp
WebKit/gtk/ChangeLog
WebKit/gtk/GNUmakefile.am
WebKit/gtk/po/ChangeLog
WebKit/gtk/po/GNUmakefile.am
WebKit/qt/Api/DerivedSources.pro
WebKit/qt/ChangeLog
WebKit/qt/declarative/declarative.pro
WebKit/qt/docs/docs.pri
WebKit/qt/tests/tests.pri
WebKit/scripts/generate-webkitversion.pl
WebKit/win/ChangeLog
WebKit/win/WebKit.vcproj/Interfaces.vcproj
WebKit/win/WebKit.vcproj/WebKit.sln
WebKit/win/WebKit.vcproj/WebKit.vcproj
WebKit/win/WebKit.vcproj/WebKitGUID.vcproj
configure.ac
wscript

index 1182d13..6ee564b 100644 (file)
@@ -64,7 +64,7 @@ WEBKIT_SRC_FILES :=
 # We have to use bison 2.3
 include $(BASE_PATH)/bison_check.mk
 
-# Build our list of include paths. We include WebKit/android/icu first so that
+# Build our list of include paths. We include Source/WebKit/android/icu first so that
 # any files that include <unicode/ucnv.h> will include our ucnv.h first. We
 # also add external/ as an include directory so that we can specify the real
 # icu header directory as a more exact reference to avoid including our ucnv.h.
@@ -73,7 +73,7 @@ include $(BASE_PATH)/bison_check.mk
 # the right config.h.
 LOCAL_C_INCLUDES := \
        $(JNI_H_INCLUDE) \
-       $(LOCAL_PATH)/WebKit/android/icu \
+       $(LOCAL_PATH)/Source/WebKit/android/icu \
        external/ \
        external/icu4c/common \
        external/icu4c/i18n \
@@ -130,12 +130,12 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
        $(LOCAL_PATH)/Source/WebCore/xml
 
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
-       $(LOCAL_PATH)/WebKit/android \
-       $(LOCAL_PATH)/WebKit/android/WebCoreSupport \
-       $(LOCAL_PATH)/WebKit/android/jni \
-       $(LOCAL_PATH)/WebKit/android/nav \
-       $(LOCAL_PATH)/WebKit/android/plugins \
-       $(LOCAL_PATH)/WebKit/android/stl
+       $(LOCAL_PATH)/Source/WebKit/android \
+       $(LOCAL_PATH)/Source/WebKit/android/WebCoreSupport \
+       $(LOCAL_PATH)/Source/WebKit/android/jni \
+       $(LOCAL_PATH)/Source/WebKit/android/nav \
+       $(LOCAL_PATH)/Source/WebKit/android/plugins \
+       $(LOCAL_PATH)/Source/WebKit/android/stl
 
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
        $(LOCAL_PATH)/Source/JavaScriptCore \
index 3a7e152..8b1cb1b 100644 (file)
@@ -11,7 +11,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
-SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
+SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
 SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 
@@ -106,7 +106,7 @@ INCLUDE(WebKitPackaging)
 # -----------------------------------------------------------------------------
 ADD_SUBDIRECTORY(Source/JavaScriptCore)
 ADD_SUBDIRECTORY(Source/WebCore)
-ADD_SUBDIRECTORY(WebKit)
+ADD_SUBDIRECTORY(Source/WebKit)
 
 # -----------------------------------------------------------------------------
 # Add test browser if exists
index a260523..0d4a7f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+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-15  Adam Barth  <abarth@webkit.org>
 
         Rubber-stamped by Eric Seidel.
index 0892052..2df6b1f 100644 (file)
@@ -4,7 +4,7 @@ CONFIG += ordered
 SUBDIRS += \
         Source/JavaScriptCore/DerivedSources.pro \
         Source/WebCore/DerivedSources.pro \
-        WebKit/qt/Api/DerivedSources.pro
+        Source/WebKit/qt/Api/DerivedSources.pro
 
 webkit2 {
     SUBDIRS += Source/WebKit2/DerivedSources.pro \
index 254adb9..910be38 100644 (file)
@@ -38,7 +38,7 @@ GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
 GENPROGRAMS := $(top_builddir)/Programs
 GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
 WebCore := $(srcdir)/Source/WebCore
-WebKit := $(srcdir)/WebKit/gtk
+WebKit := $(srcdir)/Source/WebKit/gtk
 WebKit2 := $(srcdir)/Source/WebKit2
 
 # Libraries and support components
@@ -222,7 +222,7 @@ endif
 EXTRA_DIST += \
        $(srcdir)/Source/autotools/symbols.filter \
        $(srcdir)/gtk-doc.make \
-       $(srcdir)/WebKit/LICENSE
+       $(srcdir)/Source/WebKit/LICENSE
 
 # Include module makefiles
 include Source/JavaScriptCore/GNUmakefile.am
@@ -230,10 +230,10 @@ include Source/WebCore/GNUmakefile.am
 if ENABLE_WEBKIT2
 include Source/WebKit2/GNUmakefile.am
 else
-include WebKit/gtk/GNUmakefile.am
+include Source/WebKit/gtk/GNUmakefile.am
 include Source/WebCore/bindings/gobject/GNUmakefile.am
 include Tools/GNUmakefile.am
-include WebKit/gtk/po/GNUmakefile.am
+include Source/WebKit/gtk/po/GNUmakefile.am
 endif
 
 # Autogenerated sources
index 6c4658c..065f88f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE Source/WebCore WebKit Source/WebKit2 Tools 
+MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE Source/WebCore Source/WebKit Source/WebKit2 Tools 
 
 all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
index fc61bad..92b1369 100644 (file)
@@ -1,3 +1,12 @@
+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  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Sam Weinig.
index d24b083..56304fa 100644 (file)
@@ -32,7 +32,7 @@
   'includes': [
     # FIXME: Sense whether upstream or downstream build, and
     # include the right features.gypi
-    '../../../WebKit/chromium/features.gypi',
+    '../../../Source/WebKit/chromium/features.gypi',
     '../JavaScriptCore.gypi',
   ],
   'variables': {
@@ -40,7 +40,7 @@
     'conditions': [
       ['inside_chromium_build==0', {
         # Webkit is being built outside of the full chromium project.
-        'chromium_src_dir': '../../../WebKit/chromium',
+        'chromium_src_dir': '../../../Source/WebKit/chromium',
       },{
         # WebKit is checked out in src/chromium/third_party/WebKit
         'chromium_src_dir': '../../../../..',
index 24c7c6d..79cb8ba 100644 (file)
@@ -1,3 +1,14 @@
+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:
+
 2011-01-16  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Dan Bernstein.
index 627f1c9..34066f7 100644 (file)
@@ -32,7 +32,7 @@
   'includes': [
     # FIXME: Sense whether upstream or downstream build, and
     # include the right features.gypi
-    '../../../WebKit/chromium/features.gypi',
+    '../../../Source/WebKit/chromium/features.gypi',
     '../WebCore.gypi',
   ],
   # Location of the chromium src directory.
@@ -40,7 +40,7 @@
     ['inside_chromium_build==0', {
       # Webkit is being built outside of the full chromium project.
       'variables': {
-        'chromium_src_dir': '../../../WebKit/chromium',
+        'chromium_src_dir': '../../../Source/WebKit/chromium',
         'libjpeg_gyp_path': '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp',
       },
     },{
         '<@(webcore_files)',
 
         # For WebCoreSystemInterface, Mac-only.
-        '../../../WebKit/mac/WebCoreSupport/WebSystemInterface.mm',
+        '../../../Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm',
       ],
       'sources/': [
         # Start by excluding everything then include platform files only.
             # Use USE_NEW_THEME on Mac.
             ['include', 'platform/Theme\\.cpp$'],
 
-            ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
+            ['include', 'Source/WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
 
             # Chromium Mac does not use skia.
             ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
           'direct_dependent_settings': {
             'include_dirs': [
               '../../../WebKitLibraries',
-              '../../../WebKit/mac/WebCoreSupport',
+              '../../../Source/WebKit/mac/WebCoreSupport',
             ],
           },
         }],
index 3532bb1..736d534 100644 (file)
@@ -746,11 +746,11 @@ xpathbison.depends = ${QMAKE_FILE_NAME}
 addExtraCompiler(xpathbison)
 
 # GENERATOR 11: WebKit Version
-# The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in WebKit/mac/Configurations/.
-webkitversion.wkScript = $$PWD/../../WebKit/scripts/generate-webkitversion.pl
+# The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in Source/WebKit/mac/Configurations/.
+webkitversion.wkScript = $$PWD/../../Source/WebKit/scripts/generate-webkitversion.pl
 webkitversion.output = $${WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
 webkitversion.input = webkitversion.wkScript
-webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../../WebKit/mac/Configurations/Version.xcconfig --outputDir $${WC_GENERATED_SOURCES_DIR}/
+webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../../Source/WebKit/mac/Configurations/Version.xcconfig --outputDir $${WC_GENERATED_SOURCES_DIR}/
 webkitversion.clean = ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
 webkitversion.wkAddOutputToSources = false
 addExtraCompiler(webkitversion)
index 535a7ca..7af008c 100644 (file)
@@ -52,12 +52,12 @@ symbian: {
         " "
     webkitlibs.pkg_prerules = vendorinfo
 
-    webkitbackup.sources = ../../WebKit/qt/symbian/backup_registration.xml
+    webkitbackup.sources = ../../Source/WebKit/qt/symbian/backup_registration.xml
     webkitbackup.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)
 
     contains(QT_CONFIG, declarative) {
          declarativeImport.sources = $$QT_BUILD_TREE/imports/QtWebKit/qmlwebkitplugin$${QT_LIBINFIX}.dll
-         declarativeImport.sources += ../../WebKit/qt/declarative/qmldir
+         declarativeImport.sources += ../../Source/WebKit/qt/declarative/qmldir
          declarativeImport.path = c:$$QT_IMPORTS_BASE_DIR/QtWebKit
          DEPLOYMENT += declarativeImport
     }
@@ -90,7 +90,7 @@ CONFIG(standalone_package) {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated
 
-    PRECOMPILED_HEADER = $$PWD/../../WebKit/qt/WebKit_pch.h
+    PRECOMPILED_HEADER = $$PWD/../../Source/WebKit/qt/WebKit_pch.h
 } else {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
@@ -110,7 +110,7 @@ CONFIG(QTDIR_build) {
     !static: DEFINES += QT_MAKEDLL
     symbian: TARGET =$$TARGET$${QT_LIBINFIX}
 }
-moduleFile=$$PWD/../../WebKit/qt/qt_webkit_version.pri
+moduleFile=$$PWD/../../Source/WebKit/qt/qt_webkit_version.pri
 isEmpty(QT_BUILD_TREE):include($$moduleFile)
 VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
 
@@ -285,8 +285,8 @@ WEBCORE_INCLUDEPATH = \
     $$PWD/platform/graphics/qt \
     $$PWD/platform/network/qt \
     $$PWD/platform/qt \
-    $$PWD/../../WebKit/qt/Api \
-    $$PWD/../../WebKit/qt/WebCoreSupport \
+    $$PWD/../../Source/WebKit/qt/Api \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport \
     $$WEBCORE_INCLUDEPATH
 
 symbian {
@@ -2655,18 +2655,18 @@ HEADERS += \
     xml/XSLTExtensions.h \
     xml/XSLTProcessor.h \
     xml/XSLTUnicodeSort.h \
-    $$PWD/../../WebKit/qt/Api/qwebplugindatabase_p.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/InspectorServerQt.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/PageClientQt.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/QtPlatformPlugin.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/PopupMenuQt.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/SearchPopupMenuQt.h \
-    $$PWD/../../WebKit/qt/WebCoreSupport/WebPlatformStrategies.h \
+    $$PWD/../../Source/WebKit/qt/Api/qwebplugindatabase_p.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/InspectorServerQt.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/PageClientQt.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/SearchPopupMenuQt.h \
+    $$PWD/../../Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.h \
     $$PWD/platform/network/qt/DnsPrefetchHelper.h
 
 v8 {
@@ -2754,39 +2754,39 @@ SOURCES += \
     platform/text/qt/TextCodecQt.cpp \
     platform/qt/WheelEventQt.cpp \
     platform/qt/WidgetQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp \
-    ../../WebKit/qt/WebCoreSupport/ChromeClientQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/DragClientQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/EditorClientQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/EditCommandQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/InspectorClientQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/InspectorServerQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/PageClientQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/PopupMenuQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp \
-    ../../WebKit/qt/WebCoreSupport/SearchPopupMenuQt.cpp \
-    ../../WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp \
-    ../../WebKit/qt/Api/qwebframe.cpp \
-    ../../WebKit/qt/Api/qgraphicswebview.cpp \
-    ../../WebKit/qt/Api/qwebpage.cpp \
-    ../../WebKit/qt/Api/qwebview.cpp \
-    ../../WebKit/qt/Api/qwebelement.cpp \
-    ../../WebKit/qt/Api/qwebhistory.cpp \
-    ../../WebKit/qt/Api/qwebsettings.cpp \
-    ../../WebKit/qt/Api/qwebhistoryinterface.cpp \
-    ../../WebKit/qt/Api/qwebplugindatabase.cpp \
-    ../../WebKit/qt/Api/qwebpluginfactory.cpp \
-    ../../WebKit/qt/Api/qwebsecurityorigin.cpp \
-    ../../WebKit/qt/Api/qwebscriptworld.cpp \
-    ../../WebKit/qt/Api/qwebdatabase.cpp \
-    ../../WebKit/qt/Api/qwebinspector.cpp \
-    ../../WebKit/qt/Api/qwebkitversion.cpp
+    ../../Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/DragClientQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/EditCommandQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/SearchPopupMenuQt.cpp \
+    ../../Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp \
+    ../../Source/WebKit/qt/Api/qwebframe.cpp \
+    ../../Source/WebKit/qt/Api/qgraphicswebview.cpp \
+    ../../Source/WebKit/qt/Api/qwebpage.cpp \
+    ../../Source/WebKit/qt/Api/qwebview.cpp \
+    ../../Source/WebKit/qt/Api/qwebelement.cpp \
+    ../../Source/WebKit/qt/Api/qwebhistory.cpp \
+    ../../Source/WebKit/qt/Api/qwebsettings.cpp \
+    ../../Source/WebKit/qt/Api/qwebhistoryinterface.cpp \
+    ../../Source/WebKit/qt/Api/qwebplugindatabase.cpp \
+    ../../Source/WebKit/qt/Api/qwebpluginfactory.cpp \
+    ../../Source/WebKit/qt/Api/qwebsecurityorigin.cpp \
+    ../../Source/WebKit/qt/Api/qwebscriptworld.cpp \
+    ../../Source/WebKit/qt/Api/qwebdatabase.cpp \
+    ../../Source/WebKit/qt/Api/qwebinspector.cpp \
+    ../../Source/WebKit/qt/Api/qwebkitversion.cpp
 
 contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
     HEADERS += platform/qt/QtMobileWebStyle.h
@@ -2794,8 +2794,8 @@ contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
 }
 
 maemo5 {
-    HEADERS += ../../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h
-    SOURCES += ../../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp
+    HEADERS += ../../Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h
+    SOURCES += ../../Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp
 }
 
 contains(DEFINES, ENABLE_SMOOTH_SCROLLING=1) {
@@ -3444,18 +3444,18 @@ contains(DEFINES, ENABLE_GEOLOCATION=1) {
 
 contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
     HEADERS += \
-        ../../WebKit/qt/WebCoreSupport/DeviceMotionClientQt.h \
-        ../../WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.h \
-        ../../WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.h \
-        ../../WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.h \
-        ../../WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionClientQt.h \
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.h \
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.h \
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.h \
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h
 
     SOURCES += \
-        ../../WebKit/qt/WebCoreSupport/DeviceMotionClientQt.cpp \
-        ../../WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp \
-        ../../WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.cpp \
-        ../../WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.cpp \
-        ../../WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionClientQt.cpp \
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp \
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.cpp \
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.cpp \
+        ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp
 
     CONFIG += mobility
     MOBILITY += sensors
@@ -3860,7 +3860,7 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
     QMAKE_EXTRA_TARGETS += install
 }
 
-include($$PWD/../../WebKit/qt/Api/headers.pri)
+include($$PWD/../../Source/WebKit/qt/Api/headers.pri)
 
 HEADERS += $$WEBKIT_API_HEADERS
 
@@ -3988,9 +3988,9 @@ contains(CONFIG, texmap) {
 symbian {
     shared {
         contains(CONFIG, def_files) {
-            DEF_FILE=../../WebKit/qt/symbian
+            DEF_FILE=../../Source/WebKit/qt/symbian
             # defFilePath is for Qt4.6 compatibility
-            defFilePath=../../WebKit/qt/symbian
+            defFilePath=../../Source/WebKit/qt/symbian
         } else {
             MMP_RULES += EXPORTUNFROZEN
         }
index 1b0aa8a..b7d9356 100644 (file)
@@ -1,3 +1,22 @@
+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-15  Adam Barth  <abarth@webkit.org>
 
         Teach svn-apply about WebKit2 move.
index 5fcc602..fe37958 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 
 #include "DumpRenderTreeQt.h"
-#include "../../../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
+#include "../../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
 #include "EventSenderQt.h"
 #include "GCControllerQt.h"
 #include "LayoutTestControllerQt.h"
index ef95bfc..8cb5efb 100644 (file)
@@ -40,7 +40,7 @@
 #include <QSslError>
 #endif
 
-#include "../../../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
+#include "../../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
 #include <qgraphicsview.h>
 #include <qgraphicswebview.h>
 #include <qwebframe.h>
index 3aa507f..2a30ba8 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "config.h"
 #include "GCControllerQt.h"
-#include "../../../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
+#include "../../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
 
 #include <qwebpage.h>
 
index b8cc9be..56406c2 100644 (file)
@@ -28,7 +28,7 @@
  */
 #include "config.h"
 #include "LayoutTestControllerQt.h"
-#include "../../../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
+#include "../../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
 
 #include "DumpRenderTreeQt.h"
 #include "WorkQueue.h"
index 441a37c..729ccd0 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "PlainTextControllerQt.h"
 
-#include "../../../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
+#include "../../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
 #include <QApplication>
 #include <QInputMethodEvent>
 #include <QKeyEvent>
index 08d8850..9112674 100644 (file)
@@ -28,7 +28,7 @@
  */
 #include "config.h"
 #include "TextInputControllerQt.h"
-#include "../../../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
+#include "../../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
 
 #include <QApplication>
 #include <QInputMethodEvent>
index d583f1a..67efe9f 100644 (file)
@@ -34,7 +34,7 @@ include_paths = [
                 os.path.join(wk_root, 'Source', 'JavaScriptCore'),
                 os.path.join(wk_root, 'Source', 'WebCore'),
                 os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'wx'),
-                os.path.join(wk_root, 'WebKit', 'wx'), 
+                os.path.join(wk_root, 'Source', 'WebKit', 'wx'), 
                 '.', 
                 'wx'
                 ]
index f39faef..849b15d 100644 (file)
@@ -67,7 +67,7 @@
 #include "webinspector.h"
 #include "webpage.h"
 #include "webview.h"
-#include "../../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
+#include "../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h"
 
 #ifdef Q_WS_MAEMO_5
 #include <X11/Xatom.h>
index 9884136..0b58113 100755 (executable)
@@ -377,7 +377,7 @@ sub unlinkZeroFiles ()
 }
 
 # Check that all the project directories are there.
-my @projects = ("Source/JavaScriptCore", "Source/WebCore", "WebKit");
+my @projects = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit");
 
 my @otherDirs = ("WebKitLibraries");
 for my $dir (@projects, @otherDirs) {
@@ -542,7 +542,7 @@ for my $dir (@projects) {
     my $result = 0;
 
     # For Gtk and Qt the WebKit project builds all others
-    if ((isGtk() || isQt()) && $dir ne "WebKit") {
+    if ((isGtk() || isQt()) && $dir ne "Source/WebKit") {
         chdirWebKit();
         next;
     }
index 532c552..245edaa 100644 (file)
@@ -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/Source/WebCore" && -d "$sourceDir/WebKit") || (-d "$sourceDir/Internal" && -d "$sourceDir/OpenSource"))
+    until ((-d "$sourceDir/Source" && -d "$sourceDir/Source/WebCore" && -d "$sourceDir/Source/WebKit") || (-d "$sourceDir/Internal" && -d "$sourceDir/OpenSource"))
     {
         if ($sourceDir !~ s|/[^/]+$||) {
             die "Could not find top level webkit directory above source directory using FindBin.\n";
@@ -1591,7 +1591,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", "Source/WebCore", "WebKit/qt/Api");
+    my @subdirs = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit/qt/Api");
     if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
         push @subdirs, "Source/WebKit2";
         push @subdirs, "Tools/WebKitTestRunner";
@@ -1638,9 +1638,9 @@ sub buildQMakeProject($@)
     }
 
     # Manually create makefiles for the examples so we don't build by default
-    my $examplesDir = $dir . "/WebKit/qt/examples";
+    my $examplesDir = $dir . "/Source/WebKit/qt/examples";
     File::Path::mkpath($examplesDir);
-    $buildArgs[-1] = sourceDir() . "/WebKit/qt/examples/examples.pro";
+    $buildArgs[-1] = sourceDir() . "/Source/WebKit/qt/examples/examples.pro";
     chdir $examplesDir or die;
     print "Calling '$qmakebin @buildArgs' in " . $examplesDir . "\n\n";
     $result = system "$qmakebin @buildArgs";
@@ -1665,6 +1665,7 @@ sub buildQMakeProject($@)
 
 sub buildQMakeQtProject($$@)
 {
+   print "XXX";
     my ($project, $clean, @buildArgs) = @_;
 
     return buildQMakeProject($clean, @buildArgs);
@@ -1746,10 +1747,10 @@ sub buildChromium($@)
     my $result = 1;
     if (isDarwin()) {
         # Mac build - builds the root xcode project.
-        $result = buildXCodeProject("WebKit/chromium/WebKit", $clean, "-configuration", configuration(), @options);
+        $result = buildXCodeProject("Source/WebKit/chromium/WebKit", $clean, "-configuration", configuration(), @options);
     } elsif (isCygwin() || isWindows()) {
         # Windows build - builds the root visual studio solution.
-        $result = buildChromiumVisualStudioProject("WebKit/chromium/WebKit.sln", $clean);
+        $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/WebKit.sln", $clean);
     } elsif (isLinux()) {
         # Linux build - build using make.
         $ result = buildChromiumMakefile("all", $clean);
index 8f18bf5..d856863 100644 (file)
@@ -44,7 +44,7 @@ building-libs {
             }
         }
     }
-    DEPENDPATH += $$PWD/WebKit/qt/Api
+    DEPENDPATH += $$PWD/Source/WebKit/qt/Api
 }
 
 !mac:!unix|symbian {
@@ -55,7 +55,7 @@ CONFIG(release, debug|release) {
     DEFINES += NDEBUG
 }
 
-INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
+INCLUDEPATH += $$OUTPUT_DIR/Source/include/QtWebKit
 
 CONFIG -= warn_on
 *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
index f2d40ae..2c79ef8 100644 (file)
@@ -12,10 +12,10 @@ SUBDIRS += Source/WebCore
 # If the source exists, built it
 exists($$PWD/Tools/QtTestBrowser): SUBDIRS += Tools/QtTestBrowser
 contains(QT_CONFIG, declarative) {
-    exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
+    exists($$PWD/Source/WebKit/qt/declarative): SUBDIRS += Source/WebKit/qt/declarative
 }
 !v8:exists($$PWD/Source/JavaScriptCore/jsc.pro): SUBDIRS += Source/JavaScriptCore/jsc.pro
-exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
+exists($$PWD/Source/WebKit/qt/tests): SUBDIRS += Source/WebKit/qt/tests
 exists($$PWD/Tools/DumpRenderTree/qt/DumpRenderTree.pro): SUBDIRS += Tools/DumpRenderTree/qt/DumpRenderTree.pro
 exists($$PWD/Tools/DumpRenderTree/qt/ImageDiff.pro): SUBDIRS += Tools/DumpRenderTree/qt/ImageDiff.pro
 
@@ -42,4 +42,4 @@ symbian {
     QMAKE_EXTRA_TARGETS += install
 }
 
-include(WebKit/qt/docs/docs.pri)
+include(Source/WebKit/qt/docs/docs.pri)
index aa18035..0d3d15b 100644 (file)
@@ -1,3 +1,13 @@
+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-07  Enrica Casucci  <enrica@apple.com>
 
         Reviewed by Alexey Proskuryakov.
index cb4c11a..8534681 100644 (file)
@@ -1 +1 @@
-include ../Makefile.shared
+include ../../Makefile.shared
index efd15a9..f34b8bf 100644 (file)
@@ -1,3 +1,13 @@
+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-15  Jochen Eisinger  <jochen@chromium.org>
 
         Reviewed by David Levin.
index 1650e8c..9b02554 100644 (file)
@@ -9,7 +9,7 @@
   </outputs>
   <release seq="1">
     <includes>
-      <include name="IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS" file="..\..\Source\WebCore\bindings\v8\DebuggerScript.js" type="BINDATA"/>
+      <include name="IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS" file="..\..\..\Source\WebCore\bindings\v8\DebuggerScript.js" type="BINDATA"/>
     </includes>
   </release>
 </grit>
index 661fb8b..85f671d 100644 (file)
@@ -30,8 +30,8 @@
 
 {
     'includes': [
-        '../../Source/WebCore/WebCore.gypi',
-        '../../Tools/DumpRenderTree/DumpRenderTree.gypi',
+        '../../../Source/WebCore/WebCore.gypi',
+        '../../../Tools/DumpRenderTree/DumpRenderTree.gypi',
         'WebKit.gypi',
         'features.gypi',
     ],
@@ -42,7 +42,7 @@
             ['inside_chromium_build==0', {
                 # Webkit is being built outside of the full chromium project.
                 # e.g. via build-webkit --chromium
-                'chromium_src_dir': '../../WebKit/chromium',
+                'chromium_src_dir': '../../../Source/WebKit/chromium',
                 'webkit_target_type': 'static_library',
 
                 # List of DevTools source files, ordered by dependencies. It is used both
@@ -53,7 +53,7 @@
                 ],
             },{
                 # WebKit is checked out in src/chromium/third_party/WebKit
-                'chromium_src_dir': '../../../..',
+                'chromium_src_dir': '../../../../..',
                 'webkit_target_type': '<(library)',
 
                 'devtools_files': [
@@ -62,7 +62,7 @@
                 ],
             }],
         ],
-        'ahem_path': '../../Tools/DumpRenderTree/qt/fonts/AHEM____.TTF',
+        'ahem_path': '../../../Tools/DumpRenderTree/qt/fonts/AHEM____.TTF',
 
         # If debug_devtools is set to 1, JavaScript files for DevTools are
         # stored as is. Otherwise, a concatenated file is stored.
@@ -73,7 +73,7 @@
             'target_name': 'webkit',
             'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
             'dependencies': [
-                '../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
                 '<(chromium_src_dir)/app/app.gyp:app_base', # For GLContext
                 '<(chromium_src_dir)/skia/skia.gyp:skia',
                 '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
                                 'WEBKIT_DLL',
                             ],
                             'dependencies': [
-                                '../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings',
+                                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings',
                                 '<(chromium_src_dir)/base/base.gyp:test_support_base',
                                 '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
                                 '<(chromium_src_dir)/testing/gtest.gyp:gtest',
             'type': 'none',
             'dependencies': [
                 'devtools_html',
-                '../../Source/WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources',
+                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources',
             ],
             'conditions': [
                 ['debug_devtools==0', {
                     'scripts/generate_devtools_html.py',
                     # See issue 29695: WebKit.gypi is a source file for devtools.html.
                     'WebKit.gypi',
-                    '../../Source/WebCore/inspector/front-end/inspector.html',
+                    '../../../Source/WebCore/inspector/front-end/inspector.html',
                 ],
                 'outputs': ['<(PRODUCT_DIR)/resources/inspector/devtools.html'],
                 'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(debug_devtools)', '<@(devtools_files)'],
             'type': 'none',
             'dependencies': [
                 'devtools_html',
-                '../../Source/WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources'
+                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources'
             ],
             'sources': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
             'actions': [{
                 'action_name': 'concatenate_devtools_js',
                 'script_name': 'scripts/concatenate_js_files.py',
-                'input_page': '../../Source/WebCore/inspector/front-end/inspector.html',
+                'input_page': '../../../Source/WebCore/inspector/front-end/inspector.html',
                 'inputs': [
                     '<@(_script_name)',
                     '<@(_input_page)',
                     '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js'
                 ],
                 'search_path': [
-                    '../../Source/WebCore/inspector/front-end',
+                    '../../../Source/WebCore/inspector/front-end',
                     'src/js',
                     '<(SHARED_INTERMEDIATE_DIR)/webcore',
                 ],
             'actions': [{
                 'action_name': 'concatenate_devtools_css',
                 'script_name': 'scripts/concatenate_css_files.py',
-                'input_page': '../../Source/WebCore/inspector/front-end/inspector.html',
+                'input_page': '../../../Source/WebCore/inspector/front-end/inspector.html',
                 'inputs': [
                     '<@(_script_name)',
                     '<@(_input_page)',
                     '<@(devtools_files)'
                 ],
                 'search_path': [
-                    '../../Source/WebCore/inspector/front-end',
+                    '../../../Source/WebCore/inspector/front-end',
                     'src/js',
                 ],
                 'outputs': ['<(PRODUCT_DIR)/resources/inspector/devTools.css'],
             'msvs_guid': '7CEFE800-8403-418A-AD6A-2D52C6FC3EAD',
             'dependencies': [
                 'webkit',
-                '../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
                 '<(chromium_src_dir)/testing/gtest.gyp:gtest',
                 '<(chromium_src_dir)/base/base.gyp:base',
                 '<(chromium_src_dir)/base/base.gyp:base_i18n',
             'type': 'executable',
             'dependencies': [
                 'webkit',
-                '../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+                '../../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
                 '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
             ],
             'include_dirs': [
-                '../../Source/JavaScriptCore',
+                '../../../Source/JavaScriptCore',
                 '<(DEPTH)',
             ],
             'sources': [
-                '../../Tools/DumpRenderTree/chromium/ImageDiff.cpp',
+                '../../../Tools/DumpRenderTree/chromium/ImageDiff.cpp',
             ],
         },
         {
                 'TestNetscapePlugIn',
                 'copy_TestNetscapePlugIn',
                 'webkit',
-                '../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
+                '../../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
                 '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
                 '<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa',
                 '<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob',
             'include_dirs': [
                 '<(chromium_src_dir)',
                 'public',
-                '../../Source/JavaScriptCore',
-                '../../Source/JavaScriptCore/wtf', # wtf/text/*.h refers headers in wtf/ without wtf/.
+                '../../../Source/JavaScriptCore',
+                '../../../Source/JavaScriptCore/wtf', # wtf/text/*.h refers headers in wtf/ without wtf/.
                 '<(DEPTH)',
             ],
             'defines': [
                                 'public',
                             ],
                             'dependencies': [
-                                '../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+                                '../../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
                             ],
                         }],
                         ['inside_chromium_build==1', {
                     ],
                     'mac_bundle_resources': [
                         '<(ahem_path)',
-                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
-                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf',
-                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf',
-                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf',
-                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf',
-                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf',
-                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf',
-                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf',
-                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
+                        '../../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
+                        '../../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf',
+                        '../../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf',
+                        '../../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf',
+                        '../../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf',
+                        '../../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf',
+                        '../../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf',
+                        '../../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf',
+                        '../../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
                         '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
                     ],
                 },{ # OS!="mac"
                         'destination': '<(PRODUCT_DIR)',
                         'files': [
                             '<(ahem_path)',
-                            '../../Tools/DumpRenderTree/chromium/fonts.conf',
+                            '../../../Tools/DumpRenderTree/chromium/fonts.conf',
                             '<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
                         ]
                     }],
             ],
             'include_dirs': [
                 '<(chromium_src_dir)',
-                '../../Tools/DumpRenderTree/TestNetscapePlugIn',
-                '../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
+                '../../../Tools/DumpRenderTree/TestNetscapePlugIn',
+                '../../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
             ],
             'conditions': [
                 ['OS=="mac"', {
                     },
                     'xcode_settings': {
                         'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
-                        'INFOPLIST_FILE': '../../Tools/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist',
+                        'INFOPLIST_FILE': '../../../Tools/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist',
                     },
                 }],
                 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
                         'snprintf=_snprintf',
                     ],
                     'sources': [
-                        '../../Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.def',
-                        '../../Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc',
+                        '../../../Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.def',
+                        '../../../Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc',
                     ],
                     # The .rc file requires that the name of the dll is npTestNetscapePlugin.dll.
                     # This adds the 'np' to the dll name.
             'targets': [{
                 'target_name': 'LayoutTestHelper',
                 'type': 'executable',
-                'sources': ['../../Tools/DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
+                'sources': ['../../../Tools/DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
             }],
         }],
         ['OS=="mac"', {
                 {
                     'target_name': 'LayoutTestHelper',
                     'type': 'executable',
-                    'sources': ['../../Tools/DumpRenderTree/chromium/LayoutTestHelper.mm'],
+                    'sources': ['../../../Tools/DumpRenderTree/chromium/LayoutTestHelper.mm'],
                     'link_settings': {
                         'libraries': [
                             '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
index 8d558e9..699bd37 100644 (file)
@@ -1,3 +1,12 @@
+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-14  Yuzo Fujishima  <yuzo@google.com>
 
         Reviewed by Antti Koivisto.
index 04f5efa..c69d6ea 100644 (file)
@@ -42,7 +42,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPF
        -I$(WebKit)/WebCoreSupport \
        -I$(WebKit)/webkit \
        -I$(GENSOURCES_WEBKIT) \
-       -IWebKit/gtk/webkit \
+       -ISource/WebKit/gtk/webkit \
        $(global_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
@@ -99,35 +99,35 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBA
 
 webkitgtk_static_h_api += \
        $(srcdir)/Source/WebCore/platform/network/soup/cache/webkit/soup-cache.h \
-       $(srcdir)/WebKit/gtk/webkit/webkit.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
-       $(srcdir)/WebKit/gtk/webkit/webkiterror.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitglobals.h \
-       $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitviewportattributes.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebplugin.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebplugindatabase.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
-       $(srcdir)/WebKit/gtk/webkit/webkitwebview.h
+       $(srcdir)/Source/WebKit/gtk/webkit/webkit.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitdefines.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitdownload.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkiterror.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitglobals.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkithittestresult.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitnetworkrequest.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitnetworkresponse.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitsecurityorigin.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitsoupauthdialog.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitviewportattributes.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebbackforwardlist.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebdatabase.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebdatasource.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebframe.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebhistoryitem.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebinspector.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebnavigationaction.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebplugin.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebplugindatabase.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebpolicydecision.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebresource.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebsettings.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitwebview.h
 
 webkitgtk_built_h_api += \
-       WebKit/gtk/webkit/webkitversion.h
+       Source/WebKit/gtk/webkit/webkitversion.h
 
 webkitgtk_h_api += \
        $(webkitgtk_built_h_api) \
@@ -160,84 +160,84 @@ webkitgtk_sources += \
        Source/WebCore/bindings/gobject/WebKitDOMObject.h \
        Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \
        Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h \
-       WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
-       WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
-       WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
-       WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
-       WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \
-       WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \
-       WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
-       WebKit/gtk/WebCoreSupport/DragClientGtk.h \
-       WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp \
-       WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h \
-       WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
-       WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
-       WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
-       WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
-       WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.h \
-       WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp \
-       WebKit/gtk/WebCoreSupport/FullscreenVideoController.h \
-       WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
-       WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
-       WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
-       WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
-       WebKit/gtk/webkit/webkitapplicationcache.cpp \
-       WebKit/gtk/webkit/webkitapplicationcacheprivate.h \
-       WebKit/gtk/webkit/webkitdownload.cpp \
-       WebKit/gtk/webkit/webkitdownloadprivate.h \
-       WebKit/gtk/webkit/webkiterror.cpp \
-       WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
-       WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h \
-       WebKit/gtk/webkit/webkitglobals.cpp \
-       WebKit/gtk/webkit/webkitglobals.h \
-       WebKit/gtk/webkit/webkitglobalsprivate.h \
-       WebKit/gtk/webkit/webkithittestresult.cpp \
-       WebKit/gtk/webkit/webkithittestresultprivate.h \
-       WebKit/gtk/webkit/webkitnetworkrequest.cpp \
-       WebKit/gtk/webkit/webkitnetworkrequestprivate.h \
-       WebKit/gtk/webkit/webkitnetworkresponse.cpp \
-       WebKit/gtk/webkit/webkitnetworkresponseprivate.h \
-       WebKit/gtk/webkit/webkitsecurityorigin.cpp \
-       WebKit/gtk/webkit/webkitsecurityoriginprivate.h \
-       WebKit/gtk/webkit/webkitsoupauthdialog.c \
-       WebKit/gtk/webkit/webkitversion.cpp \
-       WebKit/gtk/webkit/webkitviewportattributes.cpp \
-       WebKit/gtk/webkit/webkitviewportattributesprivate.h \
-       WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
-       WebKit/gtk/webkit/webkitwebbackforwardlistprivate.h \
-       WebKit/gtk/webkit/webkitwebdatabase.cpp \
-       WebKit/gtk/webkit/webkitwebdatasource.cpp \
-       WebKit/gtk/webkit/webkitwebdatasourceprivate.h \
-       WebKit/gtk/webkit/webkitwebframe.cpp \
-       WebKit/gtk/webkit/webkitwebframeprivate.h \
-       WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
-       WebKit/gtk/webkit/webkitwebhistoryitemprivate.h \
-       WebKit/gtk/webkit/webkitwebinspector.cpp \
-       WebKit/gtk/webkit/webkitwebinspectorprivate.h \
-       WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
-       WebKit/gtk/webkit/webkitwebnavigationactionprivate.h \
-       WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
-       WebKit/gtk/webkit/webkitwebpolicydecisionprivate.h \
-       WebKit/gtk/webkit/webkitwebresource.cpp \
-       WebKit/gtk/webkit/webkitwebresourceprivate.h \
-       WebKit/gtk/webkit/webkitwebplugin.cpp \
-       WebKit/gtk/webkit/webkitwebpluginprivate.h \
-       WebKit/gtk/webkit/webkitwebplugindatabase.cpp \
-       WebKit/gtk/webkit/webkitwebplugindatabaseprivate.h \
-       WebKit/gtk/webkit/webkitwebsettings.cpp \
-       WebKit/gtk/webkit/webkitwebsettingsprivate.h \
-       WebKit/gtk/webkit/webkitwebview.cpp \
-       WebKit/gtk/webkit/webkitwebviewprivate.h \
-       WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
-       WebKit/gtk/webkit/webkitwebwindowfeaturesprivate.h
+       Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
+       Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
+       Source/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
+       Source/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
+       Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \
+       Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \
+       Source/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
+       Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h \
+       Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp \
+       Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h \
+       Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
+       Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
+       Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
+       Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
+       Source/WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.h \
+       Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp \
+       Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h \
+       Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
+       Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
+       Source/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
+       Source/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
+       Source/WebKit/gtk/webkit/webkitapplicationcache.cpp \
+       Source/WebKit/gtk/webkit/webkitapplicationcacheprivate.h \
+       Source/WebKit/gtk/webkit/webkitdownload.cpp \
+       Source/WebKit/gtk/webkit/webkitdownloadprivate.h \
+       Source/WebKit/gtk/webkit/webkiterror.cpp \
+       Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
+       Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h \
+       Source/WebKit/gtk/webkit/webkitglobals.cpp \
+       Source/WebKit/gtk/webkit/webkitglobals.h \
+       Source/WebKit/gtk/webkit/webkitglobalsprivate.h \
+       Source/WebKit/gtk/webkit/webkithittestresult.cpp \
+       Source/WebKit/gtk/webkit/webkithittestresultprivate.h \
+       Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp \
+       Source/WebKit/gtk/webkit/webkitnetworkrequestprivate.h \
+       Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp \
+       Source/WebKit/gtk/webkit/webkitnetworkresponseprivate.h \
+       Source/WebKit/gtk/webkit/webkitsecurityorigin.cpp \
+       Source/WebKit/gtk/webkit/webkitsecurityoriginprivate.h \
+       Source/WebKit/gtk/webkit/webkitsoupauthdialog.c \
+       Source/WebKit/gtk/webkit/webkitversion.cpp \
+       Source/WebKit/gtk/webkit/webkitviewportattributes.cpp \
+       Source/WebKit/gtk/webkit/webkitviewportattributesprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
+       Source/WebKit/gtk/webkit/webkitwebbackforwardlistprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebdatabase.cpp \
+       Source/WebKit/gtk/webkit/webkitwebdatasource.cpp \
+       Source/WebKit/gtk/webkit/webkitwebdatasourceprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebframe.cpp \
+       Source/WebKit/gtk/webkit/webkitwebframeprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
+       Source/WebKit/gtk/webkit/webkitwebhistoryitemprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebinspector.cpp \
+       Source/WebKit/gtk/webkit/webkitwebinspectorprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
+       Source/WebKit/gtk/webkit/webkitwebnavigationactionprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
+       Source/WebKit/gtk/webkit/webkitwebpolicydecisionprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebresource.cpp \
+       Source/WebKit/gtk/webkit/webkitwebresourceprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebplugin.cpp \
+       Source/WebKit/gtk/webkit/webkitwebpluginprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebplugindatabase.cpp \
+       Source/WebKit/gtk/webkit/webkitwebplugindatabaseprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebsettings.cpp \
+       Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebview.cpp \
+       Source/WebKit/gtk/webkit/webkitwebviewprivate.h \
+       Source/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
+       Source/WebKit/gtk/webkit/webkitwebwindowfeaturesprivate.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
+pkgconfig_DATA = Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
 
 if ENABLE_INTROSPECTION
 
-JSCore-@WEBKITGTK_API_VERSION@.gir: $(top_builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
-       $(AM_V_GEN)cp $(top_builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(top_builddir)/
+JSCore-@WEBKITGTK_API_VERSION@.gir: $(top_builddir)/Source/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
+       $(AM_V_GEN)cp $(top_builddir)/Source/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(top_builddir)/
 
 JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
 WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
@@ -265,7 +265,7 @@ $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITG
             -I$(WebKit) \
             -I$(GENSOURCES) \
             -I$(GENSOURCES_WEBKIT) \
-            -I$(top_builddir)/WebKit/gtk \
+            -I$(top_builddir)/Source/WebKit/gtk \
             -I$(top_srcdir)/Source/JavaScriptCore/ForwardingHeaders \
             -I$(top_srcdir) \
             $(GENSOURCES_WEBKIT)/webkitenumtypes.h \
@@ -286,7 +286,7 @@ CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
 
 endif
 
-EXTRA_DIST += $(top_builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
+EXTRA_DIST += $(top_builddir)/Source/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
 
 WEBKIT_MARSHAL_LIST = $(WebKit)/webkitmarshal.list
 $(GENSOURCES_WEBKIT)/webkitmarshal.cpp: stamp-webkitmarshal.cpp
@@ -350,7 +350,7 @@ $(GENSOURCES_WEBKIT)/webkitenumtypes.cpp: $(webkitgtk_h_api) $(WebKit)/GNUmakefi
 
 # GSettings
 if USE_GSETTINGS
-gsettings_SCHEMAS = $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml
+gsettings_SCHEMAS = $(top_builddir)/Source/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml
 @GSETTINGS_RULES@
 endif
 
@@ -372,7 +372,7 @@ EXTRA_DIST += \
 # extra resource files
 resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources
 dist_resources_DATA = \
-       $(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
+       $(shell ls $(srcdir)/Source/WebKit/gtk/resources/*.html)
 
 # Build unit tests
 noinst_PROGRAMS += $(TEST_PROGS)
@@ -382,7 +382,7 @@ webkit_tests_cflags = \
        -I$(WebCore)/platform/network/soup/cache \
        -I$(WebKit) \
        -I$(GENSOURCES) \
-       -I$(top_builddir)/WebKit/gtk \
+       -I$(top_builddir)/Source/WebKit/gtk \
        -I$(top_srcdir)/Source/WebCore/bindings \
        -I$(top_srcdir)/Source/WebCore/bindings/gobject \
        $(global_cppflags) \
@@ -429,119 +429,119 @@ TEST_PROGS += \
        Programs/unittests/testcopyandpaste
 
 # Add additional tests here
-Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c
+Programs_unittests_testdomdocument_SOURCES = Source/WebKit/gtk/tests/testdomdocument.c
 Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c
+Programs_unittests_testdomdomwindow_SOURCES = Source/WebKit/gtk/tests/testdomdomwindow.c
 Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c
+Programs_unittests_testdomnode_SOURCES = Source/WebKit/gtk/tests/testdomnode.c
 Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
+Programs_unittests_testhttpbackend_SOURCES = Source/WebKit/gtk/tests/testhttpbackend.c
 Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c
+Programs_unittests_testglobals_SOURCES = Source/WebKit/gtk/tests/testglobals.c
 Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c
+Programs_unittests_testloading_SOURCES = Source/WebKit/gtk/tests/testloading.c
 Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c
+Programs_unittests_testmimehandling_SOURCES = Source/WebKit/gtk/tests/testmimehandling.c Source/WebKit/gtk/tests/test_utils.c
 Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
+Programs_unittests_testnetworkrequest_SOURCES = Source/WebKit/gtk/tests/testnetworkrequest.c
 Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c
+Programs_unittests_testnetworkresponse_SOURCES = Source/WebKit/gtk/tests/testnetworkresponse.c
 Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
+Programs_unittests_testwebframe_SOURCES = Source/WebKit/gtk/tests/testwebframe.c
 Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testwebplugindatabase_SOURCES = WebKit/gtk/tests/testwebplugindatabase.c
+Programs_unittests_testwebplugindatabase_SOURCES = Source/WebKit/gtk/tests/testwebplugindatabase.c
 Programs_unittests_testwebplugindatabase_CFLAGS = -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" $(webkit_tests_cflags)
 Programs_unittests_testwebplugindatabase_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testwebplugindatabase_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c
+Programs_unittests_testwebbackforwardlist_SOURCES = Source/WebKit/gtk/tests/testwebbackforwardlist.c
 Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c
+Programs_unittests_testwebhistoryitem_SOURCES = Source/WebKit/gtk/tests/testwebhistoryitem.c
 Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c
+Programs_unittests_testwindow_SOURCES = Source/WebKit/gtk/tests/testwindow.c
 Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c
+Programs_unittests_testdownload_SOURCES = Source/WebKit/gtk/tests/testdownload.c
 Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c
+Programs_unittests_testatk_SOURCES = Source/WebKit/gtk/tests/testatk.c
 Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c
+Programs_unittests_testatkroles_SOURCES = Source/WebKit/gtk/tests/testatkroles.c
 Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c
+Programs_unittests_testwebsettings_SOURCES = Source/WebKit/gtk/tests/testwebsettings.c
 Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testwebresource_SOURCES = WebKit/gtk/tests/testwebresource.c
+Programs_unittests_testwebresource_SOURCES = Source/WebKit/gtk/tests/testwebresource.c
 Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd)
 
-Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasource.c
+Programs_unittests_testwebdatasource_SOURCES = Source/WebKit/gtk/tests/testwebdatasource.c
 Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
 
-Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c
+Programs_unittests_testwebview_SOURCES = Source/WebKit/gtk/tests/testwebview.c Source/WebKit/gtk/tests/test_utils.c
 Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c
+Programs_unittests_testhittestresult_SOURCES = Source/WebKit/gtk/tests/testhittestresult.c
 Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd)
 
-Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c
+Programs_unittests_testkeyevents_SOURCES = Source/WebKit/gtk/tests/testkeyevents.c
 Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
 
-Programs_unittests_testcopyandpaste_SOURCES = WebKit/gtk/tests/testcopyandpaste.c \
+Programs_unittests_testcopyandpaste_SOURCES = Source/WebKit/gtk/tests/testcopyandpaste.c \
        Source/WebCore/platform/gtk/GtkVersioning.c
 Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \
        -I$(srcdir)/Source/WebCore/platform/gtk \
@@ -560,11 +560,11 @@ CLEANFILES += \
        $(top_builddir)/Programs/GtkLauncher
 
 DISTCLEANFILES += \
-       $(top_builddir)/WebKit/gtk/docs/version.xml \
-       $(top_builddir)/WebKit/gtk/docs/GNUmakefile \
-       $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
-       $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml \
-       $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
+       $(top_builddir)/Source/WebKit/gtk/docs/version.xml \
+       $(top_builddir)/Source/WebKit/gtk/docs/GNUmakefile \
+       $(top_builddir)/Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
+       $(top_builddir)/Source/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml \
+       $(top_builddir)/Source/WebKit/gtk/webkit/webkitversion.h
 
 dist-hook:
        cp $(WebKit)/NEWS $(distdir)
index 99a60ee..d65468e 100644 (file)
@@ -1,3 +1,12 @@
+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:
+
 2010-12-08  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 
         Fix name of the Korean translation file.
index 4314573..91a10c4 100644 (file)
@@ -25,12 +25,12 @@ MSGMERGE := $(shell which msgmerge)
 
 MSGMERGE_UPDATE := $(MSGMERGE) --update
 
-POFILES += $(shell ls $(srcdir)/WebKit/gtk/po/*.po)
+POFILES += $(shell ls $(srcdir)/Source/WebKit/gtk/po/*.po)
 
 MOFILES += $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
 
 .po.mo:
-       test -d WebKit/gtk/po/ || mkdir -p WebKit/gtk/po/
+       test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/
        @echo "$(MSGFMT) -c -o $@ $<"; \
        $(MSGFMT) -c -o $@ $<
 
@@ -48,10 +48,10 @@ MOFILES += $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed
 # if updating the $(CATALOGS) would always touch them; however, the rule for
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
-stamp-po: $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot $(MOFILES)
-       test ! -f $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot || \
+stamp-po: $(srcdir)/Source/WebKit/gtk/po/$(DOMAIN).pot $(MOFILES)
+       test ! -f $(srcdir)/Source/WebKit/gtk/po/$(DOMAIN).pot || \
          test -z "$(MOFILES)" || $(MAKE) $(MOFILES)
-       @test ! -f $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot || { \
+       @test ! -f $(srcdir)/Source/WebKit/gtk/po/$(DOMAIN).pot || { \
          echo "touch stamp-po" && \
          echo timestamp > stamp-poT && \
          mv stamp-poT stamp-po; \
@@ -59,7 +59,7 @@ stamp-po: $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot $(MOFILES)
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/WebKit/gtk/po/POTFILES
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/Source/WebKit/gtk/po/POTFILES
        package_gnu=''; \
        if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -70,38 +70,38 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/WebKit/gtk/po/POTFILES
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(srcdir) \
              --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-             --files-from=$(srcdir)/WebKit/gtk/po/POTFILES \
+             --files-from=$(srcdir)/Source/WebKit/gtk/po/POTFILES \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
-             --keyword=_ --keyword=N_ -o $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot \
+             --keyword=_ --keyword=N_ -o $(srcdir)/Source/WebKit/gtk/po/$(DOMAIN).pot \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(srcdir) \
              --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-             --files-from=$(srcdir)/WebKit/gtk/po/POTFILES \
+             --files-from=$(srcdir)/Source/WebKit/gtk/po/POTFILES \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_gnu}@PACKAGE@" \
              --package-version='@VERSION@' \
              --msgid-bugs-address="$$msgid_bugs_address" \
-             --keyword=_ --keyword=N_ -o $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot \
+             --keyword=_ --keyword=N_ -o $(srcdir)/Source/WebKit/gtk/po/$(DOMAIN).pot \
            ;; \
        esac
 
 # This rule has no dependencies: we don't need to update $(DOMAIN).pot at
 # every "make" invocation, only create it when it is missing.
 # Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
-$(srcdir)/WebKit/gtk/po/$(DOMAIN).pot:
+$(srcdir)/Source/WebKit/gtk/po/$(DOMAIN).pot:
        $(MAKE) $(DOMAIN).pot-update
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-update-po-files: $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot
+update-po-files: $(srcdir)/Source/WebKit/gtk/po/$(DOMAIN).pot
        @for pofile in $(POFILES); do \
          lang=`echo $$pofile | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-         if test -f "$(srcdir)/WebKit/gtk/po/$${lang}.po"; then \
-           test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir)/WebKit/gtk/po && "; \
+         if test -f "$(srcdir)/Source/WebKit/gtk/po/$${lang}.po"; then \
+           test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir)/Source/WebKit/gtk/po && "; \
            echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-           pushd $(srcdir)/WebKit/gtk/po && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+           pushd $(srcdir)/Source/WebKit/gtk/po && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
            popd; \
          else \
            $(MAKE) $${lang}.po-create; \
@@ -136,7 +136,7 @@ po-install-data-local: all
          lang=`echo $$cat | sed -e 's/\.mo$$//'`; \
          dir=$(localedir)/$$lang/LC_MESSAGES; \
          $(mkdir_p) $(DESTDIR)$$dir; \
-         if test -r WebKit/gtk/po/$$cat; then realcat=WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \
+         if test -r Source/WebKit/gtk/po/$$cat; then realcat=Source/WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \
          $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
          echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
          for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
index 8084242..3109ffe 100644 (file)
@@ -45,7 +45,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
     # the package sources are relocatable.
 
     PATH_TO_HEADER = $$HEADER
-    CONFIG(standalone_package): PATH_TO_HEADER = ../../WebKit/qt/Api/$$basename(HEADER)
+    CONFIG(standalone_package): PATH_TO_HEADER = ../../../Source/WebKit/qt/Api/$$basename(HEADER)
 
     eval($${HEADER_TARGET}.target = $${DESTDIR}/$${HEADER_NAME})
     eval($${HEADER_TARGET}.depends = $$HEADER)
index 09cdb4a..26394ec 100644 (file)
@@ -1,3 +1,15 @@
+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-15  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r75708.
index 526cf06..bc94eed 100644 (file)
@@ -33,7 +33,7 @@ symbian: {
     TARGET = $$TARGET$${QT_LIBINFIX}
 }
 
-include(../../../WebKit.pri)
+include(../../../../WebKit.pri)
 
 QT += declarative
 
index a56ddb4..d87dcd6 100644 (file)
@@ -1,4 +1,4 @@
-include(../../../WebKit.pri)
+include(../../../../WebKit.pri)
 
 unix {
     QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/bin/qdoc3
index a795ff8..2e30dd0 100644 (file)
@@ -10,7 +10,7 @@ INCLUDEPATH += \
     $$PWD \
     $$PWD/../Api
 
-include(../../../WebKit.pri)
+include(../../../../WebKit.pri)
 QT += testlib network
 
 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
index 0feb770..1136277 100644 (file)
@@ -46,7 +46,7 @@ my $usage = "generate-webkitversion --config WebKit/mac/Configurations/Version.x
 my $major_version = "";
 my $minor_version = "";
 # The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in WebKit/mac/Configurations/.
-my $configFile = "./WebKit/mac/Configurations/Version.xcconfig";
+my $configFile = "./Soure/WebKit/mac/Configurations/Version.xcconfig";
 my $outputDir = "";
 
 GetOptions('config=s' => \$configFile,
@@ -55,7 +55,7 @@ GetOptions('config=s' => \$configFile,
 die "You must specify a --config <file> " unless (length($configFile));
 die "You must specify a --outputDir <outputdir> " unless (length($outputDir));
 
-die "./WebKit/mac/Configurations/Version.xcconfig does not exist: use --config <file> to specify its correct location." unless (-e $configFile);
+die "./Source/WebKit/mac/Configurations/Version.xcconfig does not exist: use --config <file> to specify its correct location." unless (-e $configFile);
 die "$outputDir/ does not exist: use --outputDir <directory> to specify the location of an output directory that exists" unless (-e "$outputDir");
 
 unless (open INPUT, "<", $configFile) { print STDERR "File does not exist: $configFile\n";}
index 09da58b..318ae95 100644 (file)
@@ -1,3 +1,15 @@
+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-15  Adam Barth  <abarth@webkit.org>
 
         Rubber-stamped by Eric Seidel.
index 2da87bf..555a477 100644 (file)
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\InterfacesCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\InterfacesCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
@@ -70,7 +70,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\InterfacesCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\InterfacesCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Release_LTCG|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\InterfacesCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\InterfacesCommon.vsprops"
                        CharacterSet="1"
                        WholeProgramOptimization="1"
                        >
                <Configuration
                        Name="Debug_All|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\InterfacesCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\InterfacesCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Release_Cairo_CFLite|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\InterfacesCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\InterfacesCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Debug_Cairo_CFLite|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\InterfacesCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\InterfacesCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
index b36cc3a..10ac3a3 100644 (file)
@@ -1,60 +1,60 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}"
        ProjectSection(ProjectDependencies) = postProject
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\..\..\Source\WebCore\WebCore.vcproj\WebCore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\..\..\..\Source\WebCore\WebCore.vcproj\WebCore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
        ProjectSection(ProjectDependencies) = postProject
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325} = {E498CA9D-3BD2-4D52-8E37-C8DC76526325}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"
        ProjectSection(ProjectDependencies) = postProject
                {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"
        ProjectSection(ProjectDependencies) = postProject
                {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2} = {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}
        EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JavaScriptCore Folder", "JavaScriptCore Folder", "{557FA164-0E39-4DEC-B66C-8795C8E52399}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebCore Folder", "WebCore Folder", "{63FB6F8A-C601-43E3-BD16-A00A465C2CB6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreGenerated", "..\..\..\Source\WebCore\WebCore.vcproj\WebCoreGenerated.vcproj", "{0A324352-B3B6-496C-9E5B-4C7E923E628B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreGenerated", "..\..\..\..\Source\WebCore\WebCore.vcproj\WebCoreGenerated.vcproj", "{0A324352-B3B6-496C-9E5B-4C7E923E628B}"
        ProjectSection(ProjectDependencies) = postProject
                {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QTMovieWin", "..\..\..\Source\WebCore\WebCore.vcproj\QTMovieWin.vcproj", "{E498CA9D-3BD2-4D52-8E37-C8DC76526325}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QTMovieWin", "..\..\..\..\Source\WebCore\WebCore.vcproj\QTMovieWin.vcproj", "{E498CA9D-3BD2-4D52-8E37-C8DC76526325}"
        ProjectSection(ProjectDependencies) = postProject
                {0A324352-B3B6-496C-9E5B-4C7E923E628B} = {0A324352-B3B6-496C-9E5B-4C7E923E628B}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapi", "..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\testapi\testapi.vcproj", "{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapi", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\testapi\testapi.vcproj", "{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}"
        ProjectSection(ProjectDependencies) = postProject
                {DA31DA52-6675-48D4-89E0-333A7144397C} = {DA31DA52-6675-48D4-89E0-333A7144397C}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "..\..\..\Source\WebKit2\win\WebKit2.vcproj", "{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "..\..\..\..\Source\WebKit2\win\WebKit2.vcproj", "{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}"
        ProjectSection(ProjectDependencies) = postProject
                {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB} = {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}
        EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit2 Folder", "WebKit2 Folder", "{9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2Generated", "..\..\..\Source\WebKit2\win\WebKit2Generated.vcproj", "{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2Generated", "..\..\..\..\Source\WebKit2\win\WebKit2Generated.vcproj", "{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}"
        ProjectSection(ProjectDependencies) = postProject
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {0662A8A9-82A3-4638-97D8-EC425D8D87C9}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2WebProcess", "..\..\..\Source\WebKit2\win\WebKit2WebProcess.vcproj", "{AAE88FEF-509E-4D49-870B-7357922C276F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2WebProcess", "..\..\..\..\Source\WebKit2\win\WebKit2WebProcess.vcproj", "{AAE88FEF-509E-4D49-870B-7357922C276F}"
        ProjectSection(ProjectDependencies) = postProject
                {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD} = {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}
        EndProjectSection
@@ -78,72 +78,72 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitGUID", "WebKitGUID.vc
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpRenderTree", "..\..\..\Tools\DumpRenderTree\win\DumpRenderTree.vcproj", "{6567DFD4-D6DE-4CD5-825D-17E353D160E1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpRenderTree", "..\..\..\..\Tools\DumpRenderTree\win\DumpRenderTree.vcproj", "{6567DFD4-D6DE-4CD5-825D-17E353D160E1}"
        ProjectSection(ProjectDependencies) = postProject
                {59CC0547-70AC-499C-9B19-EC01C6F61137} = {59CC0547-70AC-499C-9B19-EC01C6F61137}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiff", "..\..\..\Tools\DumpRenderTree\win\ImageDiff.vcproj", "{59CC0547-70AC-499C-9B19-EC01C6F61137}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiff", "..\..\..\..\Tools\DumpRenderTree\win\ImageDiff.vcproj", "{59CC0547-70AC-499C-9B19-EC01C6F61137}"
        ProjectSection(ProjectDependencies) = postProject
                {C0737398-3565-439E-A2B8-AB2BE4D5430C} = {C0737398-3565-439E-A2B8-AB2BE4D5430C}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindSafari", "..\..\..\Tools\FindSafari\FindSafari.vcproj", "{DA31DA52-6675-48D4-89E0-333A7144397C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindSafari", "..\..\..\..\Tools\FindSafari\FindSafari.vcproj", "{DA31DA52-6675-48D4-89E0-333A7144397C}"
        ProjectSection(ProjectDependencies) = postProject
                {AAE88FEF-509E-4D49-870B-7357922C276F} = {AAE88FEF-509E-4D49-870B-7357922C276F}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "record-memory-win", "..\..\..\Tools\record-memory-win\record-memory-win.vcproj", "{44B9C152-1870-4035-B94D-7B3285AA0C12}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "record-memory-win", "..\..\..\..\Tools\record-memory-win\record-memory-win.vcproj", "{44B9C152-1870-4035-B94D-7B3285AA0C12}"
        ProjectSection(ProjectDependencies) = postProject
                {D09806DB-E58B-4646-8C9B-61101906C1E2} = {D09806DB-E58B-4646-8C9B-61101906C1E2}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestNetscapePlugin", "..\..\..\Tools\DumpRenderTree\TestNetscapePlugIn\win\TestNetscapePlugin.vcproj", "{C0737398-3565-439E-A2B8-AB2BE4D5430C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestNetscapePlugin", "..\..\..\..\Tools\DumpRenderTree\TestNetscapePlugIn\win\TestNetscapePlugin.vcproj", "{C0737398-3565-439E-A2B8-AB2BE4D5430C}"
        ProjectSection(ProjectDependencies) = postProject
                {114FCA11-216B-4C8C-957E-30A75AE80443} = {114FCA11-216B-4C8C-957E-30A75AE80443}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitAPITest", "..\..\..\Tools\WebKitAPITest\WebKitAPITest.vcproj", "{626089A3-25D3-4883-A96C-B8C66E036397}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitAPITest", "..\..\..\..\Tools\WebKitAPITest\WebKitAPITest.vcproj", "{626089A3-25D3-4883-A96C-B8C66E036397}"
        ProjectSection(ProjectDependencies) = postProject
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {6567DFD4-D6DE-4CD5-825D-17E353D160E1}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitLauncherWin", "..\..\..\Tools\WebKitLauncherWin\WebKitLauncherWin.vcproj", "{D09806DB-E58B-4646-8C9B-61101906C1E2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitLauncherWin", "..\..\..\..\Tools\WebKitLauncherWin\WebKitLauncherWin.vcproj", "{D09806DB-E58B-4646-8C9B-61101906C1E2}"
        ProjectSection(ProjectDependencies) = postProject
                {626089A3-25D3-4883-A96C-B8C66E036397} = {626089A3-25D3-4883-A96C-B8C66E036397}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncher", "..\..\..\Tools\WinLauncher\WinLauncher.vcproj", "{114FCA11-216B-4C8C-957E-30A75AE80443}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncher", "..\..\..\..\Tools\WinLauncher\WinLauncher.vcproj", "{114FCA11-216B-4C8C-957E-30A75AE80443}"
        ProjectSection(ProjectDependencies) = postProject
                {C59E5129-B453-49B7-A52B-1E104715F76E} = {C59E5129-B453-49B7-A52B-1E104715F76E}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundle", "..\..\..\Tools\WebKitTestRunner\win\InjectedBundle.vcproj", "{CBC3391C-F060-4BF5-A66E-81404168816B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundle", "..\..\..\..\Tools\WebKitTestRunner\win\InjectedBundle.vcproj", "{CBC3391C-F060-4BF5-A66E-81404168816B}"
        ProjectSection(ProjectDependencies) = postProject
                {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD} = {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundleGenerated", "..\..\..\Tools\WebKitTestRunner\win\InjectedBundleGenerated.vcproj", "{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundleGenerated", "..\..\..\..\Tools\WebKitTestRunner\win\InjectedBundleGenerated.vcproj", "{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}"
        ProjectSection(ProjectDependencies) = postProject
                {44B9C152-1870-4035-B94D-7B3285AA0C12} = {44B9C152-1870-4035-B94D-7B3285AA0C12}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitTestRunner", "..\..\..\Tools\WebKitTestRunner\win\WebKitTestRunner.vcproj", "{3B99669B-1817-443B-BCBE-835580146668}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitTestRunner", "..\..\..\..\Tools\WebKitTestRunner\win\WebKitTestRunner.vcproj", "{3B99669B-1817-443B-BCBE-835580146668}"
        ProjectSection(ProjectDependencies) = postProject
                {CBC3391C-F060-4BF5-A66E-81404168816B} = {CBC3391C-F060-4BF5-A66E-81404168816B}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiniBrowser", "..\..\..\Tools\MiniBrowser\MiniBrowser.vcproj", "{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiniBrowser", "..\..\..\..\Tools\MiniBrowser\MiniBrowser.vcproj", "{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}"
        ProjectSection(ProjectDependencies) = postProject
                {3E48AB23-D249-488F-A1C4-43CDF52FBD28} = {3E48AB23-D249-488F-A1C4-43CDF52FBD28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPI", "..\..\..\Tools\TestWebKitAPI\win\TestWebKitAPI.vcproj", "{3E48AB23-D249-488F-A1C4-43CDF52FBD28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPI", "..\..\..\..\Tools\TestWebKitAPI\win\TestWebKitAPI.vcproj", "{3E48AB23-D249-488F-A1C4-43CDF52FBD28}"
        ProjectSection(ProjectDependencies) = postProject
                {45C45411-7F0E-404D-919A-4EE9BB60BE86} = {45C45411-7F0E-404D-919A-4EE9BB60BE86}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPIGenerated", "..\..\..\Tools\TestWebKitAPI\win\TestWebKitAPIGenerated.vcproj", "{45C45411-7F0E-404D-919A-4EE9BB60BE86}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPIGenerated", "..\..\..\..\Tools\TestWebKitAPI\win\TestWebKitAPIGenerated.vcproj", "{45C45411-7F0E-404D-919A-4EE9BB60BE86}"
        ProjectSection(ProjectDependencies) = postProject
                {3B99669B-1817-443B-BCBE-835580146668} = {3B99669B-1817-443B-BCBE-835580146668}
        EndProjectSection
index bf13191..d1aa3c6 100644 (file)
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitLibCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitLibCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
@@ -70,7 +70,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitLibCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitLibCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Debug_Cairo_CFLite|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKitLibCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKitLibCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Release_Cairo_CFLite|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKitLibCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKitLibCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Debug_All|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitLibCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitLibCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Release_LTCG|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitLibCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitLibCommon.vsprops"
                        CharacterSet="1"
                        WholeProgramOptimization="1"
                        >
index 4d0ebdf..5d1abd2 100644 (file)
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitGUIDCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitGUIDCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
@@ -71,7 +71,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitGUIDCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitGUIDCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Debug_All|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitGUIDCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitGUIDCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Release_LTCG|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitGUIDCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitGUIDCommon.vsprops"
                        CharacterSet="1"
                        WholeProgramOptimization="1"
                        >
                <Configuration
                        Name="Release_Cairo_CFLite|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\WebKitGUIDCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\WebKitGUIDCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
                <Configuration
                        Name="Debug_Cairo_CFLite|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\WebKitGUIDCommon.vsprops"
+                       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\WebKitGUIDCommon.vsprops"
                        CharacterSet="1"
                        >
                        <Tool
index 60759d4..8fce4c3 100644 (file)
@@ -1017,16 +1017,16 @@ GNUmakefile
  
 if test "$enable_webkit2" = "no"; then
     AC_CONFIG_FILES([
-    WebKit/gtk/webkit/webkitversion.h
-    WebKit/gtk/docs/GNUmakefile
-    WebKit/gtk/docs/version.xml
+    Source/WebKit/gtk/webkit/webkitversion.h
+    Source/WebKit/gtk/docs/GNUmakefile
+    Source/WebKit/gtk/docs/version.xml
     ]
     )
 
     AC_CONFIG_FILES([
-    WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
-    WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in
-    WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in
+    Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
+    Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
+    Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
     ]
     ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
     )
diff --git a/wscript b/wscript
index ff9e208..d0c1fae 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"):
@@ -187,7 +187,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):  
@@ -310,8 +310,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 +327,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'])