Skip to content

Commit b8dde14

Browse files
author
Adam Barth
committed
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. Canonical link: https://commits.webkit.org/65194@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@74855 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 8db5295 commit b8dde14

1,982 files changed

Lines changed: 266 additions & 118 deletions

File tree

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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,10 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
138138
$(LOCAL_PATH)/WebKit/android/stl
139139

140140
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
141-
$(LOCAL_PATH)/JavaScriptCore \
142-
$(LOCAL_PATH)/JavaScriptCore/wtf \
143-
$(LOCAL_PATH)/JavaScriptCore/wtf/unicode \
144-
$(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu
141+
$(LOCAL_PATH)/Source/JavaScriptCore \
142+
$(LOCAL_PATH)/Source/JavaScriptCore/wtf \
143+
$(LOCAL_PATH)/Source/JavaScriptCore/wtf/unicode \
144+
$(LOCAL_PATH)/Source/JavaScriptCore/wtf/unicode/icu
145145

146146
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
147147
$(base_intermediates)/WebCore/ \
@@ -161,7 +161,7 @@ endif
161161

162162
ifeq ($(JAVASCRIPT_ENGINE),v8)
163163
# Include WTF source file.
164-
d := JavaScriptCore
164+
d := Source/JavaScriptCore
165165
LOCAL_PATH := $(BASE_PATH)/$d
166166
intermediates := $(base_intermediates)/$d
167167
include $(LOCAL_PATH)/Android.v8.wtf.mk
@@ -171,7 +171,7 @@ endif # JAVASCRIPT_ENGINE == v8
171171
# Include source files for WebCore
172172
d := WebCore
173173
LOCAL_PATH := $(BASE_PATH)/$d
174-
JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore
174+
JAVASCRIPTCORE_PATH := $(BASE_PATH)/Source/JavaScriptCore
175175
intermediates := $(base_intermediates)/$d
176176
include $(LOCAL_PATH)/Android.mk
177177
ifeq ($(JAVASCRIPT_ENGINE),jsc)
@@ -283,7 +283,7 @@ LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
283283
LOCAL_STATIC_LIBRARIES := $(WEBKIT_STATIC_LIBRARIES)
284284
LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
285285
# Include source files for JavaScriptCore
286-
d := JavaScriptCore
286+
d := Source/JavaScriptCore
287287
LOCAL_PATH := $(BASE_PATH)/$d
288288
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
289289
# Cannot use base_intermediates as this is a new module

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
99
ENDIF ()
1010
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
1111

12-
SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
12+
SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
1313
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
1414
SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
1515
SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")

‎ChangeLog‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
2011-01-01 Adam Barth <abarth@webkit.org>
2+
3+
Reviewed by Eric Seidel.
4+
5+
Move JavaScriptCore to Source
6+
https://bugs.webkit.org/show_bug.cgi?id=51604
7+
8+
Update references to JavaScriptCore to point to the new location.
9+
10+
* Android.mk:
11+
* CMakeLists.txt:
12+
* DerivedSources.pro:
13+
* GNUmakefile.am:
14+
* Makefile:
15+
* WebKit.pri:
16+
* WebKit.pro:
17+
* wscript:
18+
119
2011-01-01 Adam Barth <abarth@webkit.org>
220

321
Reviewed by Eric Seidel.

‎DerivedSources.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
22
CONFIG += ordered
33

44
SUBDIRS += \
5-
JavaScriptCore/DerivedSources.pro \
5+
Source/JavaScriptCore/DerivedSources.pro \
66
WebCore/DerivedSources.pro \
77
WebKit/qt/Api/DerivedSources.pro
88

‎GNUmakefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ EXTRA_DIST += \
204204
$(srcdir)/WebKit/LICENSE
205205

206206
# Include module makefiles
207-
include JavaScriptCore/GNUmakefile.am
207+
include Source/JavaScriptCore/GNUmakefile.am
208208
include WebCore/GNUmakefile.am
209209
if ENABLE_WEBKIT2
210210
include WebKit2/GNUmakefile.am

‎Makefile‎

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

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

JavaScriptCore/API/APICast.h renamed to Source/JavaScriptCore/API/APICast.h

File renamed without changes.

JavaScriptCore/API/APIShims.h renamed to Source/JavaScriptCore/API/APIShims.h

File renamed without changes.

JavaScriptCore/API/JSBase.cpp renamed to Source/JavaScriptCore/API/JSBase.cpp

File renamed without changes.

JavaScriptCore/API/JSBase.h renamed to Source/JavaScriptCore/API/JSBase.h

File renamed without changes.

0 commit comments

Comments
 (0)