2010-05-22 Leandro Pereira <leandro@profusion.mobi>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 May 2010 20:03:13 +0000 (20:03 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 May 2010 20:03:13 +0000 (20:03 +0000)
        Reviewed by Eric Seidel.

        [EFL] Build fix (always compile libraries with -fPIC when compiler
        is gcc; always define WTF_USE_PTHREADS).
        http://webkit.org/b/39235

        * cmake/OptionsCommon.cmake:
        * cmake/OptionsEfl.cmake:
        * cmake/WebKitHelpers.cmake:
2010-05-22  Leandro Pereira  <leandro@profusion.mobi>

        Reviewed by Eric Seidel.

        [EFL] Build fix (update source code lists).
        http://webkit.org/b/39235

        * CMakeLists.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@60011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
WebCore/CMakeLists.txt
WebCore/ChangeLog
cmake/OptionsCommon.cmake
cmake/OptionsEfl.cmake
cmake/WebKitHelpers.cmake

index 8629ada78df2c7b72d15fe8cd3222cb2d67531dc..e24d312af8c45010bb7961006aae312ee24d5a39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-05-22  Leandro Pereira  <leandro@profusion.mobi>
+
+        Reviewed by Eric Seidel.
+
+        [EFL] Build fix (always compile libraries with -fPIC when compiler
+        is gcc; always define WTF_USE_PTHREADS).
+        http://webkit.org/b/39235
+
+        * cmake/OptionsCommon.cmake:
+        * cmake/OptionsEfl.cmake:
+        * cmake/WebKitHelpers.cmake:
+
 2010-05-19  Dan Winship  <danw@gnome.org>
 
         Reviewed by Xan Lopez.
index 573e55fa5c2decdb1432ee1dfc5d9b93c86a6f9d..63403868c15f928839368c19857a1a3e498b7a9c 100644 (file)
@@ -233,6 +233,7 @@ SET(WebCore_IDL_FILES
     html/HTMLMediaElement.idl
     html/HTMLMenuElement.idl
     html/HTMLMetaElement.idl
+    html/HTMLMeterElement.idl
     html/HTMLModElement.idl
     html/HTMLOListElement.idl
     html/HTMLObjectElement.idl
@@ -268,16 +269,17 @@ SET(WebCore_IDL_FILES
     html/canvas/CanvasPattern.idl
     html/canvas/CanvasRenderingContext.idl
     html/canvas/CanvasRenderingContext2D.idl
-    html/canvas/WebGLArray.idl
-    html/canvas/WebGLArrayBuffer.idl
-    html/canvas/WebGLByteArray.idl
-    html/canvas/WebGLFloatArray.idl
-    html/canvas/WebGLIntArray.idl
     html/canvas/WebGLRenderingContext.idl
-    html/canvas/WebGLShortArray.idl
-    html/canvas/WebGLUnsignedByteArray.idl
-    html/canvas/WebGLUnsignedIntArray.idl
-    html/canvas/WebGLUnsignedShortArray.idl
+
+    html/canvas/ArrayBuffer.idl
+    html/canvas/ArrayBufferView.idl
+    html/canvas/FloatArray.idl
+    html/canvas/Int16Array.idl
+    html/canvas/Int32Array.idl
+    html/canvas/Int8Array.idl
+    html/canvas/Uint16Array.idl
+    html/canvas/Uint32Array.idl
+    html/canvas/Uint8Array.idl
 
     inspector/InjectedScriptHost.idl
     inspector/InspectorBackend.idl
@@ -315,11 +317,18 @@ SET(WebCore_IDL_FILES
     storage/Database.idl
     storage/DatabaseCallback.idl
     storage/DatabaseSync.idl
+    storage/IDBAny.idl
+    storage/IDBDatabaseError.idl
+    storage/IDBDatabaseException.idl
+    storage/IDBDatabaseRequest.idl
+    storage/IDBErrorEvent.idl
+    storage/IDBEvent.idl
+    storage/IDBRequest.idl
+    storage/IDBSuccessEvent.idl
+    storage/IndexedDatabaseRequest.idl
     storage/SQLError.idl
     storage/SQLResultSet.idl
     storage/SQLResultSetRowList.idl
-    storage/Storage.idl
-    storage/StorageEvent.idl
     storage/SQLStatementCallback.idl
     storage/SQLStatementErrorCallback.idl
     storage/SQLTransaction.idl
@@ -327,6 +336,8 @@ SET(WebCore_IDL_FILES
     storage/SQLTransactionErrorCallback.idl
     storage/SQLTransactionSync.idl
     storage/SQLTransactionSyncCallback.idl
+    storage/Storage.idl
+    storage/StorageEvent.idl
 
     workers/AbstractWorker.idl
     workers/DedicatedWorkerContext.idl
@@ -527,25 +538,32 @@ SET(WebCore_SOURCES
     bindings/js/DOMObjectHashTableMap.cpp
     bindings/js/DOMWrapperWorld.cpp
     bindings/js/GCController.cpp
+    bindings/js/JavaScriptCallFrame.cpp
     bindings/js/JSAttrCustom.cpp
-    bindings/js/JSCDATASectionCustom.cpp
-    bindings/js/JSCSSRuleCustom.cpp
-    bindings/js/JSCSSRuleListCustom.cpp
-    bindings/js/JSCSSStyleDeclarationCustom.cpp
-    bindings/js/JSCSSValueCustom.cpp
     bindings/js/JSCallbackData.cpp
     bindings/js/JSCanvasRenderingContext2DCustom.cpp
     bindings/js/JSCanvasRenderingContextCustom.cpp
+    bindings/js/JSCDATASectionCustom.cpp
     bindings/js/JSClipboardCustom.cpp
     bindings/js/JSConsoleCustom.cpp
     bindings/js/JSCoordinatesCustom.cpp
+    bindings/js/JSCSSRuleCustom.cpp
+    bindings/js/JSCSSRuleListCustom.cpp
+    bindings/js/JSCSSStyleDeclarationCustom.cpp
+    bindings/js/JSCSSValueCustom.cpp
     bindings/js/JSCustomPositionCallback.cpp
     bindings/js/JSCustomPositionErrorCallback.cpp
     bindings/js/JSCustomSQLStatementErrorCallback.cpp
-    bindings/js/JSDatabaseCustom.cpp
-    bindings/js/JSDatabaseSyncCustom.cpp
     bindings/js/JSCustomVoidCallback.cpp
     bindings/js/JSCustomXPathNSResolver.cpp
+    bindings/js/JSDatabaseCustom.cpp
+    bindings/js/JSDatabaseCustom.cpp
+    bindings/js/JSDatabaseSyncCustom.cpp
+    bindings/js/JSDataGridColumnListCustom.cpp
+    bindings/js/JSDataGridDataSource.cpp
+    bindings/js/JSDebugWrapperSet.cpp
+    bindings/js/JSDedicatedWorkerContextCustom.cpp
+    bindings/js/JSDocumentCustom.cpp
     bindings/js/JSDOMApplicationCacheCustom.cpp
     bindings/js/JSDOMBinding.cpp
     bindings/js/JSDOMFormDataCustom.cpp
@@ -554,12 +572,6 @@ SET(WebCore_SOURCES
     bindings/js/JSDOMWindowCustom.cpp
     bindings/js/JSDOMWindowShell.cpp
     bindings/js/JSDOMWrapper.cpp
-    bindings/js/JSDataGridColumnListCustom.cpp
-    bindings/js/JSDataGridDataSource.cpp
-    bindings/js/JSDatabaseCustom.cpp
-    bindings/js/JSDebugWrapperSet.cpp
-    bindings/js/JSDedicatedWorkerContextCustom.cpp
-    bindings/js/JSDocumentCustom.cpp
     bindings/js/JSElementCustom.cpp
     bindings/js/JSEventCustom.cpp
     bindings/js/JSEventListener.cpp
@@ -567,6 +579,7 @@ SET(WebCore_SOURCES
     bindings/js/JSEventTarget.cpp
     bindings/js/JSExceptionBase.cpp
     bindings/js/JSGeolocationCustom.cpp
+    bindings/js/JSHistoryCustom.cpp
     bindings/js/JSHTMLAllCollectionCustom.cpp
     bindings/js/JSHTMLAppletElementCustom.cpp
     bindings/js/JSHTMLCanvasElementCustom.cpp
@@ -583,7 +596,6 @@ SET(WebCore_SOURCES
     bindings/js/JSHTMLObjectElementCustom.cpp
     bindings/js/JSHTMLOptionsCollectionCustom.cpp
     bindings/js/JSHTMLSelectElementCustom.cpp
-    bindings/js/JSHistoryCustom.cpp
     bindings/js/JSImageConstructor.cpp
     bindings/js/JSImageDataCustom.cpp
     bindings/js/JSInjectedScriptHostCustom.cpp
@@ -609,12 +621,12 @@ SET(WebCore_SOURCES
     bindings/js/JSPluginCustom.cpp
     bindings/js/JSPluginElementFunctions.cpp
     bindings/js/JSPopStateEventCustom.cpp
-    bindings/js/JSSQLResultSetRowListCustom.cpp
-    bindings/js/JSSQLTransactionCustom.cpp
-    bindings/js/JSSQLTransactionSyncCustom.cpp
     bindings/js/JSScriptProfileNodeCustom.cpp
     bindings/js/JSSharedWorkerConstructor.cpp
     bindings/js/JSSharedWorkerCustom.cpp
+    bindings/js/JSSQLResultSetRowListCustom.cpp
+    bindings/js/JSSQLTransactionCustom.cpp
+    bindings/js/JSSQLTransactionSyncCustom.cpp
     bindings/js/JSStorageCustom.cpp
     bindings/js/JSStyleSheetCustom.cpp
     bindings/js/JSStyleSheetListCustom.cpp
@@ -632,7 +644,6 @@ SET(WebCore_SOURCES
     bindings/js/JSXMLHttpRequestUploadCustom.cpp
     bindings/js/JSXSLTProcessorConstructor.cpp
     bindings/js/JSXSLTProcessorCustom.cpp
-    bindings/js/JavaScriptCallFrame.cpp
     bindings/js/ScheduledAction.cpp
     bindings/js/ScriptArray.cpp
     bindings/js/ScriptCachedFrameData.cpp
@@ -643,6 +654,7 @@ SET(WebCore_SOURCES
     bindings/js/ScriptDebugServer.cpp
     bindings/js/ScriptEventListener.cpp
     bindings/js/ScriptFunctionCall.cpp
+    bindings/js/ScriptGCEvent.cpp
     bindings/js/ScriptObject.cpp
     bindings/js/ScriptProfiler.cpp
     bindings/js/ScriptState.cpp
@@ -936,6 +948,7 @@ SET(WebCore_SOURCES
     html/HTMLMarqueeElement.cpp
     html/HTMLMenuElement.cpp
     html/HTMLMetaElement.cpp
+    html/HTMLMeterElement.cpp
     html/HTMLModElement.cpp
     html/HTMLNameCollection.cpp
     html/HTMLOListElement.cpp
@@ -1274,6 +1287,7 @@ SET(WebCore_SOURCES
     rendering/RenderListMarker.cpp
     rendering/RenderMarquee.cpp
     rendering/RenderMenuList.cpp
+    rendering/RenderMeter.cpp
     rendering/RenderObject.cpp
     rendering/RenderObjectChildList.cpp
     rendering/RenderPart.cpp
@@ -1338,6 +1352,16 @@ SET(WebCore_SOURCES
     storage/DatabaseTask.cpp
     storage/DatabaseThread.cpp
     storage/DatabaseTracker.cpp
+    storage/IDBAny.cpp
+    storage/IDBDatabase.cpp
+    storage/IDBDatabaseRequest.cpp
+    storage/IDBErrorEvent.cpp
+    storage/IDBEvent.cpp
+    storage/IDBRequest.cpp
+    storage/IDBSuccessEvent.cpp
+    storage/IndexedDatabase.cpp
+    storage/IndexedDatabaseImpl.cpp
+    storage/IndexedDatabaseRequest.cpp
     storage/LocalStorageTask.cpp
     storage/LocalStorageThread.cpp
     storage/OriginQuotaManager.cpp
index a20d0c2ef47fc117154330d6f5fe27b0ed999bc0..c48cd9edcab1f7babc062e5d86da0b425612a881 100644 (file)
@@ -1,3 +1,12 @@
+2010-05-22  Leandro Pereira  <leandro@profusion.mobi>
+
+        Reviewed by Eric Seidel.
+
+        [EFL] Build fix (update source code lists).
+        http://webkit.org/b/39235
+
+        * CMakeLists.txt:
+
 2010-05-22  Martin Robinson  <mrobinson@igalia.com>
 
         Reviewed by Xan Lopez.
index cae00a572403584188515fe4f8107e62cd449d2d..b0d03755e0947edf133bf07052b3405ad1d0e8d9 100644 (file)
@@ -1,4 +1,10 @@
 ADD_DEFINITIONS(-DBUILDING_WITH_CMAKE=1)
+ADD_DEFINITIONS(-DHAVE_CONFIG_H=1)
+
+IF (CMAKE_COMPILER_IS_GNUCC)
+    SET(CMAKE_CXX_FLAGS "-fPIC ${CMAKE_CXX_FLAGS}")
+    SET(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
+ENDIF ()
 
 SET(WTF_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}"
@@ -7,25 +13,6 @@ SET(WTF_INCLUDE_DIRECTORIES
     "${DERIVED_SOURCES_DIR}"
 )
 
-SET(WEBKIT_LIBRARY_TYPE STATIC)
-
-IF (ICU_FOUND)
-    SET(WTF_USE_ICU_UNICODE 1)
-    ADD_DEFINITIONS(-DWTF_USE_ICU_UNICODE=1)
-    LIST(APPEND WTF_INCLUDE_DIRECTORIES ${ICU_INCLUDE_DIRS})
-ENDIF ()
-
-IF (CMAKE_HAVE_PTHREAD_H AND NOT WTF_PLATFORM_QT)
-    SET(WTF_USE_PTHREADS 1)
-    ADD_DEFINITIONS(-DWTF_USE_PTHREADS=1)
-ELSE ()
-    ADD_DEFINITIONS(-DENABLE_JSC_MULTIPLE_THREADS=0)
-ENDIF ()
-
 IF (WTF_OS_UNIX)
     ADD_DEFINITIONS(-DXP_UNIX)
 ENDIF (WTF_OS_UNIX)
-
-ADD_DEFINITIONS(-DHAVE_CONFIG_H=1)
-
-FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR})
index 47e4b13187aeca0b63786289901e3a90c69764fd..87b3d72dbd96e67b216dad9f07c7517d05b742a1 100644 (file)
@@ -22,8 +22,12 @@ FIND_PACKAGE(LibXslt 1.1.7 REQUIRED)
 FIND_PACKAGE(ICU REQUIRED)
 FIND_PACKAGE(Threads REQUIRED)
 
+SET(WTF_USE_PTHREADS 1)
+ADD_DEFINITIONS(-DWTF_USE_PTHREADS=1)
+
 SET(WTF_USE_ICU_UNICODE 1)
 ADD_DEFINITIONS(-DWTF_USE_ICU_UNICODE=1)
+LIST(APPEND WTF_INCLUDE_DIRECTORIES ${ICU_INCLUDE_DIRS})
 
 SET(WTF_PLATFORM_CAIRO 1)
 ADD_DEFINITIONS(-DWTF_PLATFORM_CAIRO=1)
index 09b426632a4d0d41912a7bba85b12e696644b9b7..4d86b8ed128d12ab5c9d84fb0133c35d6a71c337 100644 (file)
@@ -6,11 +6,8 @@ MACRO(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
     IF (${OLD_COMPILE_FLAGS} STREQUAL "OLD_COMPILE_FLAGS-NOTFOUND")
         SET(OLD_COMPILE_FLAGS "")
     ENDIF ()
-    IF (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-        SET(OLD_COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -fPIC")
-    ENDIF ()
     SET_TARGET_PROPERTIES (${_target} PROPERTIES
-       COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -fno-exceptions -fstrict-aliasing -fvisibility=hidden")
+       COMPILE_FLAGS "-fno-exceptions -fstrict-aliasing -fvisibility=hidden ${OLD_COMPILE_FLAGS}")
     UNSET(OLD_COMPILE_FLAGS)
   ENDIF ()
 ENDMACRO()