Skip to content

Commit d197964

Browse files
author
Adam Barth
committed
2011-01-16 Adam Barth <abarth@webkit.org>
 Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * WebKit.grd: * WebKit.gyp: 2011-01-16 Adam Barth <abarth@webkit.org> Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * Api/DerivedSources.pro: * declarative/declarative.pro: * docs/docs.pri: * tests/tests.pri: 2011-01-16 Adam Barth <abarth@webkit.org> Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * GNUmakefile.am: 2011-01-16 Adam Barth <abarth@webkit.org> Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * GNUmakefile.am: 2011-01-16 Adam Barth <abarth@webkit.org> Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * Makefile: * scripts/generate-webkitversion.pl: 2011-01-16 Adam Barth <abarth@webkit.org> Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * WebKit.vcproj/Interfaces.vcproj: * WebKit.vcproj/WebKit.sln: * WebKit.vcproj/WebKit.vcproj: * WebKit.vcproj/WebKitGUID.vcproj: 2011-01-16 Adam Barth <abarth@webkit.org> Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * Android.mk: * CMakeLists.txt: * DerivedSources.pro: * GNUmakefile.am: * Makefile: * WebKit.pri: * WebKit.pro: * configure.ac: * wscript: 2011-01-16 Adam Barth <abarth@webkit.org> Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h: * DumpRenderTree/qt/DumpRenderTreeQt.cpp: * DumpRenderTree/qt/DumpRenderTreeQt.h: * DumpRenderTree/qt/GCControllerQt.cpp: * DumpRenderTree/qt/LayoutTestControllerQt.cpp: * DumpRenderTree/qt/PlainTextControllerQt.cpp: * DumpRenderTree/qt/TextInputControllerQt.cpp: * DumpRenderTree/wscript: * QtTestBrowser/launcherwindow.h: * Scripts/build-webkit: * Scripts/webkitdirs.pm: 2011-01-16 Adam Barth <abarth@webkit.org> Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * JavaScriptCore.gyp/JavaScriptCore.gyp: 2011-01-16 Adam Barth <abarth@webkit.org> Rubber-stamped by Eric Seidel. Move WebKit into Source https://bugs.webkit.org/show_bug.cgi?id=52530 * WebCore.gyp/WebCore.gyp: * WebCore.pri: * WebCore.pro: Canonical link: https://commits.webkit.org/66154@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@75908 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 6d1851f commit d197964

48 files changed

Lines changed: 486 additions & 367 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Android.mk‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ WEBKIT_SRC_FILES :=
6464
# We have to use bison 2.3
6565
include $(BASE_PATH)/bison_check.mk
6666

67-
# Build our list of include paths. We include WebKit/android/icu first so that
67+
# Build our list of include paths. We include Source/WebKit/android/icu first so that
6868
# any files that include <unicode/ucnv.h> will include our ucnv.h first. We
6969
# also add external/ as an include directory so that we can specify the real
7070
# icu header directory as a more exact reference to avoid including our ucnv.h.
@@ -73,7 +73,7 @@ include $(BASE_PATH)/bison_check.mk
7373
# the right config.h.
7474
LOCAL_C_INCLUDES := \
7575
$(JNI_H_INCLUDE) \
76-
$(LOCAL_PATH)/WebKit/android/icu \
76+
$(LOCAL_PATH)/Source/WebKit/android/icu \
7777
external/ \
7878
external/icu4c/common \
7979
external/icu4c/i18n \
@@ -130,12 +130,12 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
130130
$(LOCAL_PATH)/Source/WebCore/xml
131131

132132
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
133-
$(LOCAL_PATH)/WebKit/android \
134-
$(LOCAL_PATH)/WebKit/android/WebCoreSupport \
135-
$(LOCAL_PATH)/WebKit/android/jni \
136-
$(LOCAL_PATH)/WebKit/android/nav \
137-
$(LOCAL_PATH)/WebKit/android/plugins \
138-
$(LOCAL_PATH)/WebKit/android/stl
133+
$(LOCAL_PATH)/Source/WebKit/android \
134+
$(LOCAL_PATH)/Source/WebKit/android/WebCoreSupport \
135+
$(LOCAL_PATH)/Source/WebKit/android/jni \
136+
$(LOCAL_PATH)/Source/WebKit/android/nav \
137+
$(LOCAL_PATH)/Source/WebKit/android/plugins \
138+
$(LOCAL_PATH)/Source/WebKit/android/stl
139139

140140
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
141141
$(LOCAL_PATH)/Source/JavaScriptCore \

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
1111

1212
SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
1313
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
14-
SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
14+
SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
1515
SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
1616
SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
1717

@@ -106,7 +106,7 @@ INCLUDE(WebKitPackaging)
106106
# -----------------------------------------------------------------------------
107107
ADD_SUBDIRECTORY(Source/JavaScriptCore)
108108
ADD_SUBDIRECTORY(Source/WebCore)
109-
ADD_SUBDIRECTORY(WebKit)
109+
ADD_SUBDIRECTORY(Source/WebKit)
110110

111111
# -----------------------------------------------------------------------------
112112
# Add test browser if exists

‎ChangeLog‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2011-01-16 Adam Barth <abarth@webkit.org>
2+
3+
Rubber-stamped by Eric Seidel.
4+
5+
Move WebKit into Source
6+
https://bugs.webkit.org/show_bug.cgi?id=52530
7+
8+
* Android.mk:
9+
* CMakeLists.txt:
10+
* DerivedSources.pro:
11+
* GNUmakefile.am:
12+
* Makefile:
13+
* WebKit.pri:
14+
* WebKit.pro:
15+
* configure.ac:
16+
* wscript:
17+
118
2011-01-15 Adam Barth <abarth@webkit.org>
219

320
Rubber-stamped by Eric Seidel.

‎DerivedSources.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CONFIG += ordered
44
SUBDIRS += \
55
Source/JavaScriptCore/DerivedSources.pro \
66
Source/WebCore/DerivedSources.pro \
7-
WebKit/qt/Api/DerivedSources.pro
7+
Source/WebKit/qt/Api/DerivedSources.pro
88

99
webkit2 {
1010
SUBDIRS += Source/WebKit2/DerivedSources.pro \

‎GNUmakefile.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
3838
GENPROGRAMS := $(top_builddir)/Programs
3939
GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
4040
WebCore := $(srcdir)/Source/WebCore
41-
WebKit := $(srcdir)/WebKit/gtk
41+
WebKit := $(srcdir)/Source/WebKit/gtk
4242
WebKit2 := $(srcdir)/Source/WebKit2
4343

4444
# Libraries and support components
@@ -222,18 +222,18 @@ endif
222222
EXTRA_DIST += \
223223
$(srcdir)/Source/autotools/symbols.filter \
224224
$(srcdir)/gtk-doc.make \
225-
$(srcdir)/WebKit/LICENSE
225+
$(srcdir)/Source/WebKit/LICENSE
226226

227227
# Include module makefiles
228228
include Source/JavaScriptCore/GNUmakefile.am
229229
include Source/WebCore/GNUmakefile.am
230230
if ENABLE_WEBKIT2
231231
include Source/WebKit2/GNUmakefile.am
232232
else
233-
include WebKit/gtk/GNUmakefile.am
233+
include Source/WebKit/gtk/GNUmakefile.am
234234
include Source/WebCore/bindings/gobject/GNUmakefile.am
235235
include Tools/GNUmakefile.am
236-
include WebKit/gtk/po/GNUmakefile.am
236+
include Source/WebKit/gtk/po/GNUmakefile.am
237237
endif
238238

239239
# Autogenerated sources

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE Source/WebCore WebKit Source/WebKit2 Tools
1+
MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE Source/WebCore Source/WebKit Source/WebKit2 Tools
22

33
all:
44
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2011-01-16 Adam Barth <abarth@webkit.org>
2+
3+
Rubber-stamped by Eric Seidel.
4+
5+
Move WebKit into Source
6+
https://bugs.webkit.org/show_bug.cgi?id=52530
7+
8+
* JavaScriptCore.gyp/JavaScriptCore.gyp:
9+
110
2011-01-16 Oliver Hunt <oliver@apple.com>
211

312
Reviewed by Sam Weinig.

‎Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
'includes': [
3333
# FIXME: Sense whether upstream or downstream build, and
3434
# include the right features.gypi
35-
'../../../WebKit/chromium/features.gypi',
35+
'../../../Source/WebKit/chromium/features.gypi',
3636
'../JavaScriptCore.gypi',
3737
],
3838
'variables': {
3939
# Location of the chromium src directory.
4040
'conditions': [
4141
['inside_chromium_build==0', {
4242
# Webkit is being built outside of the full chromium project.
43-
'chromium_src_dir': '../../../WebKit/chromium',
43+
'chromium_src_dir': '../../../Source/WebKit/chromium',
4444
},{
4545
# WebKit is checked out in src/chromium/third_party/WebKit
4646
'chromium_src_dir': '../../../../..',

‎Source/WebCore/ChangeLog‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2011-01-16 Adam Barth <abarth@webkit.org>
2+
3+
Rubber-stamped by Eric Seidel.
4+
5+
Move WebKit into Source
6+
https://bugs.webkit.org/show_bug.cgi?id=52530
7+
8+
* WebCore.gyp/WebCore.gyp:
9+
* WebCore.pri:
10+
* WebCore.pro:
11+
112
2011-01-16 Simon Fraser <simon.fraser@apple.com>
213

314
Reviewed by Dan Bernstein.

‎Source/WebCore/WebCore.gyp/WebCore.gyp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
'includes': [
3333
# FIXME: Sense whether upstream or downstream build, and
3434
# include the right features.gypi
35-
'../../../WebKit/chromium/features.gypi',
35+
'../../../Source/WebKit/chromium/features.gypi',
3636
'../WebCore.gypi',
3737
],
3838
# Location of the chromium src directory.
3939
'conditions': [
4040
['inside_chromium_build==0', {
4141
# Webkit is being built outside of the full chromium project.
4242
'variables': {
43-
'chromium_src_dir': '../../../WebKit/chromium',
43+
'chromium_src_dir': '../../../Source/WebKit/chromium',
4444
'libjpeg_gyp_path': '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp',
4545
},
4646
},{
@@ -1085,7 +1085,7 @@
10851085
'<@(webcore_files)',
10861086

10871087
# For WebCoreSystemInterface, Mac-only.
1088-
'../../../WebKit/mac/WebCoreSupport/WebSystemInterface.mm',
1088+
'../../../Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm',
10891089
],
10901090
'sources/': [
10911091
# Start by excluding everything then include platform files only.
@@ -1201,7 +1201,7 @@
12011201
# Use USE_NEW_THEME on Mac.
12021202
['include', 'platform/Theme\\.cpp$'],
12031203

1204-
['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
1204+
['include', 'Source/WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
12051205

12061206
# Chromium Mac does not use skia.
12071207
['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
@@ -1464,7 +1464,7 @@
14641464
'direct_dependent_settings': {
14651465
'include_dirs': [
14661466
'../../../WebKitLibraries',
1467-
'../../../WebKit/mac/WebCoreSupport',
1467+
'../../../Source/WebKit/mac/WebCoreSupport',
14681468
],
14691469
},
14701470
}],

0 commit comments

Comments
 (0)