<!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>[170922] 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/170922">170922</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 11:05:06 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Remove use of 'grep' in build steps
https://bugs.webkit.org/show_bug.cgi?id=134770
<rdar://problem/17608783>
Reviewed by Tim Horton.
Replace uses of the grep command in Windows builds with the equivalent
Perl program.
Source/JavaScriptCore:
* JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd:
* JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd:
* JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd:
* JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd:
Source/WebCore:
* WebCore.vcxproj/WebCoreGenerated.make:
* WebCore.vcxproj/WebCorePreBuild.cmd:
* platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
(WebCore::WebCoreAVCFResourceLoader::notifyFinished):
Source/WebKit:
* WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
* WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:
* WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd:
Source/WTF:
* WTF.vcxproj/WTFPreBuild.cmd:
Tools:
* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd:
* DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd:
* DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd:
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd:
* WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd:
* WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorePreBuildcmd">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscjscPreBuildcmd">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpPreBuildcmd">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapiPreBuildcmd">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFPreBuildcmd">trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedmake">trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorePreBuildcmd">trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojInterfacesInterfacesPreBuildcmd">trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitPreBuildcmd">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportGeneratorPreBuildcmd">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitGUIDWebKitGUIDPreBuildcmd">trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreePreBuildcmd">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffPreBuildcmd">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojTestNetscapePluginTestNetscapePluginPreBuildcmd">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIPreBuildcmd">trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd</a></li>
<li><a href="#trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibPreBuildcmd">trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd</a></li>
<li><a href="#trunkToolsWinLauncherWinLaunchervcxprojWinLauncherPreBuildcmd">trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd:
+ * JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd:
+ * JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd:
+ * JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd:
+
</ins><span class="cx"> 2014-07-08 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Restore the assertion changed with 170839
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorePreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscjscPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapiPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WTF/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * WTF.vcxproj/WTFPreBuild.cmd:
+
</ins><span class="cx"> 2014-07-07 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Enable ARMv7 disassembler for the GTK port
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebCore/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * WebCore.vcxproj/WebCoreGenerated.make:
+ * WebCore.vcxproj/WebCorePreBuild.cmd:
+ * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
+ (WebCore::WebCoreAVCFResourceLoader::notifyFinished):
+
</ins><span class="cx"> 2014-07-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Added css jit profiler, disabled by default.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> make:
</span><del>- if exist "%ConfigurationBuildDir%\buildfailed" grep XXWebCoreGeneratedXX "%ConfigurationBuildDir%\buildfailed"
</del><ins>+ if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XXWebCoreGeneratedXX/) { print } else { exit 1 }" "%ConfigurationBuildDir%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorePreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span><span class="cx"> set AngleHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
+ * WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:
+ * WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd:
+
</ins><span class="cx"> 2014-07-08 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Implement auto-version as a Perl program
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojInterfacesInterfacesPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportGeneratorPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx">
</span><span class="cx"> echo Preparing generator output directory...
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> del /F /Q "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe"
</span><span class="cx">
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitGUIDWebKitGUIDPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd:
+ * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd:
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd:
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd:
+
</ins><span class="cx"> 2014-07-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r170889.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreePreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreevcxprojTestNetscapePluginTestNetscapePluginPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre></div>
<a id="trunkToolsWinLauncherWinLaunchervcxprojWinLauncherPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd (170921 => 170922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe perl
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx"> echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
</span></span></pre>
</div>
</div>
</body>
</html>