Changeset 106759 in webkit

Timestamp:

Feb 5, 2012 1:36:24 AM (12 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

[CMAKE] Support javascriptcore test for EFL port.
​https://bugs.webkit.org/show_bug.cgi?id=77425

Reviewed by Daniel Bates.

Efl and WinCE as well as Blackberry port are now using Cmake as its build system
and they are share the make file to create jsc excutable. In order to run
"run-javascriptcore-tests", EFL port needs to change jsc installation configuration
with executable output directory(e.g. Programs). So, this patch change jsc installation
configuration only for EFL port.

.:

• Source/cmake/OptionsEfl.cmake: Change *jsc_efl* name with *jsc*.

Source/JavaScriptCore:

• shell/CMakeLists.txt:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/shell/CMakeLists.txt (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-02-05  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE] Support javascriptcore test for EFL port. 
+        https://bugs.webkit.org/show_bug.cgi?id=77425
+
+        Reviewed by Daniel Bates.
+
+        Efl and WinCE as well as Blackberry port are now using Cmake as its build system
+        and they are share the make file to create jsc excutable. In order to run
+        "run-javascriptcore-tests", EFL port needs to change jsc installation configuration
+        with executable output directory(e.g. Programs). So, this patch change jsc installation
+        configuration only for EFL port.
+
+        * Source/cmake/OptionsEfl.cmake: Change *jsc_efl* name with *jsc*.
+
 2012-02-05  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-02-05  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE] Support javascriptcore test for EFL port. 
+        https://bugs.webkit.org/show_bug.cgi?id=77425
+
+        Reviewed by Daniel Bates.
+
+        Efl and WinCE as well as Blackberry port are now using Cmake as its build system
+        and they are share the make file to create jsc excutable. In order to run
+        "run-javascriptcore-tests", EFL port needs to change jsc installation configuration
+        with executable output directory(e.g. Programs). So, this patch change jsc installation
+        configuration only for EFL port.
+
+        * shell/CMakeLists.txt:
+
 2012-02-04  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/shell/CMakeLists.txt

@@ -21 +21 @@
 ENDIF ()
 
-IF (SHARED_CORE)
-    SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+IF ("${PORT}" STREQUAL "Efl")
+    SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Programs")
 ENDIF ()
 

trunk/Source/cmake/OptionsEfl.cmake

@@ -49 +49 @@
 ADD_DEFINITIONS(-DWTF_USE_CAIRO=1)
 
-SET(JSC_EXECUTABLE_NAME jsc_efl)
+SET(JSC_EXECUTABLE_NAME jsc)
+
 SET(WTF_LIBRARY_NAME wtf_efl)
 SET(JavaScriptCore_LIBRARY_NAME javascriptcore_efl)