[GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into...
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 May 2013 17:40:53 +0000 (17:40 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 May 2013 17:40:53 +0000 (17:40 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
ChangeLog
GNUmakefile.am
Source/Platform/ChangeLog
Source/Platform/GNUmakefile.am
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/bindings/gobject/GNUmakefile.am
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/GNUmakefile.am
Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am
Tools/ChangeLog
Tools/GNUmakefile.am
Tools/TestWebKitAPI/GNUmakefile.am

index df4b0e8..360aacd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-05-14  Zan Dobersek  <zdobersek@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  <mrobinson@igalia.com>
 
         [GTK] Add a basic cmake build for WTF and JavaScriptCore
index 119a3e5..ffb6cdd 100644 (file)
@@ -37,6 +37,7 @@ GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
 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 @@ llint_nosources :=
 offlineasm_nosources :=
 platform_webcore_cppflags :=
 platform_cppflags :=
+platform_built_sources :=
 platform_sources :=
 platformgtk_cppflags :=
 platformgtk_sources :=
index 36b0e7a..b56ea40 100644 (file)
@@ -1,5 +1,18 @@
 2013-05-14  Zan Dobersek  <zdobersek@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  <zdobersek@igalia.com>
+
         [GTK] libPlatform, libPlatformGtk must depend on the related GNUmakefiles
         https://bugs.webkit.org/show_bug.cgi?id=115937
 
index b119f77..7a4f1b0 100644 (file)
@@ -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 @@ $(platformgtk_lib_for_dep): $(srcdir)/Source/Platform/GNUmakefile.am $(srcdir)/S
 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_CFLAGS = \
 libPlatformGtk_la_CPPFLAGS = \
        -DBUILDING_WEBKIT \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(platform_webcore_cppflags) \
        $(javascriptcore_cppflags) \
@@ -99,3 +106,10 @@ libPlatformGtk_la_CPPFLAGS = \
        $(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)"
index 1e90c5e..9fb9fc3 100644 (file)
@@ -1,5 +1,20 @@
 2013-05-14  Zan Dobersek  <zdobersek@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  <zdobersek@igalia.com>
+
         [GTK] libPlatform, libPlatformGtk must depend on the related GNUmakefiles
         https://bugs.webkit.org/show_bug.cgi?id=115937
 
index f9315fc..6eb3b73 100644 (file)
@@ -171,6 +171,7 @@ libWebCoreSVG_la_CPPFLAGS = \
        -DBUILDING_WebCore \
        -DBUILDING_WEBKIT \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
@@ -256,10 +257,6 @@ DerivedSources/WebCore/XMLViewerJS.h: $(WebCore)/xml/XMLViewer.js
 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,10 +300,6 @@ DerivedSources/WebCore/PlugInsResourcesData.cpp: DerivedSources/WebCore/PlugInsR
 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
@@ -484,6 +477,7 @@ libWebCore_la_CPPFLAGS = \
        -DBUILDING_WebCore \
        -DBUILDING_WEBKIT \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
@@ -530,6 +524,7 @@ libWebCorePlatform_la_CFLAGS = \
 libWebCorePlatform_la_CPPFLAGS = \
        -DBUILDING_WEBKIT \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
@@ -577,6 +572,7 @@ libWebCoreGtk_la_CPPFLAGS = \
        -DBUILDING_WebCore \
        -DBUILDING_WEBKIT \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
index 5fe5251..5c7429c 100644 (file)
@@ -5,7 +5,6 @@ webcore_built_sources += \
        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 @@ webcore_built_sources += \
        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 @@ webcore_built_sources += \
        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 += \
index c47c911..02c0ebe 100644 (file)
@@ -546,6 +546,7 @@ libWebCoreDOM_la_CPPFLAGS = \
        -I$(WebCore)/bindings/gobject \
        -I$(GENSOURCES_WEBKITDOM) \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
index 54037ed..87a01d1 100644 (file)
@@ -1,3 +1,13 @@
+2013-05-14  Zan Dobersek  <zdobersek@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  <timothy@apple.com>
 
         Add support for updating the Web Inspector toolbar height.
index 3a51c52..11b89de 100644 (file)
@@ -47,8 +47,9 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPF
        -I$(GENSOURCES_WEBKITDOM) \
        -ISource/WebKit/gtk/webkit \
        $(global_cppflags) \
-       $(platform_webcore_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
+       $(platform_webcore_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
        $(javascriptcore_cppflags) \
index b268bb0..5fd5dd7 100644 (file)
@@ -1,3 +1,12 @@
+2013-05-14  Zan Dobersek  <zdobersek@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.turcotte@digia.com>
 
         [WK2][Win] Fix ASSERT(DeleteTimerQueueTimer...)
index 436c2bc..70add89 100644 (file)
@@ -159,6 +159,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPP
        -DBUILDING_WEBKIT \
        -DWEBKIT2_COMPILATION \
        -DENABLE_PLUGIN_PROCESS=1 \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
@@ -481,6 +482,7 @@ libWebCoreGtk2_la_CPPFLAGS = \
        -DBUILDING_WEBKIT \
        -DGTK_API_VERSION_2=1 \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
@@ -517,6 +519,7 @@ libPlatformGtk2_la_CPPFLAGS = \
        -DBUILDING_WEBKIT \
        -DGTK_API_VERSION_2=1 \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(platform_webcore_cppflags) \
        $(javascriptcore_cppflags) \
@@ -615,6 +618,7 @@ Programs_WebKitPluginProcess_CPPFLAGS = \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
        -std=c++11 \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
index a844428..e8394fa 100644 (file)
@@ -1,3 +1,13 @@
+2013-05-14  Zan Dobersek  <zdobersek@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  <achristensen@apple.com>
 
         Added testRunner.setPrinting.
index 480350e..a7351b1 100644 (file)
@@ -83,6 +83,7 @@ BUILT_SOURCES += $(libwebcoreinternals_built_sources)
 
 libWebCoreInternals_la_CPPFLAGS = \
        $(global_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
@@ -116,6 +117,7 @@ Programs_DumpRenderTree_CPPFLAGS = \
        -I$(top_builddir)/DerivedSources \
        -I$(top_builddir)/Source/WebKit/gtk \
        $(javascriptcore_cppflags) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags)
 
index 6a01d35..72f4759 100644 (file)
@@ -166,6 +166,7 @@ Programs_TestWebKitAPI_TestWebCore_SOURCES = \
 
 Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
        $(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
+       $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \