Title: [205012] trunk
- Revision
- 205012
- Author
- [email protected]
- Date
- 2016-08-26 07:04:42 -0700 (Fri, 26 Aug 2016)
Log Message
[EFL][GTK] REGRESSION(204877): Fix the clean build
https://bugs.webkit.org/show_bug.cgi?id=161240
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
* Scripts/generate-forwarding-headers.pl: Added back multiple include-path support. (removed by r183389)
Tools:
* WebKitTestRunner/PlatformEfl.cmake:
* WebKitTestRunner/PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205011 => 205012)
--- trunk/Source/WebKit2/ChangeLog 2016-08-26 13:29:31 UTC (rev 205011)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-26 14:04:42 UTC (rev 205012)
@@ -1,3 +1,12 @@
+2016-08-26 Csaba Osztrogonác <[email protected]>
+
+ [EFL][GTK] REGRESSION(204877): Fix the clean build
+ https://bugs.webkit.org/show_bug.cgi?id=161240
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Scripts/generate-forwarding-headers.pl: Added back multiple include-path support. (removed by r183389)
+
2016-08-26 Gyuyoung Kim <[email protected]>
Unreviewed EFL build fix since r204996.
Modified: trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl (205011 => 205012)
--- trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2016-08-26 13:29:31 UTC (rev 205011)
+++ trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2016-08-26 14:04:42 UTC (rev 205012)
@@ -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 = ();
- find(\&collectNeededHeaders, abs_path($incFromRoot) );
+ foreach (@incFromRoot) { find(\&collectNeededHeaders, abs_path($_) ); };
find(\&collectFrameworkHeaderPaths, File::Spec->catfile($srcRoot, $frameworkDirectoryName));
createForwardingHeadersForFramework();
}
Modified: trunk/Tools/ChangeLog (205011 => 205012)
--- trunk/Tools/ChangeLog 2016-08-26 13:29:31 UTC (rev 205011)
+++ trunk/Tools/ChangeLog 2016-08-26 14:04:42 UTC (rev 205012)
@@ -1,3 +1,13 @@
+2016-08-26 Csaba Osztrogonác <[email protected]>
+
+ [EFL][GTK] REGRESSION(204877): Fix the clean build
+ https://bugs.webkit.org/show_bug.cgi?id=161240
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebKitTestRunner/PlatformEfl.cmake:
+ * WebKitTestRunner/PlatformGTK.cmake:
+
2016-08-26 Aakash Jain <[email protected]>
EWS should indicate which bot processed the patch
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (205011 => 205012)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2016-08-26 13:29:31 UTC (rev 205011)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2016-08-26 14:04:42 UTC (rev 205012)
@@ -1,5 +1,5 @@
add_custom_target(forwarding-headersEflForWebKitTestRunner
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${DERIVED_SOURCES_WEBKIT2_DIR}/include --platform efl --platform soup
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --include-path ${WEBKIT_TESTRUNNER_SHARED_DIR} --output ${DERIVED_SOURCES_WEBKIT2_DIR}/include --platform efl --platform soup
)
set(ForwardingHeadersForWebKitTestRunner_NAME forwarding-headersEflForWebKitTestRunner)
Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (205011 => 205012)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2016-08-26 13:29:31 UTC (rev 205011)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2016-08-26 14:04:42 UTC (rev 205012)
@@ -1,5 +1,5 @@
add_custom_target(WebKitTestRunner-forwarding-headers
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --include-path ${WEBKIT_TESTRUNNER_SHARED_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
)
set(ForwardingHeadersForWebKitTestRunner_NAME WebKitTestRunner-forwarding-headers)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
