Commit be159d97 authored by abarth@webkit.org's avatar abarth@webkit.org

Move WebKit2 into Source

https://bugs.webkit.org/show_bug.cgi?id=52438

Rubber-stamped by Eric Seidel.

.: 

Update reference to WebKit2.

* DerivedSources.pro:
* GNUmakefile.am:
* Makefile:
* Source/cmake/WebKitPackaging.cmake:
* WebKit.pro:
* configure.ac:

Source/WebCore: 

* WebCore.pro:

Source/WebKit2: 

* DerivedSources.pro:
* GNUmakefile.am:
* WebKit2.pro:
* WebProcess.pro:
* win/WebKit2.vcproj:
* win/WebKit2WebProcess.vcproj:

Tools: 

* MiniBrowser/qt/MiniBrowser.pro:
* Scripts/build-webkit:
* Scripts/do-file-rename:
* Scripts/do-webcore-rename:
* Scripts/test-webkitpy:
* Scripts/webkitdirs.pm:
* Scripts/webkitpy/style/checker.py:
* WebKitTestRunner/DerivedSources.pro:
* WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
* WebKitTestRunner/qt/WebKitTestRunner.pro:

WebKit/win: 

Update reference to WebKit2.

* WebKit.vcproj/WebKit.sln:

Websites/bugs.webkit.org: 

Remove WebKit2 from the list of top-level source directories.

* PrettyPatch/PrettyPatch.rb:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75880 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d73126ee
2011-01-15 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit2 into Source
https://bugs.webkit.org/show_bug.cgi?id=52438
Update reference to WebKit2.
* DerivedSources.pro:
* GNUmakefile.am:
* Makefile:
* Source/cmake/WebKitPackaging.cmake:
* WebKit.pro:
* configure.ac:
2011-01-14 Ahmad Sharif <asharif.tools@gmail.com>
Reviewed by Darin Fisher.
......
......@@ -7,7 +7,7 @@ SUBDIRS += \
WebKit/qt/Api/DerivedSources.pro
webkit2 {
SUBDIRS += WebKit2/DerivedSources.pro \
SUBDIRS += Source/WebKit2/DerivedSources.pro \
Tools/WebKitTestRunner/DerivedSources.pro \
Tools/MiniBrowser/DerivedSources.pro
}
......
......@@ -39,7 +39,7 @@ GENPROGRAMS := $(top_builddir)/Programs
GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
WebCore := $(srcdir)/Source/WebCore
WebKit := $(srcdir)/WebKit/gtk
WebKit2 := $(srcdir)/WebKit2
WebKit2 := $(srcdir)/Source/WebKit2
# Libraries and support components
bin_PROGRAMS :=
......@@ -228,7 +228,7 @@ EXTRA_DIST += \
include Source/JavaScriptCore/GNUmakefile.am
include Source/WebCore/GNUmakefile.am
if ENABLE_WEBKIT2
include WebKit2/GNUmakefile.am
include Source/WebKit2/GNUmakefile.am
else
include WebKit/gtk/GNUmakefile.am
include Source/WebCore/bindings/gobject/GNUmakefile.am
......
MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE Source/WebCore WebKit WebKit2 Tools
MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE Source/WebCore WebKit Source/WebKit2 Tools
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
......
2011-01-15 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit2 into Source
https://bugs.webkit.org/show_bug.cgi?id=52438
* WebCore.pro:
2011-01-15 Joone Hur <joone.hur@collabora.co.uk>
Reviewed by Martin Robinson.
......
......@@ -181,8 +181,8 @@ include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
!v8: addJavaScriptCoreLib(../JavaScriptCore)
webkit2 {
include($$PWD/../../WebKit2/WebKit2.pri)
addWebKit2LibWholeArchive(../../WebKit2)
include($$PWD/../../Source/WebKit2/WebKit2.pri)
addWebKit2LibWholeArchive(../../Source/WebKit2)
}
# Extract sources to build from the generator definitions
......
2011-01-15 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Move WebKit2 into Source
https://bugs.webkit.org/show_bug.cgi?id=52438
* DerivedSources.pro:
* GNUmakefile.am:
* WebKit2.pro:
* WebProcess.pro:
* win/WebKit2.vcproj:
* win/WebKit2WebProcess.vcproj:
2011-01-14 Yuzo Fujishima <yuzo@google.com>
Reviewed by Antti Koivisto.
......@@ -5,10 +5,10 @@ CONFIG -= debug_and_release
CONFIG(standalone_package) {
isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../Source/WebCore/generated
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../../Source/WebCore/generated
} else {
isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../Source/WebCore/generated
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../Source/WebCore/generated
}
WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \
......@@ -41,7 +41,7 @@ SBOX_CHECK = $$(_SBOX_DIR)
PYTHON = python
}
SRC_ROOT_DIR = $$replace(PWD, /WebKit2, /)
SRC_ROOT_DIR = $$replace(PWD, /Source/WebKit2, /)
defineTest(addExtraCompiler) {
eval($${1}.CONFIG = target_predeps no_link)
......@@ -111,20 +111,20 @@ SCRIPTS = \
$$PWD/Scripts/webkit2/__init__.py \
$$PWD/Scripts/webkit2/messages.py
message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}Source/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
message_header_generator.input = MESSAGE_RECEIVERS
message_header_generator.depends = $$SCRIPTS
message_header_generator.output_function = message_header_generator_output
addExtraCompiler(message_header_generator)
message_receiver_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
message_receiver_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}Source/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
message_receiver_generator.input = MESSAGE_RECEIVERS
message_receiver_generator.depends = $$SCRIPTS
message_receiver_generator.output_function = message_receiver_generator_output
addExtraCompiler(message_receiver_generator)
fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKit2 ../include qt
fwheader_generator.depends = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl
fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Source/WebKit2 ../../include qt
fwheader_generator.depends = $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl
generated_files.depends += fwheader_generator
QMAKE_EXTRA_TARGETS += fwheader_generator
......
This diff is collapsed.