[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 18:03:15 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 526e6c086e4082bde62a83c9bf184591ded81cd4
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 6 19:08:18 2010 +0000
2010-12-06 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[WINCE] Add build system
https://bugs.webkit.org/show_bug.cgi?id=50522
* cmake/OptionsWinCE.cmake: Added.
* cmake/OptionsWindows.cmake: Added.
2010-12-06 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[WINCE] Add build system
https://bugs.webkit.org/show_bug.cgi?id=50522
* CMakeListsWinCE.txt: Added.
* shell/CMakeListsWinCE.txt: Added.
* wtf/CMakeListsWinCE.txt: Added.
2010-12-06 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[WINCE] Add build system
https://bugs.webkit.org/show_bug.cgi?id=50522
* CMakeListsWinCE.txt: Added.
2010-12-06 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[WINCE] Add build system
https://bugs.webkit.org/show_bug.cgi?id=50522
* CMakeListsWinCE.txt: Added.
2010-12-06 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[WINCE] Add build system
https://bugs.webkit.org/show_bug.cgi?id=50522
* CMakeListsWinCE.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73378 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 62c918d..6429180 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-06 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [WINCE] Add build system
+ https://bugs.webkit.org/show_bug.cgi?id=50522
+
+ * cmake/OptionsWinCE.cmake: Added.
+ * cmake/OptionsWindows.cmake: Added.
+
2010-12-04 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
diff --git a/JavaScriptCore/CMakeListsWinCE.txt b/JavaScriptCore/CMakeListsWinCE.txt
new file mode 100644
index 0000000..666b1c7
--- /dev/null
+++ b/JavaScriptCore/CMakeListsWinCE.txt
@@ -0,0 +1,5 @@
+LIST(APPEND JavaScriptCore_SOURCES
+ jit/ExecutableAllocator.cpp
+
+ runtime/MarkStackWin.cpp
+)
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e734de5..9fad92c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-06 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [WINCE] Add build system
+ https://bugs.webkit.org/show_bug.cgi?id=50522
+
+ * CMakeListsWinCE.txt: Added.
+ * shell/CMakeListsWinCE.txt: Added.
+ * wtf/CMakeListsWinCE.txt: Added.
+
2010-12-06 John Tantalo <john.tantalo at gmail.com>
Reviewed by Geoffrey Garen.
diff --git a/JavaScriptCore/shell/CMakeListsWinCE.txt b/JavaScriptCore/shell/CMakeListsWinCE.txt
new file mode 100644
index 0000000..0b7a3bf
--- /dev/null
+++ b/JavaScriptCore/shell/CMakeListsWinCE.txt
@@ -0,0 +1,3 @@
+LIST(APPEND JSC_SOURCES
+ ../os-win32/WinMain.cpp
+)
diff --git a/JavaScriptCore/wtf/CMakeListsWinCE.txt b/JavaScriptCore/wtf/CMakeListsWinCE.txt
new file mode 100644
index 0000000..ed38c6f
--- /dev/null
+++ b/JavaScriptCore/wtf/CMakeListsWinCE.txt
@@ -0,0 +1,20 @@
+LIST(APPEND WTF_SOURCES
+ NullPtr.cpp
+ OSAllocatorWin.cpp
+ TCSystemAlloc.cpp
+ ThreadingWin.cpp
+ ThreadSpecificWin.cpp
+
+ unicode/CollatorDefault.cpp
+ unicode/wince/UnicodeWinCE.cpp
+
+ win/MainThreadWin.cpp
+ win/OwnPtrWin.cpp
+
+ ${3RDPARTY_DIR}/ce-compat/ce_time.c
+ ${3RDPARTY_DIR}/ce-compat/ce_unicode.cpp
+)
+
+LIST(APPEND WTF_LIBRARIES
+ mmtimer
+)
diff --git a/WebCore/CMakeListsWinCE.txt b/WebCore/CMakeListsWinCE.txt
new file mode 100644
index 0000000..4fa2930
--- /dev/null
+++ b/WebCore/CMakeListsWinCE.txt
@@ -0,0 +1,126 @@
+LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${JAVASCRIPTCORE_DIR}/wtf/text"
+ "${WEBCORE_DIR}/platform/wince"
+ "${WEBCORE_DIR}/platform/win"
+ "${WEBCORE_DIR}/platform/text/wince"
+ "${WEBCORE_DIR}/platform/graphics/wince"
+ "${WEBCORE_DIR}/platform/graphics/win"
+ "${WEBCORE_DIR}/platform/network/win"
+ "${WEBCORE_DIR}/plugins/win"
+ "${WEBCORE_DIR}/page/wince"
+ "${WEBCORE_DIR}/page/win"
+ "${3RDPARTY_DIR}/libjpeg"
+ "${3RDPARTY_DIR}/libpng"
+ "${3RDPARTY_DIR}/libxml2/include"
+ "${3RDPARTY_DIR}/zlib"
+)
+
+LIST(APPEND WebCore_SOURCES
+ bindings/js/ScriptControllerWin.cpp
+
+ page/win/DragControllerWin.cpp
+ page/win/EventHandlerWin.cpp
+ page/wince/FrameWinCE.cpp
+
+ loader/icon/IconDatabaseNone.cpp
+
+ rendering/RenderThemeWince.cpp
+
+ plugins/PluginDatabase.cpp
+
+ plugins/win/PluginDatabaseWin.cpp
+
+ platform/Cursor.cpp
+ platform/LocalizedStrings.cpp
+ platform/PlatformStrategies.cpp
+ platform/ScrollAnimatorWin.cpp
+
+ platform/win/BitmapInfo.cpp
+ platform/win/ClipboardUtilitiesWin.cpp
+ platform/win/ClipboardWin.cpp
+ platform/win/ContextMenuItemWin.cpp
+ platform/win/ContextMenuWin.cpp
+ platform/win/CursorWin.cpp
+ platform/win/EditorWin.cpp
+ platform/win/KeyEventWin.cpp
+ platform/win/LanguageWin.cpp
+ platform/win/PasteboardWin.cpp
+ platform/win/PopupMenuWin.cpp
+ platform/win/PlatformMouseEventWin.cpp
+ platform/win/PlatformScreenWin.cpp
+ platform/win/ScrollbarThemeWin.cpp
+ platform/win/SearchPopupMenuWin.cpp
+ platform/win/SharedBufferWin.cpp
+ platform/win/SoundWin.cpp
+ platform/win/SystemInfo.cpp
+ platform/win/SystemTimeWin.cpp
+ platform/win/WCDataObject.cpp
+ platform/win/WebCoreInstanceHandle.cpp
+ platform/win/WidgetWin.cpp
+ platform/win/WheelEventWin.cpp
+
+ platform/wince/DragDataWince.cpp
+ platform/wince/DragImageWince.cpp
+ platform/wince/FileChooserWince.cpp
+ platform/wince/FileSystemWince.cpp
+ platform/wince/KeygenWince.cpp
+ platform/wince/KURLWince.cpp
+ platform/wince/MIMETypeRegistryWince.cpp
+ platform/wince/SharedTimerWince.cpp
+ platform/wince/TemporaryLinkStubs.cpp
+
+ platform/network/win/CookieJarWin.cpp
+ platform/network/win/NetworkStateNotifierWin.cpp
+ platform/network/win/ResourceHandleWin.cpp
+
+ platform/graphics/opentype/OpenTypeUtilities.cpp
+
+ platform/graphics/win/GDIExtras.cpp
+ platform/graphics/win/IconWin.cpp
+ platform/graphics/win/ImageWin.cpp
+ platform/graphics/win/IntPointWin.cpp
+ platform/graphics/win/IntRectWin.cpp
+ platform/graphics/win/IntSizeWin.cpp
+
+ platform/graphics/wince/ColorWince.cpp
+ platform/graphics/wince/FontCacheWince.cpp
+ platform/graphics/wince/FontCustomPlatformData.cpp
+ platform/graphics/wince/FontPlatformData.cpp
+ platform/graphics/wince/FontWince.cpp
+ platform/graphics/wince/GlyphPageTreeNodeWince.cpp
+ platform/graphics/wince/GradientWince.cpp
+ platform/graphics/wince/GraphicsContextWince.cpp
+ platform/graphics/wince/ImageBufferWince.cpp
+ platform/graphics/wince/ImageWinCE.cpp
+ platform/graphics/wince/PathWince.cpp
+ platform/graphics/wince/PlatformPathWince.cpp
+ platform/graphics/wince/SharedBitmap.cpp
+ platform/graphics/wince/SimpleFontDataWince.cpp
+
+ platform/text/TextEncodingDetectorNone.cpp
+
+ platform/text/wince/TextBreakIteratorWince.cpp
+ platform/text/wince/TextCodecWinCE.cpp
+)
+
+LIST(APPEND WebCore_LIBRARIES
+ libjpeg
+ libpng
+ libxml2
+ crypt32
+ iphlpapi
+ wininet
+)
+
+
+IF (ENABLE_NETSCAPE_PLUGIN_API)
+ LIST(APPEND WebCore_SOURCES
+ plugins/win/PluginMessageThrottlerWin.cpp
+ plugins/win/PluginPackageWin.cpp
+ plugins/win/PluginViewWin.cpp
+ )
+ELSE ()
+ LIST(APPEND WebCore_SOURCES
+ plugins/PluginPackage.cpp
+ )
+ENDIF ()
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c0caea0..45cf2be 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-06 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [WINCE] Add build system
+ https://bugs.webkit.org/show_bug.cgi?id=50522
+
+ * CMakeListsWinCE.txt: Added.
+
2010-12-06 Chris Fleizach <cfleizach at apple.com>
Reviewed by Oliver Hunt.
diff --git a/WebKit/wince/CMakeListsWinCE.txt b/WebKit/wince/CMakeListsWinCE.txt
new file mode 100644
index 0000000..28feaf3
--- /dev/null
+++ b/WebKit/wince/CMakeListsWinCE.txt
@@ -0,0 +1,25 @@
+LIST(APPEND WebKit_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/page/win"
+ "${WEBCORE_DIR}/platform/graphics/wince"
+ "${WEBCORE_DIR}/platform/network/win"
+ "${WEBCORE_DIR}/platform/win"
+
+ wince
+ wince/WebCoreSupport
+)
+
+LIST(APPEND WebKit_SOURCES
+ wince/WebView.h
+ wince/WebView.cpp
+
+ wince/WebCoreSupport/ChromeClientWinCE.cpp
+ wince/WebCoreSupport/ContextMenuClientWinCE.cpp
+ wince/WebCoreSupport/DragClientWinCE.cpp
+ wince/WebCoreSupport/EditorClientWinCE.cpp
+ wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
+ wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp
+ wince/WebCoreSupport/InspectorClientWinCE.cpp
+ wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
+)
+
+SET(WebKit_LIBRARY_TYPE STATIC)
diff --git a/WebKit/wince/ChangeLog b/WebKit/wince/ChangeLog
index d32059d..f7a76e0 100644
--- a/WebKit/wince/ChangeLog
+++ b/WebKit/wince/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-06 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [WINCE] Add build system
+ https://bugs.webkit.org/show_bug.cgi?id=50522
+
+ * CMakeListsWinCE.txt: Added.
+
2010-12-01 Jia Pu <jpu at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKitTools/CMakeListsWinCE.txt b/WebKitTools/CMakeListsWinCE.txt
new file mode 100644
index 0000000..6050499
--- /dev/null
+++ b/WebKitTools/CMakeListsWinCE.txt
@@ -0,0 +1,24 @@
+SET(WinCELauncher_INCLUDE_DIRECTORIES
+ "${WEBKIT_DIR}/wince"
+ "${WEBCORE_DIR}"
+ "${WEBCORE_DIR}/platform"
+ "${WEBCORE_DIR}/platform/graphics"
+ "${WEBCORE_DIR}/platform/network"
+ "${WEBCORE_DIR}/platform/text"
+ "${JAVASCRIPTCORE_DIR}"
+ "${JAVASCRIPTCORE_DIR}/wtf"
+ "${DERIVED_SOURCES_DIR}"
+ "${CMAKE_BINARY_DIR}"
+)
+
+SET(WinCELauncher_SOURCES
+ ${WEBKITTOOLS_DIR}/WinCELauncher/main.cpp
+)
+
+SET(WinCELauncher_LIBRARIES
+ ${WebKit_LIBRARY_NAME}
+)
+
+INCLUDE_DIRECTORIES(${WinCELauncher_INCLUDE_DIRECTORIES})
+ADD_EXECUTABLE(WinCELauncher ${WinCELauncher_SOURCES})
+TARGET_LINK_LIBRARIES(WinCELauncher ${WinCELauncher_LIBRARIES})
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4176b31..c3d0318 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-06 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [WINCE] Add build system
+ https://bugs.webkit.org/show_bug.cgi?id=50522
+
+ * CMakeListsWinCE.txt: Added.
+
2010-12-03 Mihai Parparita <mihaip at chromium.org>
Reviewed by Tony Chang.
diff --git a/cmake/OptionsWinCE.cmake b/cmake/OptionsWinCE.cmake
new file mode 100644
index 0000000..1615c0f
--- /dev/null
+++ b/cmake/OptionsWinCE.cmake
@@ -0,0 +1,54 @@
+INCLUDE(OptionsWindows)
+
+ADD_DEFINITIONS(-DWTF_USE_WINCE_UNICODE=1)
+ADD_DEFINITIONS(-DWTF_USE_WININET=1)
+ADD_DEFINITIONS(-DWTF_CPU_ARM_TRADITIONAL -DWINCEBASIC)
+ADD_DEFINITIONS(-DJS_NO_EXPORT)
+ADD_DEFINITIONS(-DENABLE_JSC_MULTIPLE_THREADS=0)
+ADD_DEFINITIONS(-DHAVE_ACCESSIBILITY=0)
+ADD_DEFINITIONS(-DUSE_SYSTEM_MALLOC=1)
+ADD_DEFINITIONS(-DJSCCOLLECTOR_VIRTUALMEM_RESERVATION=0x200000)
+
+IF (NOT 3RDPARTY_DIR)
+ MESSAGE(FATAL_ERROR "You must provide a 3rd party directory for WinCE port.")
+ENDIF ()
+
+INCLUDE_DIRECTORIES(${3RDPARTY_DIR}/ce-compat)
+ADD_SUBDIRECTORY(${3RDPARTY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/3rdparty")
+
+WEBKIT_FEATURE(ENABLE_AS_IMAGE "Enable SVG as image" DEFAULT ON SVG)
+WEBKIT_FEATURE(ENABLE_BLOB "Enable blob slice" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_DATABASE "Enable database" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_DATAGRID "Enable datagrid" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT OFF HTML)
+WEBKIT_FEATURE(ENABLE_DOM_STORAGE "Enable DOM storage" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_EVENTSOURCE "Enable event source" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_FAST_MOBILE_SCROLLING "Enable fast mobile scrolling" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT OFF SVG)
+WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory support" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_GLIB_SUPPORT "Enable Glib support" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_ICONDATABASE "Enable icon database" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_INSPECTOR "Enable inspector" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_JAVASCRIPT_DEBUGGER "Enable JavaScript debugger" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_JIT "Enable JIT code" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_MATHML "Enable MathML" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_NETSCAPE_PLUGIN_API "Enable Netscape plugin API" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_NOTIFICATIONS "Enable notifications" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_OFFLINE_WEB_APPLICATIONS "Enable offline web applications" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_ORIENTATION_EVENTS "Enable orientation events" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_PROGRESS_TAG "Enable progress tag" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_SVG_ANIMATION "Enable SVG animation" DEFAULT OFF SVG)
+WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON SVG)
+WEBKIT_FEATURE(ENABLE_SVG_FOREIGN_OBJECT "Enable SVG foreign object" DEFAULT OFF SVG)
+WEBKIT_FEATURE(ENABLE_SVG_USE "Enable SVG use" DEFAULT ON SVG)
+WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT OFF HTML)
+WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_WML "Enable WML" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_WORKERS "Enable workers" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_XHTMLMP "Enable XHTMLMP" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_XPATH "Enable XPath" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT OFF)
diff --git a/cmake/OptionsWindows.cmake b/cmake/OptionsWindows.cmake
new file mode 100644
index 0000000..a8f02b3
--- /dev/null
+++ b/cmake/OptionsWindows.cmake
@@ -0,0 +1,14 @@
+ADD_DEFINITIONS(-DWTF_PLATFORM_WINDOWS=1)
+SET(WTF_PLATFORM_WINDOWS 1)
+
+ADD_DEFINITIONS(-DUNICODE)
+
+INCLUDE_DIRECTORIES(${JAVASCRIPTCORE_DIR}/os-win32)
+
+IF (MSVC)
+ ADD_DEFINITIONS(/WX
+ /wd4018 /wd4065 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4275 /wd4288 /wd4291
+ /wd4305 /wd4344 /wd4355 /wd4389 /wd4396 /wd4503 /wd4505 /wd4510 /wd4512 /wd4610 /wd4706 /wd4800 /wd4951 /wd4952 /wd4996)
+ENDIF ()
+
+STRING(REPLACE "/ENTRY:mainACRTStartup" "/ENTRY:WinMainCRTStartup" CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list