<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207009] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207009">207009</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-10 11:29:27 -0700 (Mon, 10 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/206972">r206972</a>.
https://bugs.webkit.org/show_bug.cgi?id=163227
Making EWS flaky (Requested by bfulgham_ on #webkit).
Reverted changeset:
"[CMake] CMake does not support the dep files for implicit
dependency"
https://bugs.webkit.org/show_bug.cgi?id=161433
http://trac.webkit.org/changeset/206972</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeCMakeListstxt">trunk/Tools/DumpRenderTree/CMakeLists.txt</a></li>
<li><a href="#trunkToolsWebKitTestRunnerCMakeListstxt">trunk/Tools/WebKitTestRunner/CMakeLists.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsscriptsgeneratebindingsallpl">trunk/Source/WebCore/bindings/scripts/generate-bindings-all.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (207008 => 207009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-10-10 17:42:47 UTC (rev 207008)
+++ trunk/ChangeLog 2016-10-10 18:29:27 UTC (rev 207009)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-10 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r206972.
+ https://bugs.webkit.org/show_bug.cgi?id=163227
+
+ Making EWS flaky (Requested by bfulgham_ on #webkit).
+
+ Reverted changeset:
+
+ "[CMake] CMake does not support the dep files for implicit
+ dependency"
+ https://bugs.webkit.org/show_bug.cgi?id=161433
+ http://trac.webkit.org/changeset/206972
+
</ins><span class="cx"> 2016-10-09 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> [CMake] CMake does not support the dep files for implicit dependency
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (207008 => 207009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-10-10 17:42:47 UTC (rev 207008)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-10-10 18:29:27 UTC (rev 207009)
</span><span class="lines">@@ -3632,7 +3632,7 @@
</span><span class="cx"> set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
</span><span class="cx"> list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl)
</span><span class="cx">
</span><del>-GENERATE_BINDINGS(WebCoreBindings
</del><ins>+GENERATE_BINDINGS(
</ins><span class="cx"> OUTPUT_SOURCE WebCore_DERIVED_SOURCES
</span><span class="cx"> INPUT_FILES ${WebCore_IDL_FILES}
</span><span class="cx"> BASE_DIR ${WEBCORE_DIR}
</span><span class="lines">@@ -3648,7 +3648,7 @@
</span><span class="cx"> --workerGlobalScopeConstructorsFile ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx"> --dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
</span><span class="cx">
</span><del>-GENERATE_BINDINGS(WebCoreTestSupportBindings
</del><ins>+GENERATE_BINDINGS(
</ins><span class="cx"> OUTPUT_SOURCE WebCoreTestSupport_SOURCES
</span><span class="cx"> INPUT_FILES ${WebCoreTestSupport_IDL_FILES}
</span><span class="cx"> BASE_DIR ${WEBCORE_DIR}
</span><span class="lines">@@ -3657,9 +3657,6 @@
</span><span class="cx"> DESTINATION ${DERIVED_SOURCES_WEBCORE_DIR}
</span><span class="cx"> GENERATOR JS)
</span><span class="cx">
</span><del>-# WebCoreTestSupportBindings needs InternalSettingsGenerated.idl
-add_dependencies(WebCoreTestSupportBindings WebCoreDerivedSources)
-
</del><span class="cx"> # WebCore JS Builtins
</span><span class="cx">
</span><span class="cx"> set(WebCore_BUILTINS_SOURCES
</span><span class="lines">@@ -3805,7 +3802,7 @@
</span><span class="cx"> # files on OS X.
</span><span class="cx"> add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
</span><span class="cx"> set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
</span><del>-add_dependencies(WebCoreDerivedSources JavaScriptCore WebCoreBindings)
</del><ins>+add_dependencies(WebCoreDerivedSources JavaScriptCore)
</ins><span class="cx"> if (NOT WIN32)
</span><span class="cx"> list(APPEND WebCore_LIBRARIES WebCoreDerivedSources)
</span><span class="cx"> endif ()
</span><span class="lines">@@ -3836,7 +3833,7 @@
</span><span class="cx">
</span><span class="cx"> include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES})
</span><span class="cx"> add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
</span><del>-add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
</del><ins>+add_dependencies(WebCoreTestSupport WebCore)
</ins><span class="cx"> target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
</span><span class="cx">
</span><span class="cx"> if (WebCoreTestSupport_OUTPUT_NAME)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207008 => 207009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-10 17:42:47 UTC (rev 207008)
+++ trunk/Source/WebCore/ChangeLog 2016-10-10 18:29:27 UTC (rev 207009)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-10 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r206972.
+ https://bugs.webkit.org/show_bug.cgi?id=163227
+
+ Making EWS flaky (Requested by bfulgham_ on #webkit).
+
+ Reverted changeset:
+
+ "[CMake] CMake does not support the dep files for implicit
+ dependency"
+ https://bugs.webkit.org/show_bug.cgi?id=161433
+ http://trac.webkit.org/changeset/206972
+
</ins><span class="cx"> 2016-10-10 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move media source from legacy to new DOM exceptions
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsgeneratebindingsallpl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/scripts/generate-bindings-all.pl (207008 => 207009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/generate-bindings-all.pl 2016-10-10 17:42:47 UTC (rev 207008)
+++ trunk/Source/WebCore/bindings/scripts/generate-bindings-all.pl 2016-10-10 18:29:27 UTC (rev 207009)
</span><span class="lines">@@ -1,199 +0,0 @@
</span><del>-#!/usr/bin/perl -w
-#
-# Copyright (C) 2016 Sony Interactive Entertainment Inc.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-use strict;
-use FindBin;
-use lib $FindBin::Bin;
-
-use File::Basename;
-use File::Spec;
-use File::Find;
-use Getopt::Long;
-use threads;
-use threads::shared;
-use Thread::Queue;
-
-my $perl = $^X;
-my $scriptDir = $FindBin::Bin;
-my @idlDirectories;
-my $outputDirectory;
-my $idlFilesList;
-my $generator;
-my @generatorDependency;
-my $defines;
-my $preprocessor;
-my $supplementalDependencyFile;
-my @ppExtraOutput;
-my @ppExtraArgs;
-my $numOfJobs = 1;
-my $idlAttributesFile;
-
-GetOptions('include=s@' => \@idlDirectories,
- 'outputDir=s' => \$outputDirectory,
- 'idlFilesList=s' => \$idlFilesList,
- 'generator=s' => \$generator,
- 'generatorDependency=s@' => \@generatorDependency,
- 'defines=s' => \$defines,
- 'preprocessor=s' => \$preprocessor,
- 'supplementalDependencyFile=s' => \$supplementalDependencyFile,
- 'ppExtraOutput=s@' => \@ppExtraOutput,
- 'ppExtraArgs=s@' => \@ppExtraArgs,
- 'idlAttributesFile=s' => \$idlAttributesFile,
- 'numOfJobs=i' => \$numOfJobs);
-
-my @idlFiles;
-open(my $fh, '<', $idlFilesList) or die "Cannot open $idlFilesList";
-@idlFiles = <$fh>;
-close($fh) or die;
-s/\r?\n?$// for @idlFiles;
-
-my %supplementedIdlFiles;
-if ($supplementalDependencyFile) {
- my @output = ($supplementalDependencyFile, @ppExtraOutput);
- my @deps = (@idlFiles, @generatorDependency);
- if (needsUpdate(\@output, \@deps)) {
- my @args = ('--defines', $defines,
- '--idlFilesList', $idlFilesList,
- '--supplementalDependencyFile', $supplementalDependencyFile,
- @ppExtraArgs);
- print("Preprocess IDL\n");
- system($perl, "$scriptDir/preprocess-idls.pl", @args) == 0 or die;
- }
- open(my $fh, '<', $supplementalDependencyFile) or die "Cannot open $supplementalDependencyFile";
- while (<$fh>) {
- my ($idlFile, @followingIdlFiles) = split(/\s+/);
- $supplementedIdlFiles{$idlFile} = \@followingIdlFiles;
- }
- close($fh) or die;
-}
-
-my @args = ('--defines', $defines,
- '--generator', $generator,
- '--outputDir', $outputDirectory,
- '--preprocessor', quoteCommand($preprocessor),
- '--idlAttributesFile', $idlAttributesFile,
- '--write-dependencies');
-push @args, map { ('--include', $_) } @idlDirectories;
-push @args, '--supplementalDependencyFile', $supplementalDependencyFile if $supplementalDependencyFile;
-
-my %directoryCache;
-buildDirectoryCache();
-
-my $queue = Thread::Queue->new(@idlFiles);
-my $abort :shared = 0;
-
-my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs);
-$_->join for @threadPool;
-exit $abort;
-
-sub needsUpdate
-{
- my ($objects, $depends) = @_;
- my $oldestObject;
- my $oldestObjectTime;
- for (@$objects) {
- return 1 if !-f;
- my $m = mtime($_);
- if (!defined $oldestObjectTime || $m < $oldestObjectTime) {
- $oldestObject = $_;
- $oldestObjectTime = $m;
- }
- }
- for (@$depends) {
- die "Missing required dependency: $_" if !-f;
- my $m = mtime($_);
- if ($oldestObjectTime < $m) {
- # print "$_ is newer than $oldestObject\n";
- return 1;
- }
- }
- return 0;
-}
-
-sub mtime
-{
- my ($file) = @_;
- return (stat $file)[9];
-}
-
-sub worker {
- while (my $file = $queue->dequeue_nb()) {
- last if $abort;
- eval {
- my ($filename, $dirs, $suffix) = fileparse($file, '.idl');
- my $sourceFile = File::Spec->catfile($outputDirectory, "JS$filename.cpp");
- my $headerFile = File::Spec->catfile($outputDirectory, "JS$filename.h");
- my $depFile = File::Spec->catfile($outputDirectory, "JS$filename.dep");
- my @output = ($sourceFile, $headerFile);
- my @deps = ($file,
- $idlAttributesFile,
- @generatorDependency,
- @{$supplementedIdlFiles{$file} or []},
- implicitDependencies($depFile));
- if (needsUpdate(\@output, \@deps)) {
- print "$filename$suffix\n";
- system($perl, "$scriptDir/generate-bindings.pl", @args, $file) == 0 or die;
- }
- };
- if ($@) {
- $abort = 1;
- die;
- }
- }
-}
-
-sub buildDirectoryCache
-{
- my $wanted = sub {
- $directoryCache{$_} = $File::Find::name;
- $File::Find::prune = 1 unless ~/\./;
- };
- find($wanted, @idlDirectories);
-}
-
-sub implicitDependencies
-{
- my ($depFile) = @_;
- return () unless -f $depFile;
- open(my $fh, '<', $depFile) or die "Cannot open $depFile";
- my $firstLine = <$fh>;
- close($fh) or die;
- my (undef, $deps) = split(/ : /, $firstLine);
- my @deps = split(/\s+/, $deps);
- return map { $directoryCache{$_} or () } @deps;
-}
-
-sub quoteCommand
-{
- use Config;
- if ($Config::Config{osname} eq 'MSWin32') {
- return map {
- s/\\/\\\\/g;
- s/\"/\\\"/g;
- "\"$_\"";
- } @_;
- }
- return @_;
-}
</del></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (207008 => 207009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-10-10 17:42:47 UTC (rev 207008)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-10-10 18:29:27 UTC (rev 207009)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><span class="cx"> include(CMakeParseArguments)
</span><del>-include(ProcessorCount)
-ProcessorCount(PROCESSOR_COUNT)
</del><span class="cx">
</span><span class="cx"> macro(WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS)
</span><span class="cx"> set(_file ${CMAKE_CURRENT_SOURCE_DIR}/Platform${PORT}.cmake)
</span><span class="lines">@@ -45,8 +43,7 @@
</span><span class="cx"> #FIXME: Add support for Xcode.
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><del>-# Helper macro which wraps generate-bindings-all.pl script.
-# target is a new target name to be added
</del><ins>+# Helper macro which wraps preprocess-idls.pl and generate-bindings.pl scripts.
</ins><span class="cx"> # OUTPUT_SOURCE is a list name which will contain generated sources.(eg. WebCore_SOURCES)
</span><span class="cx"> # INPUT_FILES are IDL files to generate.
</span><span class="cx"> # BASE_DIR is base directory where script is called.
</span><span class="lines">@@ -57,14 +54,15 @@
</span><span class="cx"> # SUPPLEMENTAL_DEPFILE is a value of --supplementalDependencyFile. (optional)
</span><span class="cx"> # PP_EXTRA_OUTPUT is extra outputs of preprocess-idls.pl. (optional)
</span><span class="cx"> # PP_EXTRA_ARGS is extra arguments for preprocess-idls.pl. (optional)
</span><del>-function(GENERATE_BINDINGS target)
</del><ins>+function(GENERATE_BINDINGS)
</ins><span class="cx"> set(options)
</span><span class="cx"> set(oneValueArgs OUTPUT_SOURCE BASE_DIR FEATURES DESTINATION GENERATOR SUPPLEMENTAL_DEPFILE)
</span><span class="cx"> set(multiValueArgs INPUT_FILES IDL_INCLUDES PP_EXTRA_OUTPUT PP_EXTRA_ARGS)
</span><span class="cx"> cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
</span><del>- set(binding_generator ${WEBCORE_DIR}/bindings/scripts/generate-bindings-all.pl)
</del><ins>+ set(binding_generator ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl)
</ins><span class="cx"> set(idl_attributes_file ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
</span><del>- set(idl_files_list ${CMAKE_CURRENT_BINARY_DIR}/idl_files_${target}.tmp)
</del><ins>+ set(id ${arg_OUTPUT_SOURCE})
+ set(idl_files_list ${CMAKE_CURRENT_BINARY_DIR}/idl_files_${id}.tmp)
</ins><span class="cx"> set(_supplemental_dependency)
</span><span class="cx">
</span><span class="cx"> set(content)
</span><span class="lines">@@ -76,37 +74,34 @@
</span><span class="cx"> endforeach ()
</span><span class="cx"> file(WRITE ${idl_files_list} ${content})
</span><span class="cx">
</span><del>- set(args
- --defines ${arg_FEATURES}
- --generator ${arg_GENERATOR}
- --outputDir ${arg_DESTINATION}
- --idlFilesList ${idl_files_list}
- --preprocessor ${CODE_GENERATOR_PREPROCESSOR}
- --idlAttributesFile ${idl_attributes_file})
</del><span class="cx"> if (arg_SUPPLEMENTAL_DEPFILE)
</span><del>- list(APPEND args --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE})
</del><ins>+ set(_supplemental_dependency --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE})
+
+ add_custom_command(
+ OUTPUT ${arg_SUPPLEMENTAL_DEPFILE} ${arg_PP_EXTRA_OUTPUT}
+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${arg_INPUT_FILES}
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines ${arg_FEATURES} --idlFilesList ${idl_files_list} --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE} ${arg_PP_EXTRA_ARGS}
+ VERBATIM)
</ins><span class="cx"> endif ()
</span><del>- if (PROCESSOR_COUNT)
- list(APPEND args --numOfJobs ${PROCESSOR_COUNT})
- endif ()
- foreach (i IN LISTS arg_IDL_INCLUDES)
- if (IS_ABSOLUTE ${i})
- list(APPEND args --include ${i})
</del><ins>+
+ set(idl_includes)
+ foreach (dir ${arg_IDL_INCLUDES})
+ if (IS_ABSOLUTE ${dir})
+ list(APPEND idl_includes --include=${dir})
</ins><span class="cx"> else ()
</span><del>- list(APPEND args --include ${CMAKE_CURRENT_SOURCE_DIR}/${i})
</del><ins>+ list(APPEND idl_includes --include=${CMAKE_CURRENT_SOURCE_DIR}/${dir})
</ins><span class="cx"> endif ()
</span><span class="cx"> endforeach ()
</span><del>- foreach (i IN LISTS arg_PP_EXTRA_OUTPUT)
- list(APPEND args --ppExtraOutput ${i})
- endforeach ()
- foreach (i IN LISTS arg_PP_EXTRA_ARGS)
- list(APPEND args --ppExtraArgs ${i})
- endforeach ()
</del><span class="cx">
</span><span class="cx"> set(common_generator_dependencies
</span><del>- ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl
</del><ins>+ ${binding_generator}
+ ${WEBCORE_DIR}/bindings/scripts/CodeGenerator.pm
</ins><span class="cx"> ${SCRIPTS_BINDINGS}
</span><ins>+ ${arg_SUPPLEMENTAL_DEPFILE}
+ ${idl_attributes_file}
</ins><span class="cx"> )
</span><ins>+ list(APPEND common_generator_dependencies ${arg_PP_EXTRA_OUTPUT})
+
</ins><span class="cx"> if (EXISTS ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm)
</span><span class="cx"> list(APPEND common_generator_dependencies ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm)
</span><span class="cx"> endif ()
</span><span class="lines">@@ -113,32 +108,21 @@
</span><span class="cx"> if (EXISTS ${arg_BASE_DIR}/CodeGenerator${arg_GENERATOR}.pm)
</span><span class="cx"> list(APPEND common_generator_dependencies ${arg_BASE_DIR}/CodeGenerator${arg_GENERATOR}.pm)
</span><span class="cx"> endif ()
</span><del>- foreach (i IN LISTS common_generator_dependencies)
- list(APPEND args --generatorDependency ${i})
- endforeach ()
</del><span class="cx">
</span><span class="cx"> set(gen_sources)
</span><del>- set(gen_headers)
</del><span class="cx"> foreach (_file ${arg_INPUT_FILES})
</span><span class="cx"> get_filename_component(_name ${_file} NAME_WE)
</span><ins>+
+ add_custom_command(
+ OUTPUT ${arg_DESTINATION}/JS${_name}.cpp ${arg_DESTINATION}/JS${_name}.h
+ MAIN_DEPENDENCY ${_file}
+ DEPENDS ${common_generator_dependencies}
+ COMMAND ${PERL_EXECUTABLE} ${binding_generator} --defines ${arg_FEATURES} --generator ${arg_GENERATOR} ${idl_includes} --outputDir ${arg_DESTINATION} --preprocessor ${CODE_GENERATOR_PREPROCESSOR} --idlAttributesFile ${idl_attributes_file} ${_supplemental_dependency} ${_file}
+ WORKING_DIRECTORY ${arg_BASE_DIR}
+ VERBATIM)
</ins><span class="cx"> list(APPEND gen_sources ${arg_DESTINATION}/JS${_name}.cpp)
</span><del>- list(APPEND gen_headers ${arg_DESTINATION}/JS${_name}.h)
</del><span class="cx"> endforeach ()
</span><span class="cx"> set(${arg_OUTPUT_SOURCE} ${${arg_OUTPUT_SOURCE}} ${gen_sources} PARENT_SCOPE)
</span><del>- set(act_args)
- if (${CMAKE_VERSION} VERSION_LESS 3.2)
- set_source_files_properties(${gen_sources} ${gen_headers} PROPERTIES GENERATED 1)
- else ()
- list(APPEND act_args
- BYPRODUCTS ${gen_sources} ${gen_headers}
- USES_TERMINAL
- )
- endif ()
- add_custom_target(${target}
- COMMAND ${PERL_EXECUTABLE} ${binding_generator} ${args}
- WORKING_DIRECTORY ${arg_BASE_DIR}
- COMMENT "Generate bindings (${target})"
- VERBATIM ${act_args})
</del><span class="cx"> endfunction()
</span><span class="cx">
</span><span class="cx"> macro(GENERATE_FONT_NAMES _infile)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207008 => 207009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-10 17:42:47 UTC (rev 207008)
+++ trunk/Tools/ChangeLog 2016-10-10 18:29:27 UTC (rev 207009)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-10 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r206972.
+ https://bugs.webkit.org/show_bug.cgi?id=163227
+
+ Making EWS flaky (Requested by bfulgham_ on #webkit).
+
+ Reverted changeset:
+
+ "[CMake] CMake does not support the dep files for implicit
+ dependency"
+ https://bugs.webkit.org/show_bug.cgi?id=161433
+ http://trac.webkit.org/changeset/206972
+
</ins><span class="cx"> 2016-10-10 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> W3C test downloader should be able to import specific files/sub-directories in a skipped directory
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (207008 => 207009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-10-10 17:42:47 UTC (rev 207008)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-10-10 18:29:27 UTC (rev 207009)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> "${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-GENERATE_BINDINGS(DumpRenderTreeBindings
</del><ins>+GENERATE_BINDINGS(
</ins><span class="cx"> OUTPUT_SOURCE DumpRenderTree_SOURCES
</span><span class="cx"> INPUT_FILES ${DumpRenderTree_IDL_FILES}
</span><span class="cx"> BASE_DIR ${DUMP_RENDER_TREE_BINDINGS_DIR}
</span><span class="lines">@@ -135,7 +135,6 @@
</span><span class="cx">
</span><span class="cx"> add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
</span><span class="cx"> target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
</span><del>-add_dependencies(DumpRenderTree DumpRenderTreeBindings)
</del><span class="cx">
</span><span class="cx"> if (ENABLE_NETSCAPE_PLUGIN_API)
</span><span class="cx"> add_library(TestNetscapePlugin SHARED ${TestNetscapePlugin_SOURCES})
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (207008 => 207009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-10-10 17:42:47 UTC (rev 207008)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-10-10 18:29:27 UTC (rev 207009)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> "${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-GENERATE_BINDINGS(WebKitTestRunnerInjectedBundleBindings
</del><ins>+GENERATE_BINDINGS(
</ins><span class="cx"> OUTPUT_SOURCE WebKitTestRunnerInjectedBundle_SOURCES
</span><span class="cx"> INPUT_FILES ${WebKitTestRunnerInjectedBundle_IDL_FILES}
</span><span class="cx"> BASE_DIR ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> DESTINATION ${DERIVED_SOURCES_DIR}/InjectedBundle
</span><span class="cx"> GENERATOR TestRunner)
</span><span class="cx">
</span><del>-GENERATE_BINDINGS(WebKitTestRunnerBindings
</del><ins>+GENERATE_BINDINGS(
</ins><span class="cx"> OUTPUT_SOURCE WebKitTestRunner_SOURCES
</span><span class="cx"> INPUT_FILES ${WebKitTestRunner_IDL_FILES}
</span><span class="cx"> BASE_DIR ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings
</span><span class="lines">@@ -122,11 +122,9 @@
</span><span class="cx">
</span><span class="cx"> add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
</span><span class="cx"> target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
</span><del>-add_dependencies(TestRunnerInjectedBundle WebKitTestRunnerInjectedBundleBindings)
</del><span class="cx">
</span><span class="cx"> add_executable(WebKitTestRunner ${WebKitTestRunner_SOURCES})
</span><span class="cx"> target_link_libraries(WebKitTestRunner ${WebKitTestRunner_LIBRARIES})
</span><del>-add_dependencies(WebKitTestRunner WebKitTestRunnerBindings)
</del><span class="cx">
</span><span class="cx"> if (NOT APPLE)
</span><span class="cx"> add_dependencies(WebKit2 ${ForwardingHeadersForWebKitTestRunner_NAME})
</span></span></pre>
</div>
</div>
</body>
</html>