https://bugs.webkit.org/show_bug.cgi?id=142907
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* Scripts/generate-forwarding-headers.pl: Make it work with more path and platform arguments.
Tools:
* TestWebKitAPI/PlatformEfl.cmake:
* TestWebKitAPI/PlatformGTK.cmake:
* WebKitTestRunner/PlatformEfl.cmake:
* WebKitTestRunner/PlatformGTK.cmake:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@182595
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2015-04-09 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL][GTK] WebKit2's generate-forwarding-headers.pl runs too many times
+ https://bugs.webkit.org/show_bug.cgi?id=142907
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * Scripts/generate-forwarding-headers.pl: Make it work with more path and platform arguments.
+
2015-04-08 Joseph Pecoraro <pecoraro@apple.com>
Exception in console and broken right click after attempting to show context menu in Inspector
endif ()
add_custom_target(forwarding-headerEfl
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include CoordinatedGraphics
-)
-
-add_custom_target(forwarding-headerSoup
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+ 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-headerSoup
)
configure_file(efl/ewebkit2.pc.in ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc @ONLY)
${PluginProcessGTK2_SOURCES}
${PluginProcess_SOURCES}
${WebKit2_HEADERS}
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} gtk
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} soup
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --input-path ${WEBKIT2_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
COMMAND touch ${CMAKE_BINARY_DIR}/WebKit2-forwarding-headers.stamp
)
add_custom_target(WebKit2-forwarding-headers
use File::Basename;
use File::Path qw(mkpath);
use File::Spec::Functions;
+use Getopt::Long;
my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
-my $incFromRoot = abs_path($ARGV[0]);
my @platformPrefixes = ("cf", "Cocoa", "CoordinatedGraphics", "curl", "efl", "gtk", "mac", "soup", "win");
my @frameworks = ("JavaScriptCore", "WebCore", "WebKit");
my @skippedPrefixes;
my %neededHeaders;
my $verbose = 0; # enable it for debugging purpose
-shift;
-my $outputDirectory = $ARGV[0];
-shift;
-my $platform = $ARGV[0];
+my @incFromRoot;
+my $outputDirectory;
+my @platform;
+
+my %options = (
+ 'include-path=s' => \@incFromRoot,
+ 'output=s' => \$outputDirectory,
+ 'platform=s' => \@platform
+);
+
+GetOptions(%options);
foreach my $prefix (@platformPrefixes) {
- push(@skippedPrefixes, $prefix) unless ($prefix =~ $platform);
+ push(@skippedPrefixes, $prefix) if grep($_ =~ "$prefix", @platform) == 0;
}
foreach (@frameworks) {
@frameworkHeaders = ();
%neededHeaders = ();
- find(\&collectNeededHeaders, $incFromRoot);
+ foreach (@incFromRoot) { find(\&collectNeededHeaders, abs_path($_) ); };
find(\&collectFrameworkHeaderPaths, File::Spec->catfile($srcRoot, $frameworkDirectoryName));
createForwardingHeadersForFramework();
}
+2015-04-09 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL][GTK] WebKit2's generate-forwarding-headers.pl runs too many times
+ https://bugs.webkit.org/show_bug.cgi?id=142907
+
+ Reviewed by Carlos Garcia Campos.
+
+ * TestWebKitAPI/PlatformEfl.cmake:
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * WebKitTestRunner/PlatformEfl.cmake:
+ * WebKitTestRunner/PlatformGTK.cmake:
+
2015-04-08 Brent Fulgham <bfulgham@apple.com>
[Mac] Unreviewed test fix after r182584
add_custom_target(forwarding-headersEflForTestWebKitAPI
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include CoordinatedGraphics
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+ 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
)
set(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersEflForTestWebKitAPI)
OUTPUT ${CMAKE_BINARY_DIR}/TestWebKitAPI-forwarding-headers.stamp
DEPENDS ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl
${TestWebKitAPI_SOURCES}
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${FORWARDING_HEADERS_DIR} gtk
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
COMMAND touch ${CMAKE_BINARY_DIR}/TestWebKitAPI-forwarding-headers.stamp
)
add_custom_target(TestWebKitAPI-forwarding-headers
add_custom_target(forwarding-headersEflForWebKitTestRunner
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+ 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
)
set(ForwardingHeadersForWebKitTestRunner_NAME forwarding-headersEflForWebKitTestRunner)
${WebKitTestRunner_SOURCES}
${WebKitTestRunner_HEADERS}
${WebKitTestRunnerInjectedBundle_SOURCES}
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${FORWARDING_HEADERS_DIR} gtk
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
COMMAND touch ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
)
add_custom_target(WebKitTestRunner-forwarding-headers