Commit 25d930a1 authored by zandobersek@gmail.com's avatar zandobersek@gmail.com

[GTK] Set up libPlatform.la

https://bugs.webkit.org/show_bug.cgi?id=114168

Reviewed by Martin Robinson.

.: 

* GNUmakefile.am: Define the platform_cppflags and platform_sources variables.

Source/Platform: 

* GNUmakefile.am: Set up the libPlatform.la static library to build the source files listed in platform_sources.
As with the libPlatformGtk.la library, only the Source/WebCore/platform and its subdirectories are allowed to be
searched for headers to include, providing a convenient way to detect any platform violations. These directories
are listed in the platform_webcore_cppflags variable.

Source/WebCore: 

No new tests - no new functionality.

* GNUmakefile.am: Also add the LevelDB-specific cppflags to the platform_cppflags if required as the LevelDB
code is now built into the new libPlatform.la library.
* GNUmakefile.list.am: Build a small set of non-GTK-specific platform source files that are already free of
platform violations into the new libPlatform.la library.

Source/WebKit/gtk: 

* GNUmakefile.am: Add the new libPlatform.la library to the libwebkitgtk library.

Source/WebKit2: 

* GNUmakefile.am: Add the new libPlatform.la library to the libwebkitgtk library. Link the WebKitPluginProcess
executable against libPlatform.la as well.

Tools: 

* GNUmakefile.am: Link the DumpRenderTree executable against both libPlatform.la and libPlatformGtk.la libraries.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@148903 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9ffbf65b
2013-04-22 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up libPlatform.la
https://bugs.webkit.org/show_bug.cgi?id=114168
Reviewed by Martin Robinson.
* GNUmakefile.am: Define the platform_cppflags and platform_sources variables.
2013-04-20 Zan Dobersek <zdobersek@igalia.com>
Enable sub-pixel layout for the GTK port
......
......@@ -71,6 +71,8 @@ javascriptcore_built_nosources :=
llint_nosources :=
offlineasm_nosources :=
platform_webcore_cppflags :=
platform_cppflags :=
platform_sources :=
platformgtk_cppflags :=
platformgtk_sources :=
webcore_platform_sources :=
......
2013-04-22 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up libPlatform.la
https://bugs.webkit.org/show_bug.cgi?id=114168
Reviewed by Martin Robinson.
* GNUmakefile.am: Set up the libPlatform.la static library to build the source files listed in platform_sources.
As with the libPlatformGtk.la library, only the Source/WebCore/platform and its subdirectories are allowed to be
searched for headers to include, providing a convenient way to detect any platform violations. These directories
are listed in the platform_webcore_cppflags variable.
2013-04-05 Benjamin Poulain <benjamin@webkit.org>
Fix GTK+ for real after r147712
......
......@@ -36,8 +36,28 @@ platform_webcore_cppflags += \
-I$(srcdir)/Source/WebCore/platform/text
noinst_LTLIBRARIES += \
libPlatform.la \
libPlatformGtk.la
libPlatform_la_SOURCES = \
$(platform_sources)
libPlatform_la_CXXFLAGS = \
-fvisibility-inlines-hidden \
$(global_cxxflags)
libPlatform_la_CFLAGS = \
-fvisibility=hidden \
$(global_cflags)
libPlatform_la_CPPFLAGS = \
-DBUILDING_WEBKIT \
$(global_cppflags) \
$(platform_cppflags) \
$(platform_webcore_cppflags) \
$(javascriptcore_cppflags) \
-fno-strict-aliasing
libPlatformGtk_la_SOURCES = \
$(platformgtk_sources)
......
2013-04-22 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up libPlatform.la
https://bugs.webkit.org/show_bug.cgi?id=114168
Reviewed by Martin Robinson.
No new tests - no new functionality.
* GNUmakefile.am: Also add the LevelDB-specific cppflags to the platform_cppflags if required as the LevelDB
code is now built into the new libPlatform.la library.
* GNUmakefile.list.am: Build a small set of non-GTK-specific platform source files that are already free of
platform violations into the new libPlatform.la library.
2013-04-22 Andy Estes <aestes@apple.com>
Range.getClientRects() should not include rects for partially selected elements
......@@ -219,6 +219,10 @@ webcore_cppflags += \
-DWTF_USE_LEVELDB=1 \
-I$(srcdir)/Source/ThirdParty/leveldb \
-I$(srcdir)/Source/ThirdParty/leveldb/include
platform_cppflags += \
-DWTF_USE_LEVELDB=1 \
-I$(srcdir)/Source/ThirdParty/leveldb \
-I$(srcdir)/Source/ThirdParty/leveldb/include
endif
$(WEBCORE_CSS_PROPERTY_NAMES): $(srcdir)/configure.ac $(srcdir)/Source/WebCore/GNUmakefile.am
......
......@@ -5519,8 +5519,6 @@ webcore_platform_sources += \
Source/WebCore/platform/LayoutUnit.h \
Source/WebCore/platform/Gamepads.h \
Source/WebCore/platform/HashTools.h \
Source/WebCore/platform/HistogramSupport.cpp \
Source/WebCore/platform/HistogramSupport.h \
Source/WebCore/platform/InitializeLogging.h \
Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp \
Source/WebCore/platform/graphics/ANGLEWebKitBridge.h \
......@@ -5829,27 +5827,10 @@ webcore_platform_sources += \
Source/WebCore/platform/Length.cpp \
Source/WebCore/platform/Length.h \
Source/WebCore/platform/LengthSize.h \
Source/WebCore/platform/leveldb/LevelDBComparator.h \
Source/WebCore/platform/leveldb/LevelDBDatabase.cpp \
Source/WebCore/platform/leveldb/LevelDBDatabase.h \
Source/WebCore/platform/leveldb/LevelDBIterator.h \
Source/WebCore/platform/leveldb/LevelDBSlice.h \
Source/WebCore/platform/leveldb/LevelDBTransaction.h \
Source/WebCore/platform/leveldb/LevelDBTransaction.cpp \
Source/WebCore/platform/leveldb/LevelDBWriteBatch.h \
Source/WebCore/platform/leveldb/LevelDBWriteBatch.cpp \
Source/WebCore/platform/LinkHash.cpp \
Source/WebCore/platform/LinkHash.h \
Source/WebCore/platform/LocalizedStrings.h \
Source/WebCore/platform/Logging.cpp \
Source/WebCore/platform/Logging.h \
Source/WebCore/platform/MainThreadTask.h \
Source/WebCore/platform/MIMETypeRegistry.cpp \
Source/WebCore/platform/MIMETypeRegistry.h \
Source/WebCore/platform/MemoryPressureHandler.cpp \
Source/WebCore/platform/MemoryPressureHandler.h \
Source/WebCore/platform/MemoryUsageSupport.cpp \
Source/WebCore/platform/MemoryUsageSupport.h \
Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp \
Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h \
Source/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp \
......@@ -5991,8 +5972,6 @@ webcore_platform_sources += \
Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp \
Source/WebCore/platform/network/soup/SoupURIUtils.cpp \
Source/WebCore/platform/network/soup/SoupURIUtils.h \
Source/WebCore/platform/NotImplemented.cpp \
Source/WebCore/platform/NotImplemented.h \
Source/WebCore/platform/Pasteboard.h \
Source/WebCore/platform/PasteboardStrategy.h \
Source/WebCore/platform/PlatformEvent.cpp \
......@@ -6022,10 +6001,6 @@ webcore_platform_sources += \
Source/WebCore/platform/PurgePriority.h \
Source/WebCore/platform/RefCountedSupplement.h \
Source/WebCore/platform/ReferrerPolicy.h \
Source/WebCore/platform/RunLoop.cpp \
Source/WebCore/platform/RunLoop.h \
Source/WebCore/platform/RuntimeApplicationChecks.cpp \
Source/WebCore/platform/RuntimeApplicationChecks.h \
Source/WebCore/platform/SchemeRegistry.cpp \
Source/WebCore/platform/SchemeRegistry.h \
Source/WebCore/platform/ScrollAnimator.cpp \
......@@ -6140,13 +6115,40 @@ webcore_platform_sources += \
Source/WebCore/platform/Timer.cpp \
Source/WebCore/platform/Timer.h \
Source/WebCore/platform/TreeShared.h \
Source/WebCore/platform/UUID.cpp \
Source/WebCore/platform/UUID.h \
Source/WebCore/platform/VisitedLinkStrategy.h \
Source/WebCore/platform/Widget.cpp \
Source/WebCore/platform/Widget.h \
Source/WebCore/platform/WindowsKeyboardCodes.h
platform_sources += \
Source/WebCore/platform/leveldb/LevelDBComparator.h \
Source/WebCore/platform/leveldb/LevelDBDatabase.cpp \
Source/WebCore/platform/leveldb/LevelDBDatabase.h \
Source/WebCore/platform/leveldb/LevelDBIterator.h \
Source/WebCore/platform/leveldb/LevelDBSlice.h \
Source/WebCore/platform/leveldb/LevelDBTransaction.h \
Source/WebCore/platform/leveldb/LevelDBTransaction.cpp \
Source/WebCore/platform/leveldb/LevelDBWriteBatch.h \
Source/WebCore/platform/leveldb/LevelDBWriteBatch.cpp \
Source/WebCore/platform/HistogramSupport.cpp \
Source/WebCore/platform/HistogramSupport.h \
Source/WebCore/platform/LinkHash.cpp \
Source/WebCore/platform/LinkHash.h \
Source/WebCore/platform/Logging.cpp \
Source/WebCore/platform/Logging.h \
Source/WebCore/platform/MemoryPressureHandler.cpp \
Source/WebCore/platform/MemoryPressureHandler.h \
Source/WebCore/platform/MemoryUsageSupport.cpp \
Source/WebCore/platform/MemoryUsageSupport.h \
Source/WebCore/platform/NotImplemented.cpp \
Source/WebCore/platform/NotImplemented.h \
Source/WebCore/platform/RunLoop.cpp \
Source/WebCore/platform/RunLoop.h \
Source/WebCore/platform/RuntimeApplicationChecks.cpp \
Source/WebCore/platform/RuntimeApplicationChecks.h \
Source/WebCore/platform/UUID.cpp \
Source/WebCore/platform/UUID.h
# WebCore files that use GTK/GDK or any other dependency that requires GTK+.
webcoregtk_sources += \
Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp \
......
2013-04-22 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up libPlatform.la
https://bugs.webkit.org/show_bug.cgi?id=114168
Reviewed by Martin Robinson.
* GNUmakefile.am: Add the new libPlatform.la library to the libwebkitgtk library.
2013-04-19 Martin Robinson <mrobinson@igalia.com>
[GTK] JSCore.gir.in has a few problems
......
......@@ -80,6 +80,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFL
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD := \
-lpthread \
libPlatform.la \
libPlatformGtk.la \
libWebCore.la \
libWebCorePlatform.la \
......
2013-04-22 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up libPlatform.la
https://bugs.webkit.org/show_bug.cgi?id=114168
Reviewed by Martin Robinson.
* GNUmakefile.am: Add the new libPlatform.la library to the libwebkitgtk library. Link the WebKitPluginProcess
executable against libPlatform.la as well.
2013-04-22 Sam Weinig <sam@webkit.org>
Hard code plug-in sandbox profile lookup directories and move
......@@ -222,6 +222,7 @@ endif
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libPlatform.la \
libPlatformGtk.la \
libWebCoreDOM.la \
libWebCoreGtk.la \
......@@ -654,6 +655,7 @@ Programs_WebKitPluginProcess_LDADD += \
endif
Programs_WebKitPluginProcess_LDADD += \
libPlatform.la \
libPlatformGtk2.la \
libWebCoreModules.la \
libWebCoreGtk2.la \
......
2013-04-22 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up libPlatform.la
https://bugs.webkit.org/show_bug.cgi?id=114168
Reviewed by Martin Robinson.
* GNUmakefile.am: Link the DumpRenderTree executable against both libPlatform.la and libPlatformGtk.la libraries.
2013-04-22 Xuefei Ren <xren@blackberry.com>
fix build warning(unused parameter)
......@@ -187,6 +187,8 @@ Programs_DumpRenderTree_CFLAGS = \
Programs_DumpRenderTree_LDADD = \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libPlatform.la \
libPlatformGtk.la \
libWebCorePlatform.la \
libWebCoreModules.la \
libWebCoreInternals.la \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment