Skip to content

GitLab

W
webkit
Commit 76da8fc1 authored by abarth@webkit.org's avatar abarth@webkit.org
Browse files
Options

Move JavaScriptCore to Source 

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

Reviewed by Eric Seidel.

Update references to JavaScriptCore to point to the new location.

* Android.mk:
* CMakeLists.txt:
* DerivedSources.pro:
* GNUmakefile.am:
* Makefile:
* WebKit.pri:
* WebKit.pro:
* wscript:

Tools: 

Update references to JavaScriptCore to point to the new location.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
* DumpRenderTree/qt/DumpRenderTree.pro:
* DumpRenderTree/qt/ImageDiff.pro:
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
* DumpRenderTree/wscript:
* Scripts/build-jsc:
* Scripts/build-webkit:
* Scripts/do-file-rename:
* Scripts/do-webcore-rename:
* Scripts/run-javascriptcore-tests:
* Scripts/update-javascriptcore-test-results:
* Scripts/webkitdirs.pm:
* Scripts/webkitpy/common/config/build_unittest.py:
* Scripts/webkitpy/style/checker.py:
* Scripts/webkitpy/style/checker_unittest.py:
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
* WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
* WebKitTestRunner/qt/WebKitTestRunner.pro:
* wx/build/settings.py:

WebCore: 

Update references to JavaScriptCore.

* Android.derived.jscbindings.mk:
* Android.v8bindings.mk:
* CMakeLists.txt:
* WebCore.gyp/WebCore.gyp:
* WebCore.pro:
  - These changes are subtle and might not be 100% correct.
* move-js-headers.sh:

WebKit/chromium: 

* WebKit.gyp:
  - Point to JavaScriptCore in its new location.

WebKit/gtk: 

* GNUmakefile.am:
* docs/GNUmakefile.am:
  - Point to JavaScriptCore in its new location.

WebKit/qt: 

* WebKit_pch.h:
* docs/qtwebkit.qdocconf:
  - Point to JavaScriptCore in its new location.

WebKit/win: 

* WebKit.vcproj/WebKit.sln:
  - Point to JavaScriptCore in its new location.

WebKit/wx: 

* bindings/python/wscript:
* wscript:
  - Point to JavaScriptCore in its new location.

WebKit2: 

* WebKit2.pro:
  - Point to JavaScriptCore in its new location.

Websites/bugs.webkit.org: 

* PrettyPatch/PrettyPatch.rb:
  - Remove reference to JavaScriptCore as a source directory.

Websites/webkit.org: 

* coding/assertion-guidelines.html:
  - Update documentation to point to the new location of
    JavaScriptCore.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74855 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 442f0795
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 11 deletions

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
Plain diff Email patch
Android.mk
View file @ 76da8fc1
......@@ -138,10 +138,10 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/WebKit/android/stl
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/JavaScriptCore \
$(LOCAL_PATH)/JavaScriptCore/wtf \
$(LOCAL_PATH)/JavaScriptCore/wtf/unicode \
$(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu
$(LOCAL_PATH)/Source/JavaScriptCore \
$(LOCAL_PATH)/Source/JavaScriptCore/wtf \
$(LOCAL_PATH)/Source/JavaScriptCore/wtf/unicode \
$(LOCAL_PATH)/Source/JavaScriptCore/wtf/unicode/icu
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(base_intermediates)/WebCore/ \
......@@ -161,7 +161,7 @@ endif
ifeq ($(JAVASCRIPT_ENGINE),v8)
# Include WTF source file.
d := JavaScriptCore
d := Source/JavaScriptCore
LOCAL_PATH := $(BASE_PATH)/$d
intermediates := $(base_intermediates)/$d
include $(LOCAL_PATH)/Android.v8.wtf.mk
......@@ -171,7 +171,7 @@ endif # JAVASCRIPT_ENGINE == v8
# Include source files for WebCore
d := WebCore
LOCAL_PATH := $(BASE_PATH)/$d
JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore
JAVASCRIPTCORE_PATH := $(BASE_PATH)/Source/JavaScriptCore
intermediates := $(base_intermediates)/$d
include $(LOCAL_PATH)/Android.mk
ifeq ($(JAVASCRIPT_ENGINE),jsc)
......@@ -283,7 +283,7 @@ LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
LOCAL_STATIC_LIBRARIES := $(WEBKIT_STATIC_LIBRARIES)
LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
# Include source files for JavaScriptCore
d := JavaScriptCore
d := Source/JavaScriptCore
LOCAL_PATH := $(BASE_PATH)/$d
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
# Cannot use base_intermediates as this is a new module
......
CMakeLists.txt
View file @ 76da8fc1
......@@ -9,7 +9,7 @@ IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
ENDIF ()
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
......
ChangeLog
View file @ 76da8fc1
2011-01-01 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
Move JavaScriptCore to Source
https://bugs.webkit.org/show_bug.cgi?id=51604
Update references to JavaScriptCore to point to the new location.
* Android.mk:
* CMakeLists.txt:
* DerivedSources.pro:
* GNUmakefile.am:
* Makefile:
* WebKit.pri:
* WebKit.pro:
* wscript:
2011-01-01 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
......
DerivedSources.pro
View file @ 76da8fc1
......@@ -2,7 +2,7 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += \
JavaScriptCore/DerivedSources.pro \
Source/JavaScriptCore/DerivedSources.pro \
WebCore/DerivedSources.pro \
WebKit/qt/Api/DerivedSources.pro
......
GNUmakefile.am
View file @ 76da8fc1
......@@ -204,7 +204,7 @@ EXTRA_DIST += \
$(srcdir)/WebKit/LICENSE
# Include module makefiles
include JavaScriptCore/GNUmakefile.am
include Source/JavaScriptCore/GNUmakefile.am
include WebCore/GNUmakefile.am
if ENABLE_WEBKIT2
include WebKit2/GNUmakefile.am
......
Makefile
View file @ 76da8fc1
MODULES = JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE WebCore WebKit WebKit2 Tools
MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE WebCore WebKit WebKit2 Tools
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
......