Changeset 140804 in webkit

Timestamp:

Jan 25, 2013 2:18:08 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CMake][EFL] Build ThirdParty/leveldb when IndexedDB is enabled
​https://bugs.webkit.org/show_bug.cgi?id=106443

Patch by Jussi Kukkonen <​jussi.kukkonen@intel.com> on 2013-01-25
Reviewed by Laszlo Gombos.

LevelDB is now included in ThirdParty. Use it when IndexDB is
enabled for EFL.

.:

• Source/cmake/OptionsEfl.cmake:

Set WTF_USE_LEVELDB when IndexedDB is enabled

Source/WebCore:

• CMakeLists.txt:

Build ThirdParty/leveldb when WTF_USE_LEVELDB is set

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2013-01-25  Jussi Kukkonen  <jussi.kukkonen@intel.com>
+
+        [CMake][EFL] Build ThirdParty/leveldb when IndexedDB is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=106443
+
+        Reviewed by Laszlo Gombos.
+
+        LevelDB is now included in ThirdParty. Use it when IndexDB is
+        enabled for EFL.
+
+        * Source/cmake/OptionsEfl.cmake:
+        Set WTF_USE_LEVELDB when IndexedDB is enabled
+
 2013-01-24  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/CMakeLists.txt

@@ -2664 +2664 @@
 endif ()
 
+if (WTF_USE_LEVELDB)
+    list(APPEND WebCore_INCLUDE_DIRECTORIES
+        "${THIRDPARTY_DIR}/leveldb/include"
+        "${THIRDPARTY_DIR}/leveldb"
+    )
+    list(APPEND LEVELDB_SOURCES
+        ${THIRDPARTY_DIR}/leveldb/db/builder.cc
+        ${THIRDPARTY_DIR}/leveldb/db/c.cc
+        ${THIRDPARTY_DIR}/leveldb/db/dbformat.cc
+        ${THIRDPARTY_DIR}/leveldb/db/db_impl.cc
+        ${THIRDPARTY_DIR}/leveldb/db/db_iter.cc
+        ${THIRDPARTY_DIR}/leveldb/db/filename.cc
+        ${THIRDPARTY_DIR}/leveldb/db/log_reader.cc
+        ${THIRDPARTY_DIR}/leveldb/db/log_writer.cc
+        ${THIRDPARTY_DIR}/leveldb/db/memtable.cc
+        ${THIRDPARTY_DIR}/leveldb/db/repair.cc
+        ${THIRDPARTY_DIR}/leveldb/db/table_cache.cc
+        ${THIRDPARTY_DIR}/leveldb/db/version_edit.cc
+        ${THIRDPARTY_DIR}/leveldb/db/version_set.cc
+        ${THIRDPARTY_DIR}/leveldb/db/write_batch.cc
+        ${THIRDPARTY_DIR}/leveldb/helpers/memenv/memenv.cc
+        ${THIRDPARTY_DIR}/leveldb/port/port_posix.cc
+        ${THIRDPARTY_DIR}/leveldb/table/block_builder.cc
+        ${THIRDPARTY_DIR}/leveldb/table/block.cc
+        ${THIRDPARTY_DIR}/leveldb/table/filter_block.cc
+        ${THIRDPARTY_DIR}/leveldb/table/format.cc
+        ${THIRDPARTY_DIR}/leveldb/table/iterator.cc
+        ${THIRDPARTY_DIR}/leveldb/table/merger.cc
+        ${THIRDPARTY_DIR}/leveldb/table/table_builder.cc
+        ${THIRDPARTY_DIR}/leveldb/table/table.cc
+        ${THIRDPARTY_DIR}/leveldb/table/two_level_iterator.cc
+        ${THIRDPARTY_DIR}/leveldb/util/arena.cc
+        ${THIRDPARTY_DIR}/leveldb/util/bloom.cc
+        ${THIRDPARTY_DIR}/leveldb/util/cache.cc
+        ${THIRDPARTY_DIR}/leveldb/util/coding.cc
+        ${THIRDPARTY_DIR}/leveldb/util/comparator.cc
+        ${THIRDPARTY_DIR}/leveldb/util/crc32c.cc
+        ${THIRDPARTY_DIR}/leveldb/util/env.cc
+        ${THIRDPARTY_DIR}/leveldb/util/env_posix.cc
+        ${THIRDPARTY_DIR}/leveldb/util/filter_policy.cc
+        ${THIRDPARTY_DIR}/leveldb/util/hash.cc
+        ${THIRDPARTY_DIR}/leveldb/util/histogram.cc
+        ${THIRDPARTY_DIR}/leveldb/util/logging.cc
+        ${THIRDPARTY_DIR}/leveldb/util/options.cc
+        ${THIRDPARTY_DIR}/leveldb/util/status.cc
+    )
+endif ()
 
 if (WTF_USE_3D_GRAPHICS)
@@ -3019 +3066 @@
 add_dependencies(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
 
+if (WTF_USE_LEVELDB)
+    set(LEVELDB_LIBRARY_NAME leveldb)
+    add_library(${LEVELDB_LIBRARY_NAME} STATIC ${LEVELDB_SOURCES})
+    target_link_libraries(${LEVELDB_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT})
+    set_target_properties(${LEVELDB_LIBRARY_NAME} PROPERTIES COMPILE_DEFINITIONS "LEVELDB_PLATFORM_POSIX=1 OS_LINUX=1")
+    list(APPEND WebCore_LIBRARIES ${LEVELDB_LIBRARY_NAME})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${LEVELDB_LIBRARY_NAME} IGNORECXX_WARNINGS)
+endif ()
+
 if (WTF_USE_3D_GRAPHICS)
     set(ANGLESupport_LIBRARY_NAME ANGLESupport)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-25  Jussi Kukkonen  <jussi.kukkonen@intel.com>
+
+        [CMake][EFL] Build ThirdParty/leveldb when IndexedDB is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=106443
+
+        Reviewed by Laszlo Gombos.
+
+        LevelDB is now included in ThirdParty. Use it when IndexDB is
+        enabled for EFL.
+
+        * CMakeLists.txt:
+        Build ThirdParty/leveldb when WTF_USE_LEVELDB is set
+
 2013-01-25  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/cmake/OptionsEfl.cmake

@@ -253 +253 @@
     add_definitions(-DHAVE_ACCESSIBILITY=0)
 endif ()
+
+if (ENABLE_INDEXED_DATABASE)
+    set(WTF_USE_LEVELDB 1)
+    add_definitions(-DWTF_USE_LEVELDB=1)
+endif ()