- Revision
- 150074
- Author
- zandober...@gmail.com
- Date
- 2013-05-14 10:40:53 -0700 (Tue, 14 May 2013)
Log Message
[GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
https://bugs.webkit.org/show_bug.cgi?id=115921
Reviewed by Gustavo Noronha Silva.
.:
* GNUmakefile.am: Add GENSOURCES_PLATFORM, platform_built_sources variables.
Source/Platform:
* GNUmakefile.am: Move the ANGLE include directories under the new platform_cppflags variable,
adding the DerivedSources/Platform directory. Add the generated sources' build targets to libPlatform
under nodist_libPlatform_la_SOURCES. Add platform_cppflags to the list of libPlatformGtk CPPFLAGS.
Add generation rules for the ColorData.cpp and WebKitFontFamilyNames.(cpp|h) source files, now generated
into the DerivedSources/Platform directory.
Source/WebCore:
No new tests - no new functionality.
* GNUmakefile.am: Add platform_cppflags to the list of CPPFLAGS for libWebCoreSVG, libWebCore,
libWebCorePlatform, libWebCoreGtk. Remove generation rules for ColorData.cpp and WebKitFontFamilyNames.(cpp|h).
* GNUmakefile.list.am: Include the ColorData.cpp and WebKitFontFamilyNames.(cpp|h) build targers under
platform_built_sources.
* bindings/gobject/GNUmakefile.am: Add platform_cppflags to the list of libWebCoreDOM CPPFLAGS.
Source/WebKit/gtk:
* GNUmakefile.am: Add platform_cppflags to the list of CPPFLAGS for libwebkit2gtk, libWebCoreGtk2,
libPlatformGtk2 and WebKitPluginProcess.
Source/WebKit2:
* GNUmakefile.am: Add platform_cppflags to the list of libwebkit2gtk CPPFLAGS.
Tools:
* GNUmakefile.am: Add platform_cppflags to the list of CPPFLAGS for libWebCoreInternals and DumpRenderTree.
* TestWebKitAPI/GNUmakefile.am: Add platform_cppflags to the list of TestGtk CPPFLAGS.
Modified Paths
Diff
Modified: trunk/ChangeLog (150073 => 150074)
--- trunk/ChangeLog 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/ChangeLog 2013-05-14 17:40:53 UTC (rev 150074)
@@ -1,3 +1,12 @@
+2013-05-14 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
+ https://bugs.webkit.org/show_bug.cgi?id=115921
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Add GENSOURCES_PLATFORM, platform_built_sources variables.
+
2013-05-11 Martin Robinson <mrobin...@igalia.com>
[GTK] Add a basic cmake build for WTF and _javascript_Core
Modified: trunk/GNUmakefile.am (150073 => 150074)
--- trunk/GNUmakefile.am 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/GNUmakefile.am 2013-05-14 17:40:53 UTC (rev 150074)
@@ -37,6 +37,7 @@
GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
GENSOURCES_WEBKITDOM := $(top_builddir)/DerivedSources/webkitdom
+GENSOURCES_PLATFORM := $(top_builddir)/DerivedSources/Platform
GENPROGRAMS := $(top_builddir)/Programs
GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
WebCore := $(srcdir)/Source/WebCore
@@ -72,6 +73,7 @@
offlineasm_nosources :=
platform_webcore_cppflags :=
platform_cppflags :=
+platform_built_sources :=
platform_sources :=
platformgtk_cppflags :=
platformgtk_sources :=
Modified: trunk/Source/Platform/ChangeLog (150073 => 150074)
--- trunk/Source/Platform/ChangeLog 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/Platform/ChangeLog 2013-05-14 17:40:53 UTC (rev 150074)
@@ -1,5 +1,18 @@
2013-05-14 Zan Dobersek <zdober...@igalia.com>
+ [GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
+ https://bugs.webkit.org/show_bug.cgi?id=115921
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Move the ANGLE include directories under the new platform_cppflags variable,
+ adding the DerivedSources/Platform directory. Add the generated sources' build targets to libPlatform
+ under nodist_libPlatform_la_SOURCES. Add platform_cppflags to the list of libPlatformGtk CPPFLAGS.
+ Add generation rules for the ColorData.cpp and WebKitFontFamilyNames.(cpp|h) source files, now generated
+ into the DerivedSources/Platform directory.
+
+2013-05-14 Zan Dobersek <zdober...@igalia.com>
+
[GTK] libPlatform, libPlatformGtk must depend on the related GNUmakefiles
https://bugs.webkit.org/show_bug.cgi?id=115937
Modified: trunk/Source/Platform/GNUmakefile.am (150073 => 150074)
--- trunk/Source/Platform/GNUmakefile.am 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/Platform/GNUmakefile.am 2013-05-14 17:40:53 UTC (rev 150074)
@@ -6,12 +6,15 @@
# For now we only build the libPlatformGtk library as there are no source files in place yet
# that could be built into libPlatform.
-platformgtk_cppflags += \
- -DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
+platform_cppflags += \
-I$(srcdir)/Source/ThirdParty/ANGLE/src \
-I$(srcdir)/Source/ThirdParty/ANGLE/include \
-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
-I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR \
+ -I$(top_builddir)/DerivedSources/Platform
+
+platformgtk_cppflags += \
+ -DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
-DDATA_DIR=\"${datadir}\"
# This is the minimal set of Source/WebCore/platform subdirectories that contain headers required by the GTK-specific
@@ -58,6 +61,9 @@
libPlatform_la_SOURCES = \
$(platform_sources)
+nodist_libPlatform_la_SOURCES = \
+ $(platform_built_sources)
+
libPlatform_la_CXXFLAGS = \
-fvisibility-inlines-hidden \
$(global_cxxflags)
@@ -92,6 +98,7 @@
libPlatformGtk_la_CPPFLAGS = \
-DBUILDING_WEBKIT \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(platform_webcore_cppflags) \
$(_javascript_core_cppflags) \
@@ -99,3 +106,10 @@
$(GTK_CFLAGS) \
$(LIBSECRET_CFLAGS) \
$(LIBSOUP_CFLAGS)
+
+DerivedSources/Platform/ColorData.cpp: $(WebCore)/platform/ColorData.gperf $(WebCore)/make-hash-tools.pl
+ $(AM_V_GEN)$(PERL) $(WebCore)/make-hash-tools.pl $(GENSOURCES_PLATFORM) $(WebCore)/platform/ColorData.gperf
+
+DerivedSources/Platform/WebKitFontFamilyNames.cpp: DerivedSources/Platform/WebKitFontFamilyNames.h
+DerivedSources/Platform/WebKitFontFamilyNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/bindings/scripts/Hasher.pm $(WebCore)/bindings/scripts/StaticString.pm $(WebCore)/css/WebKitFontFamilyNames.in
+ $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in --outputDir "$(GENSOURCES_PLATFORM)"
Modified: trunk/Source/WebCore/ChangeLog (150073 => 150074)
--- trunk/Source/WebCore/ChangeLog 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/WebCore/ChangeLog 2013-05-14 17:40:53 UTC (rev 150074)
@@ -1,5 +1,20 @@
2013-05-14 Zan Dobersek <zdober...@igalia.com>
+ [GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
+ https://bugs.webkit.org/show_bug.cgi?id=115921
+
+ Reviewed by Gustavo Noronha Silva.
+
+ No new tests - no new functionality.
+
+ * GNUmakefile.am: Add platform_cppflags to the list of CPPFLAGS for libWebCoreSVG, libWebCore,
+ libWebCorePlatform, libWebCoreGtk. Remove generation rules for ColorData.cpp and WebKitFontFamilyNames.(cpp|h).
+ * GNUmakefile.list.am: Include the ColorData.cpp and WebKitFontFamilyNames.(cpp|h) build targers under
+ platform_built_sources.
+ * bindings/gobject/GNUmakefile.am: Add platform_cppflags to the list of libWebCoreDOM CPPFLAGS.
+
+2013-05-14 Zan Dobersek <zdober...@igalia.com>
+
[GTK] libPlatform, libPlatformGtk must depend on the related GNUmakefiles
https://bugs.webkit.org/show_bug.cgi?id=115937
Modified: trunk/Source/WebCore/GNUmakefile.am (150073 => 150074)
--- trunk/Source/WebCore/GNUmakefile.am 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/WebCore/GNUmakefile.am 2013-05-14 17:40:53 UTC (rev 150074)
@@ -171,6 +171,7 @@
-DBUILDING_WebCore \
-DBUILDING_WEBKIT \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
@@ -256,10 +257,6 @@
DerivedSources/WebCore/HTMLEntityTable.cpp: $(WebCore)/html/parser/HTMLEntityNames.in $(WebCore)/html/parser/create-html-entity-table
$(AM_V_GEN)$(PYTHON) $(WebCore)/html/parser/create-html-entity-table -o $(GENSOURCES_WEBCORE)/HTMLEntityTable.cpp $(WebCore)/html/parser/HTMLEntityNames.in
-# color names
-DerivedSources/WebCore/ColorData.cpp: $(WebCore)/platform/ColorData.gperf $(WebCore)/make-hash-tools.pl
- $(AM_V_GEN)$(PERL) $(WebCore)/make-hash-tools.pl $(GENSOURCES_WEBCORE) $(WebCore)/platform/ColorData.gperf
-
# CSS grammar
DerivedSources/WebCore/CSSGrammar.h: $(GENSOURCES_WEBCORE)/CSSGrammar.cpp
@@ -303,11 +300,7 @@
DerivedSources/WebCore/PlugInsResources.h: $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES)
$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --defines "$(feature_defines)" $@ DerivedSources/WebCore/PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES)
-DerivedSources/WebCore/WebKitFontFamilyNames.cpp: DerivedSources/WebCore/WebKitFontFamilyNames.h
-DerivedSources/WebCore/WebKitFontFamilyNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/bindings/scripts/Hasher.pm $(WebCore)/bindings/scripts/StaticString.pm $(WebCore)/css/WebKitFontFamilyNames.in
- $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in --outputDir "$(GENSOURCES_WEBCORE)"
-
# HTML tag and attribute names
DerivedSources/WebCore/JSHTMLElementWrapperFactory.cpp: DerivedSources/WebCore/HTMLElementFactory.cpp
DerivedSources/WebCore/HTMLElementFactory.cpp: DerivedSources/WebCore/HTMLElementFactory.h
@@ -484,6 +477,7 @@
-DBUILDING_WebCore \
-DBUILDING_WEBKIT \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
@@ -530,6 +524,7 @@
libWebCorePlatform_la_CPPFLAGS = \
-DBUILDING_WEBKIT \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
@@ -577,6 +572,7 @@
-DBUILDING_WebCore \
-DBUILDING_WEBKIT \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (150073 => 150074)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-05-14 17:40:53 UTC (rev 150074)
@@ -5,7 +5,6 @@
DerivedSources/WebCore/CSSPropertyNames.cpp \
DerivedSources/WebCore/CSSValueKeywords.h \
DerivedSources/WebCore/CSSValueKeywords.cpp \
- DerivedSources/WebCore/ColorData.cpp \
DerivedSources/WebCore/EventFactory.cpp \
DerivedSources/WebCore/EventHeaders.h \
DerivedSources/WebCore/EventInterfaces.h \
@@ -898,8 +897,6 @@
DerivedSources/WebCore/SettingsMacros.h \
DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
DerivedSources/WebCore/UserAgentStyleSheets.h \
- DerivedSources/WebCore/WebKitFontFamilyNames.cpp \
- DerivedSources/WebCore/WebKitFontFamilyNames.h \
DerivedSources/WebCore/XLinkNames.cpp \
DerivedSources/WebCore/XMLNames.cpp \
DerivedSources/WebCore/XMLNames.h \
@@ -910,6 +907,11 @@
DerivedSources/WebCore/XPathGrammar.cpp \
DerivedSources/WebCore/XPathGrammar.h
+platform_built_sources += \
+ DerivedSources/Platform/ColorData.cpp \
+ DerivedSources/Platform/WebKitFontFamilyNames.cpp \
+ DerivedSources/Platform/WebKitFontFamilyNames.h
+
# These files need to be part of WebCore otherwise they cause undefined
# symbols havoc
webcore_built_sources += \
Modified: trunk/Source/WebCore/bindings/gobject/GNUmakefile.am (150073 => 150074)
--- trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-05-14 17:40:53 UTC (rev 150074)
@@ -546,6 +546,7 @@
-I$(WebCore)/bindings/gobject \
-I$(GENSOURCES_WEBKITDOM) \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
Modified: trunk/Source/WebKit/gtk/ChangeLog (150073 => 150074)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-05-14 17:40:53 UTC (rev 150074)
@@ -1,3 +1,13 @@
+2013-05-14 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
+ https://bugs.webkit.org/show_bug.cgi?id=115921
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Add platform_cppflags to the list of CPPFLAGS for libwebkit2gtk, libWebCoreGtk2,
+ libPlatformGtk2 and WebKitPluginProcess.
+
2013-05-12 Timothy Hatcher <timo...@apple.com>
Add support for updating the Web Inspector toolbar height.
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (150073 => 150074)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2013-05-14 17:40:53 UTC (rev 150074)
@@ -47,8 +47,9 @@
-I$(GENSOURCES_WEBKITDOM) \
-ISource/WebKit/gtk/webkit \
$(global_cppflags) \
+ $(platform_cppflags) \
+ $(platformgtk_cppflags) \
$(platform_webcore_cppflags) \
- $(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(_javascript_core_cppflags) \
Modified: trunk/Source/WebKit2/ChangeLog (150073 => 150074)
--- trunk/Source/WebKit2/ChangeLog 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-14 17:40:53 UTC (rev 150074)
@@ -1,3 +1,12 @@
+2013-05-14 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
+ https://bugs.webkit.org/show_bug.cgi?id=115921
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Add platform_cppflags to the list of libwebkit2gtk CPPFLAGS.
+
2013-05-14 Jocelyn Turcotte <jocelyn.turco...@digia.com>
[WK2][Win] Fix ASSERT(DeleteTimerQueueTimer...)
Modified: trunk/Source/WebKit2/GNUmakefile.am (150073 => 150074)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-05-14 17:40:53 UTC (rev 150074)
@@ -159,6 +159,7 @@
-DBUILDING_WEBKIT \
-DWEBKIT2_COMPILATION \
-DENABLE_PLUGIN_PROCESS=1 \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
@@ -481,6 +482,7 @@
-DBUILDING_WEBKIT \
-DGTK_API_VERSION_2=1 \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
@@ -517,6 +519,7 @@
-DBUILDING_WEBKIT \
-DGTK_API_VERSION_2=1 \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(platform_webcore_cppflags) \
$(_javascript_core_cppflags) \
@@ -615,6 +618,7 @@
-DLIBEXECDIR=\""$(libexecdir)"\" \
-std=c++11 \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
Modified: trunk/Tools/ChangeLog (150073 => 150074)
--- trunk/Tools/ChangeLog 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Tools/ChangeLog 2013-05-14 17:40:53 UTC (rev 150074)
@@ -1,3 +1,13 @@
+2013-05-14 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
+ https://bugs.webkit.org/show_bug.cgi?id=115921
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Add platform_cppflags to the list of CPPFLAGS for libWebCoreInternals and DumpRenderTree.
+ * TestWebKitAPI/GNUmakefile.am: Add platform_cppflags to the list of TestGtk CPPFLAGS.
+
2013-05-13 Alex Christensen <achristen...@apple.com>
Added testRunner.setPrinting.
Modified: trunk/Tools/GNUmakefile.am (150073 => 150074)
--- trunk/Tools/GNUmakefile.am 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Tools/GNUmakefile.am 2013-05-14 17:40:53 UTC (rev 150074)
@@ -83,6 +83,7 @@
libWebCoreInternals_la_CPPFLAGS = \
$(global_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
@@ -116,6 +117,7 @@
-I$(top_builddir)/DerivedSources \
-I$(top_builddir)/Source/WebKit/gtk \
$(_javascript_core_cppflags) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags)
Modified: trunk/Tools/TestWebKitAPI/GNUmakefile.am (150073 => 150074)
--- trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-05-14 17:31:35 UTC (rev 150073)
+++ trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-05-14 17:40:53 UTC (rev 150074)
@@ -166,6 +166,7 @@
Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
$(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
+ $(platform_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
