Title: [183389] trunk
- Revision
- 183389
- Author
- [email protected]
- Date
- 2015-04-27 03:02:36 -0700 (Mon, 27 Apr 2015)
Log Message
[EFL] TestWebKitAPI's forwarding header generator should depend on WebKit2's generator
https://bugs.webkit.org/show_bug.cgi?id=143874
Reviewed by Gyuyoung Kim.
Source/WebKit2:
* PlatformEfl.cmake: Rename the generator to have consistent name with other generators.
* Scripts/generate-forwarding-headers.pl: Removed the unnecessary multiple include-path support.
Tools:
* TestWebKitAPI/PlatformEfl.cmake: Add the new dependency.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (183388 => 183389)
--- trunk/Source/WebKit2/ChangeLog 2015-04-27 06:47:26 UTC (rev 183388)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-27 10:02:36 UTC (rev 183389)
@@ -1,3 +1,13 @@
+2015-04-27 Csaba Osztrogonác <[email protected]>
+
+ [EFL] TestWebKitAPI's forwarding header generator should depend on WebKit2's generator
+ https://bugs.webkit.org/show_bug.cgi?id=143874
+
+ Reviewed by Gyuyoung Kim.
+
+ * PlatformEfl.cmake: Rename the generator to have consistent name with other generators.
+ * Scripts/generate-forwarding-headers.pl: Removed the unnecessary multiple include-path support.
+
2015-04-17 Carlos Garcia Campos <[email protected]>
[SOUP] Add initial implementation of NetworkProcess disk cache
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (183388 => 183389)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-04-27 06:47:26 UTC (rev 183388)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-04-27 10:02:36 UTC (rev 183389)
@@ -349,12 +349,12 @@
)
endif ()
-add_custom_target(forwarding-headerEfl
+add_custom_target(forwarding-headersEflForWebKit2
COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${DERIVED_SOURCES_WEBKIT2_DIR}/include --platform efl --platform CoordinatedGraphics --platform soup
)
set(WEBKIT2_EXTRA_DEPENDENCIES
- forwarding-headerEfl
+ forwarding-headersEflForWebKit2
)
configure_file(efl/ewebkit2.pc.in ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc @ONLY)
Modified: trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl (183388 => 183389)
--- trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2015-04-27 06:47:26 UTC (rev 183388)
+++ trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2015-04-27 10:02:36 UTC (rev 183389)
@@ -44,12 +44,12 @@
my %neededHeaders;
my $verbose = 0; # enable it for debugging purpose
-my @incFromRoot;
+my $incFromRoot;
my $outputDirectory;
my @platform;
my %options = (
- 'include-path=s' => \@incFromRoot,
+ 'include-path=s' => \$incFromRoot,
'output=s' => \$outputDirectory,
'platform=s' => \@platform
);
@@ -66,7 +66,7 @@
@frameworkHeaders = ();
%neededHeaders = ();
- foreach (@incFromRoot) { find(\&collectNeededHeaders, abs_path($_) ); };
+ find(\&collectNeededHeaders, abs_path($incFromRoot) );
find(\&collectFrameworkHeaderPaths, File::Spec->catfile($srcRoot, $frameworkDirectoryName));
createForwardingHeadersForFramework();
}
Modified: trunk/Tools/ChangeLog (183388 => 183389)
--- trunk/Tools/ChangeLog 2015-04-27 06:47:26 UTC (rev 183388)
+++ trunk/Tools/ChangeLog 2015-04-27 10:02:36 UTC (rev 183389)
@@ -1,3 +1,12 @@
+2015-04-27 Csaba Osztrogonác <[email protected]>
+
+ [EFL] TestWebKitAPI's forwarding header generator should depend on WebKit2's generator
+ https://bugs.webkit.org/show_bug.cgi?id=143874
+
+ Reviewed by Gyuyoung Kim.
+
+ * TestWebKitAPI/PlatformEfl.cmake: Add the new dependency.
+
2015-04-24 Philippe Normand <[email protected]>
[JHBuild] Move to upstream OpenWebRTC
Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (183388 => 183389)
--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2015-04-27 06:47:26 UTC (rev 183388)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2015-04-27 10:02:36 UTC (rev 183389)
@@ -1,5 +1,6 @@
add_custom_target(forwarding-headersEflForTestWebKitAPI
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --include-path ${TESTWEBKITAPI_DIR} --output ${DERIVED_SOURCES_WEBKIT2_DIR}/include --platform efl --platform CoordinatedGraphics --platform soup
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${DERIVED_SOURCES_WEBKIT2_DIR}/include --platform efl --platform CoordinatedGraphics --platform soup
+ DEPENDS forwarding-headersEflForWebKit2
)
set(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersEflForTestWebKitAPI)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
