Title: [109787] trunk
- Revision
- 109787
- Author
- par...@webkit.org
- Date
- 2012-03-05 13:02:31 -0800 (Mon, 05 Mar 2012)
Log Message
[CMake][DRT] Add WebCoreTestSupport.
https://bugs.webkit.org/show_bug.cgi?id=79896
Patch by Kangil Han <kangil....@samsung.com> on 2012-03-05
Reviewed by Daniel Bates.
Add WebCoreTestSupport library for DRT in CMake.
We will use internals object by linking this library on DRT.
.:
* CMakeLists.txt:
Source/WebCore:
* CMakeLists.txt:
* UseJSC.cmake:
* UseV8.cmake:
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (109786 => 109787)
--- trunk/CMakeLists.txt 2012-03-05 21:00:02 UTC (rev 109786)
+++ trunk/CMakeLists.txt 2012-03-05 21:02:31 UTC (rev 109787)
@@ -116,6 +116,7 @@
SET(WebCore_LIBRARY_NAME WebCore)
SET(WebKit_LIBRARY_NAME WebKit)
SET(WebKit2_LIBRARY_NAME WebKit2)
+SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)
# -----------------------------------------------------------------------------
# Default library types
@@ -132,6 +133,7 @@
SET(WebKit_LIBRARY_TYPE SHARED)
SET(WebKit2_LIBRARY_TYPE SHARED)
+SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
# -----------------------------------------------------------------------------
# Port-specific options
Modified: trunk/ChangeLog (109786 => 109787)
--- trunk/ChangeLog 2012-03-05 21:00:02 UTC (rev 109786)
+++ trunk/ChangeLog 2012-03-05 21:02:31 UTC (rev 109787)
@@ -1,3 +1,15 @@
+2012-03-05 Kangil Han <kangil....@samsung.com>
+
+ [CMake][DRT] Add WebCoreTestSupport.
+ https://bugs.webkit.org/show_bug.cgi?id=79896
+
+ Reviewed by Daniel Bates.
+
+ Add WebCoreTestSupport library for DRT in CMake.
+ We will use internals object by linking this library on DRT.
+
+ * CMakeLists.txt:
+
2012-03-05 Martin Robinson <mrobin...@igalia.com>
[soup] Crash while loading http://www.jusco.cn
Modified: trunk/Source/WebCore/CMakeLists.txt (109786 => 109787)
--- trunk/Source/WebCore/CMakeLists.txt 2012-03-05 21:00:02 UTC (rev 109786)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-03-05 21:02:31 UTC (rev 109787)
@@ -2290,6 +2290,25 @@
)
ENDIF ()
+SET(WebCoreTestSupport_INCLUDE_DIRECTORIES
+ "${WebCore_INCLUDE_DIRECTORIES}"
+ "${WEBCORE_DIR}/testing"
+)
+
+SET(WebCoreTestSupport_IDL_INCLUDES
+ testing
+)
+
+SET(WebCoreTestSupport_IDL_FILES
+ testing/Internals.idl
+ testing/InternalSettings.idl
+)
+
+SET(WebCoreTestSupport_SOURCES
+ testing/Internals.cpp
+ testing/InternalSettings.cpp
+)
+
# Modules that the bindings generator scripts may use
SET(SCRIPTS_RESOLVE_SUPPLEMENTAL
${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
@@ -2498,17 +2517,23 @@
VERBATIM)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
+WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
+WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
+ADD_DEFINITIONS(-DBUILDING_WebCore)
+INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
-WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
-ADD_DEFINITIONS(-DBUILDING_WebCore)
-INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})
ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
+ADD_LIBRARY(${WebCoreTestSupport_LIBRARY_NAME} ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
+
ADD_DEPENDENCIES(${WebCore_LIBRARY_NAME} ${_javascript_Core_LIBRARY_NAME})
+ADD_DEPENDENCIES(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
+
TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})
IF (WebCore_LINK_FLAGS)
ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")
+ ADD_TARGET_PROPERTIES(${WebCoreTestSupport_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")
ENDIF ()
IF (SHARED_CORE)
Modified: trunk/Source/WebCore/ChangeLog (109786 => 109787)
--- trunk/Source/WebCore/ChangeLog 2012-03-05 21:00:02 UTC (rev 109786)
+++ trunk/Source/WebCore/ChangeLog 2012-03-05 21:02:31 UTC (rev 109787)
@@ -1,3 +1,17 @@
+2012-03-05 Kangil Han <kangil....@samsung.com>
+
+ [CMake][DRT] Add WebCoreTestSupport.
+ https://bugs.webkit.org/show_bug.cgi?id=79896
+
+ Reviewed by Daniel Bates.
+
+ Add WebCoreTestSupport library for DRT in CMake.
+ We will use internals object by linking this library on DRT.
+
+ * CMakeLists.txt:
+ * UseJSC.cmake:
+ * UseV8.cmake:
+
2012-03-05 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r109656.
Modified: trunk/Source/WebCore/UseJSC.cmake (109786 => 109787)
--- trunk/Source/WebCore/UseJSC.cmake 2012-03-05 21:00:02 UTC (rev 109786)
+++ trunk/Source/WebCore/UseJSC.cmake 2012-03-05 21:02:31 UTC (rev 109787)
@@ -3,6 +3,10 @@
"${WEBCORE_DIR}/bridge/jsc"
)
+LIST(APPEND WebCoreTestSupport_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/testing/js"
+)
+
LIST(APPEND WebCore_IDL_INCLUDES
bindings/js
)
@@ -164,6 +168,11 @@
bridge/jsc/BridgeJSC.cpp
)
+LIST(APPEND WebCoreTestSupport_SOURCES
+ testing/js/JSInternalsCustom.cpp
+ testing/js/WebCoreTestSupport.cpp
+)
+
IF (ENABLE_BLOB)
LIST(APPEND WebCore_SOURCES
bindings/js/JSFileReaderCustom.cpp
@@ -254,6 +263,10 @@
LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
ENDFOREACH ()
+FOREACH (_include ${WebCoreTestSupport_IDL_INCLUDES})
+ LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
+ENDFOREACH ()
+
SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1")
FOREACH (_feature ${FEATURE_DEFINES})
SET(FEATURE_DEFINES_JAVASCRIPT "${FEATURE_DEFINES_JAVASCRIPT} ${_feature}")
@@ -263,11 +276,16 @@
FOREACH (_idl ${WebCore_IDL_FILES})
SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
ENDFOREACH ()
+
+FOREACH (_idl ${WebCoreTestSupport_IDL_FILES})
+ SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
+ENDFOREACH ()
+
FILE(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
ADD_CUSTOM_COMMAND(
OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}
- DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}
VERBATIM)
@@ -281,3 +299,14 @@
VERBATIM)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)
ENDFOREACH ()
+
+FOREACH (_file ${WebCoreTestSupport_IDL_FILES})
+ GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.h
+ MAIN_DEPENDENCY ${_file}
+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorJS.pm ${SUPPLEMENTAL_DEPENDENCY_FILE}
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator JS ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_WEBCORE_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WEBCORE_DIR}/${_file}
+ VERBATIM)
+ LIST(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)
+ENDFOREACH ()
Modified: trunk/Source/WebCore/UseV8.cmake (109786 => 109787)
--- trunk/Source/WebCore/UseV8.cmake 2012-03-05 21:00:02 UTC (rev 109786)
+++ trunk/Source/WebCore/UseV8.cmake 2012-03-05 21:02:31 UTC (rev 109787)
@@ -8,6 +8,10 @@
"${_javascript_CORE_DIR}/runtime"
)
+LIST(APPEND WebCoreTestSupport_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/testing/v8"
+)
+
LIST(APPEND WebCore_IDL_INCLUDES
bindings/v8
)
@@ -160,6 +164,11 @@
bindings/v8/specialization/V8BindingState.cpp
)
+LIST(APPEND WebCoreTestSupport_SOURCES
+ testing/v8/V8InternalsCustom.cpp
+ testing/v8/WebCoreTestSupport.cpp
+)
+
LIST(APPEND WebCore_SOURCES
${_javascript_CORE_DIR}/yarr/YarrInterpreter.cpp
${_javascript_CORE_DIR}/yarr/YarrJIT.cpp
@@ -214,6 +223,10 @@
LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
ENDFOREACH ()
+FOREACH (_include ${WebCoreTestSupport_IDL_INCLUDES})
+ LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
+ENDFOREACH ()
+
SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 V8_BINDING=1")
FOREACH (_feature ${FEATURE_DEFINES})
SET(FEATURE_DEFINES_JAVASCRIPT "${FEATURE_DEFINES_JAVASCRIPT} ${_feature}")
@@ -249,11 +262,16 @@
FOREACH (_idl ${WebCore_IDL_FILES})
SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
ENDFOREACH ()
+
+FOREACH (_idl ${WebCoreTestSupport_IDL_FILES})
+ SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
+ENDFOREACH ()
+
FILE(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
ADD_CUSTOM_COMMAND(
OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}
- DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}
VERBATIM)
@@ -267,3 +285,14 @@
VERBATIM)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp)
ENDFOREACH ()
+
+FOREACH (_file ${WebCoreTestSupport_IDL_FILES})
+ GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.h
+ MAIN_DEPENDENCY ${_file}
+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorV8.pm ${SUPPLEMENTAL_DEPENDENCY_FILE}
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator V8 ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_WEBCORE_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WEBCORE_DIR}/${_file}
+ VERBATIM)
+ LIST(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp)
+ENDFOREACH ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
