Title: [149445] trunk/Tools
- Revision
- 149445
- Author
- zandober...@gmail.com
- Date
- 2013-05-01 12:09:32 -0700 (Wed, 01 May 2013)
Log Message
[GTK] Split the forwarding headers stamp in the TestWebKitAPI GNUmakefile.am
https://bugs.webkit.org/show_bug.cgi?id=115469
Reviewed by Martin Robinson.
Split the stamp-testwebkitapi-forwarding-headers into two stamps, one covering forwarding headers
for the WebCore tests (under the Tests/WebCore directory) and the other covering forwarding headers
for the WebKit2 tests and the injected bundle required by them.
This makes it possible for the WebCore tests to compile when the WebKit2 build is disabled, i.e. the WebCore
tests shouldn't depend on the WebKit2 build (though the forwarding headers generation script is stored
under the WebKit2 code).
The WebCore forwarding headers are generated by scanning only the files under the Tests/WebCore directory,
while the WebKit2 forwarding headers generation should keep on scanning the complete root directory of the
TestWebKitAPI subproject, though the target directory should be narrowed down if at all possible.
* TestWebKitAPI/GNUmakefile.am:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (149444 => 149445)
--- trunk/Tools/ChangeLog 2013-05-01 18:59:21 UTC (rev 149444)
+++ trunk/Tools/ChangeLog 2013-05-01 19:09:32 UTC (rev 149445)
@@ -1,3 +1,24 @@
+2013-05-01 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK] Split the forwarding headers stamp in the TestWebKitAPI GNUmakefile.am
+ https://bugs.webkit.org/show_bug.cgi?id=115469
+
+ Reviewed by Martin Robinson.
+
+ Split the stamp-testwebkitapi-forwarding-headers into two stamps, one covering forwarding headers
+ for the WebCore tests (under the Tests/WebCore directory) and the other covering forwarding headers
+ for the WebKit2 tests and the injected bundle required by them.
+
+ This makes it possible for the WebCore tests to compile when the WebKit2 build is disabled, i.e. the WebCore
+ tests shouldn't depend on the WebKit2 build (though the forwarding headers generation script is stored
+ under the WebKit2 code).
+
+ The WebCore forwarding headers are generated by scanning only the files under the Tests/WebCore directory,
+ while the WebKit2 forwarding headers generation should keep on scanning the complete root directory of the
+ TestWebKitAPI subproject, though the target directory should be narrowed down if at all possible.
+
+ * TestWebKitAPI/GNUmakefile.am:
+
2013-04-30 Glenn Adams <gl...@skynav.com>
Unreviewed. Add myself to watchlist entries.
Modified: trunk/Tools/TestWebKitAPI/GNUmakefile.am (149444 => 149445)
--- trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-05-01 18:59:21 UTC (rev 149444)
+++ trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-05-01 19:09:32 UTC (rev 149445)
@@ -14,6 +14,7 @@
-isystem $(srcdir)/Source/ThirdParty/gtest/include \
-I$(srcdir)/Tools/TestWebKitAPI \
-I$(srcdir)/Source/ThirdParty/gtest/include \
+ -I$(top_builddir)/DerivedSources/WebCore/include \
-I$(top_builddir)/DerivedSources/WebKit2/include \
$(global_cppflags) \
$(_javascript_core_cppflags) \
@@ -249,14 +250,21 @@
Libraries_libTestWebKitAPIInjectedBundle_la_CFLAGS = \
$(global_cflags)
-stamp-testwebkitapi-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_TestWebKit2_SOURCES) $(Libraries_libTestWebKitAPIInjectedBundle_la_SOURCES)
+
+stamp-testwebkitapi-webcore-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_TestWebCore_SOURCES)
+ $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI/Tests/WebCore $(GENSOURCES_WEBCORE)/include gtk \
+ && echo timestamp > $(@F)
+
+stamp-testwebkitapi-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_TestWebKit2_SOURCES) $(Libraries_libTestWebKitAPIInjectedBundle_la_SOURCES)
$(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI $(GENSOURCES_WEBKIT2)/include gtk \
&& echo timestamp > $(@F)
+BUILT_SOURCES += $(top_builddir)/stamp-testwebkitapi-webcore-forwarding-headers
if ENABLE_WEBKIT2
-BUILT_SOURCES += $(top_builddir)/stamp-testwebkitapi-forwarding-headers
+BUILT_SOURCES += $(top_builddir)/stamp-testwebkitapi-webkit2-forwarding-headers
endif # ENABLE_WEBKIT2
+
EXTRA_DIST += \
Tools/TestWebKitAPI/Tests/WebKit2/18-characters.html \
Tools/TestWebKitAPI/Tests/WebKit2/file-with-anchor.html \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
