Diff
Modified: trunk/ChangeLog (148462 => 148463)
--- trunk/ChangeLog 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/ChangeLog 2013-04-15 20:32:40 UTC (rev 148463)
@@ -1,3 +1,17 @@
+2013-04-15 Patrick Gansterer <par...@webkit.org>
+
+ [CMake] Add WTF_USE_*_UNICODE variables
+ https://bugs.webkit.org/show_bug.cgi?id=114556
+
+ Reviewed by Brent Fulgham.
+
+ WTF_USE_ICU_UNICODE and WTF_USE_WCHAR_UNICODE are used to
+ reduce duplication in the platform specific CMake files.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsWinCE.cmake:
+
2013-04-15 Martin Robinson <mrobin...@igalia.com>
[GTK] REGRESSION(r147499): HTTP auth dialog doesn't remember passwords anymore
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (148462 => 148463)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-04-15 20:32:40 UTC (rev 148463)
@@ -339,6 +339,15 @@
${WTF_LIBRARY_NAME}
)
+if (WTF_USE_ICU_UNICODE)
+ list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+ )
+ list(APPEND _javascript_Core_LIBRARIES
+ ${ICU_I18N_LIBRARIES}
+ )
+endif ()
+
if (ENABLE_LLINT)
# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
Modified: trunk/Source/_javascript_Core/ChangeLog (148462 => 148463)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-15 20:32:40 UTC (rev 148463)
@@ -1,3 +1,16 @@
+2013-04-15 Patrick Gansterer <par...@webkit.org>
+
+ [CMake] Add WTF_USE_*_UNICODE variables
+ https://bugs.webkit.org/show_bug.cgi?id=114556
+
+ Reviewed by Brent Fulgham.
+
+ WTF_USE_ICU_UNICODE and WTF_USE_WCHAR_UNICODE are used to
+ reduce duplication in the platform specific CMake files.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+
2013-04-13 Patrick Gansterer <par...@webkit.org>
Add missing export macro to SymbolTableEntry::freeFatEntrySlow()
Modified: trunk/Source/_javascript_Core/PlatformEfl.cmake (148462 => 148463)
--- trunk/Source/_javascript_Core/PlatformEfl.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/_javascript_Core/PlatformEfl.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -2,12 +2,7 @@
jit/ExecutableAllocatorFixedVMPool.cpp
)
-list(APPEND _javascript_Core_LIBRARIES
- ${ICU_I18N_LIBRARIES}
-)
-
list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
${_javascript_CORE_DIR}/wtf/gobject
- ${ICU_INCLUDE_DIRS}
)
Modified: trunk/Source/WTF/ChangeLog (148462 => 148463)
--- trunk/Source/WTF/ChangeLog 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WTF/ChangeLog 2013-04-15 20:32:40 UTC (rev 148463)
@@ -1,5 +1,20 @@
2013-04-15 Patrick Gansterer <par...@webkit.org>
+ [CMake] Add WTF_USE_*_UNICODE variables
+ https://bugs.webkit.org/show_bug.cgi?id=114556
+
+ Reviewed by Brent Fulgham.
+
+ WTF_USE_ICU_UNICODE and WTF_USE_WCHAR_UNICODE are used to
+ reduce duplication in the platform specific CMake files.
+
+ * wtf/CMakeLists.txt:
+ * wtf/PlatformBlackBerry.cmake:
+ * wtf/PlatformEfl.cmake:
+ * wtf/PlatformWinCE.cmake:
+
+2013-04-15 Patrick Gansterer <par...@webkit.org>
+
[WIN] Remove remaining calls to pthread from WTF
https://bugs.webkit.org/show_bug.cgi?id=114563
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (148462 => 148463)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2013-04-15 20:32:40 UTC (rev 148463)
@@ -226,6 +226,30 @@
"${CMAKE_BINARY_DIR}"
)
+if (WTF_USE_ICU_UNICODE)
+ list(APPEND WTF_HEADERS
+ unicode/icu/UnicodeIcu.h
+ )
+ list(APPEND WTF_SOURCES
+ unicode/icu/CollatorICU.cpp
+ )
+ list(APPEND WTF_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+ )
+ list(APPEND WTF_LIBRARIES
+ ${ICU_I18N_LIBRARIES}
+ ${ICU_LIBRARIES}
+ )
+elseif (WTF_USE_WCHAR_UNICODE)
+ list(APPEND WTF_HEADERS
+ unicode/wchar/UnicodeWchar.h
+ )
+ list(APPEND WTF_SOURCES
+ unicode/CollatorDefault.cpp
+ unicode/wchar/UnicodeWchar.cpp
+ )
+endif ()
+
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
Modified: trunk/Source/WTF/wtf/PlatformBlackBerry.cmake (148462 => 148463)
--- trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -4,7 +4,6 @@
ThreadIdentifierDataPthreads.cpp
ThreadingPthreads.cpp
blackberry/MainThreadBlackBerry.cpp
- unicode/icu/CollatorICU.cpp
)
list(INSERT WTF_INCLUDE_DIRECTORIES 0
Modified: trunk/Source/WTF/wtf/PlatformEfl.cmake (148462 => 148463)
--- trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -8,8 +8,6 @@
OSAllocatorPosix.cpp
ThreadIdentifierDataPthreads.cpp
ThreadingPthreads.cpp
-
- unicode/icu/CollatorICU.cpp
)
list(APPEND WTF_LIBRARIES
@@ -17,8 +15,6 @@
${GLIB_LIBRARIES}
${GLIB_GIO_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
- ${ICU_LIBRARIES}
- ${ICU_I18N_LIBRARIES}
${ECORE_LIBRARIES}
${ECORE_EVAS_LIBRARIES}
${ECORE_IMF_LIBRARIES}
@@ -36,7 +32,6 @@
${EO_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
- ${ICU_INCLUDE_DIRS}
${_javascript_CORE_DIR}/wtf/gobject
${_javascript_CORE_DIR}/wtf/unicode
${_javascript_CORE_DIR}/wtf/efl
Modified: trunk/Source/WTF/wtf/PlatformWinCE.cmake (148462 => 148463)
--- trunk/Source/WTF/wtf/PlatformWinCE.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WTF/wtf/PlatformWinCE.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -1,7 +1,3 @@
-list(APPEND WTF_HEADERS
- unicode/wchar/UnicodeWchar.h
-)
-
list(APPEND WTF_SOURCES
NullPtr.cpp
OSAllocatorWin.cpp
@@ -10,9 +6,6 @@
threads/win/BinarySemaphoreWin.cpp
- unicode/CollatorDefault.cpp
- unicode/wchar/UnicodeWchar.cpp
-
win/MainThreadWin.cpp
win/OwnPtrWin.cpp
)
Modified: trunk/Source/WebCore/CMakeLists.txt (148462 => 148463)
--- trunk/Source/WebCore/CMakeLists.txt 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-04-15 20:32:40 UTC (rev 148463)
@@ -2736,6 +2736,27 @@
endif ()
+if (WTF_USE_ICU_UNICODE)
+ list(APPEND WebCore_SOURCES
+ platform/text/TextBreakIteratorICU.cpp
+ platform/text/TextCodecICU.cpp
+ platform/text/TextEncodingDetectorICU.cpp
+ )
+ list(APPEND WebCore_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${ICU_LIBRARIES}
+ )
+elseif (WTF_USE_WCHAR_UNICODE)
+ list(APPEND WebCore_SOURCES
+ platform/text/TextEncodingDetectorNone.cpp
+
+ platform/text/wchar/TextBreakIteratorWchar.cpp
+ )
+endif ()
+
+
if (WTF_USE_LEVELDB)
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${THIRDPARTY_DIR}/leveldb/include"
Modified: trunk/Source/WebCore/ChangeLog (148462 => 148463)
--- trunk/Source/WebCore/ChangeLog 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WebCore/ChangeLog 2013-04-15 20:32:40 UTC (rev 148463)
@@ -1,3 +1,18 @@
+2013-04-15 Patrick Gansterer <par...@webkit.org>
+
+ [CMake] Add WTF_USE_*_UNICODE variables
+ https://bugs.webkit.org/show_bug.cgi?id=114556
+
+ Reviewed by Brent Fulgham.
+
+ WTF_USE_ICU_UNICODE and WTF_USE_WCHAR_UNICODE are used to
+ reduce duplication in the platform specific CMake files.
+
+ * CMakeLists.txt:
+ * PlatformBlackBerry.cmake:
+ * PlatformEfl.cmake:
+ * PlatformWinCE.cmake:
+
2013-04-15 Eric Carlson <eric.carl...@apple.com>
HTMLMediaElement::removeTextTrack should clear track client
Modified: trunk/Source/WebCore/PlatformBlackBerry.cmake (148462 => 148463)
--- trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -35,9 +35,6 @@
platform/posix/FileSystemPOSIX.cpp
platform/posix/SharedBufferPOSIX.cpp
platform/text/LocaleNone.cpp
- platform/text/TextBreakIteratorICU.cpp
- platform/text/TextCodecICU.cpp
- platform/text/TextEncodingDetectorICU.cpp
platform/text/blackberry/TextBreakIteratorInternalICUBlackBerry.cpp
)
Modified: trunk/Source/WebCore/PlatformEfl.cmake (148462 => 148463)
--- trunk/Source/WebCore/PlatformEfl.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -166,9 +166,6 @@
platform/text/efl/TextBreakIteratorInternalICUEfl.cpp
platform/text/enchant/TextCheckerEnchant.cpp
platform/text/LocaleICU.cpp
- platform/text/TextBreakIteratorICU.cpp
- platform/text/TextCodecICU.cpp
- platform/text/TextEncodingDetectorICU.cpp
)
if (ENABLE_BATTERY_STATUS)
@@ -220,7 +217,6 @@
${EVAS_LIBRARIES}
${FONTCONFIG_LIBRARIES}
${FREETYPE_LIBRARIES}
- ${ICU_LIBRARIES}
${JPEG_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
@@ -248,7 +244,6 @@
${EINA_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
- ${ICU_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
Modified: trunk/Source/WebCore/PlatformWinCE.cmake (148462 => 148463)
--- trunk/Source/WebCore/PlatformWinCE.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/WebCore/PlatformWinCE.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -98,10 +98,7 @@
platform/graphics/wince/SimpleFontDataWince.cpp
platform/text/LocaleNone.cpp
- platform/text/TextEncodingDetectorNone.cpp
- platform/text/wchar/TextBreakIteratorWchar.cpp
-
platform/text/win/TextCodecWin.cpp
)
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (148462 => 148463)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -4,6 +4,8 @@
set(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}-${PROJECT_VERSION})
+set(WTF_USE_ICU_UNICODE 1)
+
add_definitions(-DDATA_DIR="${DATA_DIR}")
add_definitions(-DWEBCORE_NAVIGATOR_VENDOR="Research In Motion, Ltd.")
Modified: trunk/Source/cmake/OptionsEfl.cmake (148462 => 148463)
--- trunk/Source/cmake/OptionsEfl.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/cmake/OptionsEfl.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -27,6 +27,7 @@
find_package(GLIB 2.33.2 REQUIRED COMPONENTS gio gobject gthread)
find_package(LibSoup 2.40.3 REQUIRED)
+set(WTF_USE_ICU_UNICODE 1)
set(WTF_USE_SOUP 1)
add_definitions(-DWTF_USE_GLIB=1)
Modified: trunk/Source/cmake/OptionsWinCE.cmake (148462 => 148463)
--- trunk/Source/cmake/OptionsWinCE.cmake 2013-04-15 20:23:42 UTC (rev 148462)
+++ trunk/Source/cmake/OptionsWinCE.cmake 2013-04-15 20:32:40 UTC (rev 148463)
@@ -1,5 +1,7 @@
include(OptionsWindows)
+set(WTF_USE_WCHAR_UNICODE 1)
+
add_definitions(-D_CE_CRT_ALLOW_WIN_MINMAX)
add_definitions(-DWTF_USE_WCHAR_UNICODE=1)
add_definitions(-DWTF_USE_WININET=1)
