<!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>[170937] 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/170937">170937</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 16:48:26 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Remove uses of 'bash' in build system
https://bugs.webkit.org/show_bug.cgi?id=134782
<rdar://problem/17615533>
Reviewed by Dean Jackson.
Remove uses of 'bash' by replacing Windows-specific bash scripts
with Perl equivalents.
Source/JavaScriptCore:
* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj.filters:
* JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl: Copied from Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh.
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh: Removed.
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.pl: Copied from Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh.
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh: Removed.
* JavaScriptCore.vcxproj/build-generated-files.pl: Copied from Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh.
* JavaScriptCore.vcxproj/build-generated-files.sh: Removed.
* JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd:
* JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd:
* JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd:
Source/WebCore:
* WebCore.vcxproj/WebCoreGenerated.make:
* WebCore.vcxproj/WebCoreGenerated.vcxproj:
* WebCore.vcxproj/WebCoreGenerated.vcxproj.filters:
* WebCore.vcxproj/WebCorePreBuild.cmd:
* WebCore.vcxproj/build-generated-files.pl: Copied from Source/WebCore/WebCore.vcxproj/build-generated-files.sh.
* WebCore.vcxproj/build-generated-files.sh: Removed.
* WebCore.vcxproj/migrate-scripts.pl: Copied from Source/WebCore/WebCore.vcxproj/migrate-scripts.sh.
* WebCore.vcxproj/migrate-scripts.sh: Removed.
Source/WebInspectorUI:
* WebInspectorUI.vcxproj/WebInspectorUI.make:
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
* WebInspectorUI.vcxproj/build-webinspectorui.pl: Copied from Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh.
* WebInspectorUI.vcxproj/build-webinspectorui.sh: Removed.
Source/WebKit:
* WebKit.vcxproj/Interfaces/FixMIDLHeaders.pl:
* WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
* WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:
* WebKit.vcxproj/WebKit/WebKitVersion.cmd:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:
* WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd:
Source/WTF:
* WTF.vcxproj/WTFGenerated.make:
* WTF.vcxproj/WTFGenerated.vcxproj:
* WTF.vcxproj/WTFGenerated.vcxproj.filters:
* WTF.vcxproj/WTFPreBuild.cmd:
* WTF.vcxproj/build-generated-files.pl: Copied from Source/WTF/WTF.vcxproj/build-generated-files.sh.
* WTF.vcxproj/build-generated-files.sh: Removed.
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:
WebKitLibraries:
* win/tools/scripts/feature-defines.pl: Copied from WebKitLibraries/win/tools/scripts/feature-defines.sh.
* win/tools/scripts/feature-defines.sh: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedmake">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorePreBuildcmd">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblymake">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblyvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsmake">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj</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="#trunkSourceWTFWTFvcxprojWTFGeneratedmake">trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFGeneratedvcxproj">trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFGeneratedvcxprojfilters">trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj.filters</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="#trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorePreBuildcmd">trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxprojfilters">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojInterfacesFixMIDLHeaderspl">trunk/Source/WebKit/WebKit.vcxproj/Interfaces/FixMIDLHeaders.pl</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="#trunkSourceWebKitWebKitvcxprojWebKitWebKitVersioncmd">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportGeneratorBuildCmdcmd">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.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>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblybuildLLIntAssemblypl">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsbuildLLIntDesiredOffsetspl">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.pl</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojbuildgeneratedfilespl">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.pl</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojbuildgeneratedfilespl">trunk/Source/WTF/WTF.vcxproj/build-generated-files.pl</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojbuildgeneratedfilespl">trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojmigratescriptspl">trunk/Source/WebCore/WebCore.vcxproj/migrate-scripts.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruipl">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsscriptsfeaturedefinespl">trunk/WebKitLibraries/win/tools/scripts/feature-defines.pl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblybuildLLIntAssemblysh">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsbuildLLIntDesiredOffsetssh">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojbuildgeneratedfilessh">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojbuildgeneratedfilessh">trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojbuildgeneratedfilessh">trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojmigratescriptssh">trunk/Source/WebCore/WebCore.vcxproj/migrate-scripts.sh</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruish">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsscriptsfeaturedefinessh">trunk/WebKitLibraries/win/tools/scripts/feature-defines.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-07-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ [Win] Remove uses of 'bash' in build system
+ https://bugs.webkit.org/show_bug.cgi?id=134782
+ <rdar://problem/17615533>
+
+ Reviewed by Dean Jackson.
+
+ Remove uses of 'bash' by replacing Windows-specific bash scripts
+ with Perl equivalents.
+
+ * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
+ * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj.filters:
+ * JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd:
+ * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
+ * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj:
+ * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl: Copied from Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh.
+ * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh: Removed.
+ * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
+ * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj:
+ * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.pl: Copied from Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh.
+ * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh: Removed.
+ * JavaScriptCore.vcxproj/build-generated-files.pl: Copied from Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh.
+ * JavaScriptCore.vcxproj/build-generated-files.sh: Removed.
+ * JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd:
+ * JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd:
+ * JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd:
+
+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Remove use of 'grep' in build steps
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134770
</span><span class="cx"> <rdar://problem/17608783>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> all:
</span><span class="cx"> touch "%ConfigurationBuildDir%\buildfailed"
</span><del>- bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
</del><ins>+ perl build-generated-files.pl "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
</ins><span class="cx"> copy-files.cmd
</span><span class="cx">
</span><span class="cx"> -del "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdbool.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdint.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\DerivedSources.make" />
</span><del>- <None Include="build-generated-files.sh" />
</del><ins>+ <None Include="build-generated-files.pl" />
</ins><span class="cx"> <None Include="copy-files.cmd" />
</span><span class="cx"> <None Include="JavaScriptCoreGenerated.make" />
</span><span class="cx"> </ItemGroup>
</span><span class="lines">@@ -223,4 +223,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj.filters (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj.filters 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj.filters 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup>
</span><del>- <None Include="build-generated-files.sh" />
</del><span class="cx"> <None Include="JavaScriptCoreGenerated.make" />
</span><span class="cx"> <None Include="..\DerivedSources.make" />
</span><span class="cx"> <None Include="copy-files.cmd" />
</span><ins>+ <None Include="build-generated-files.pl" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorePreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblymake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> all:
</span><span class="cx"> touch "%ConfigurationBuildDir%\buildfailed"
</span><del>- bash build-LLIntAssembly.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
</del><ins>+ perl build-LLIntAssembly.pl "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
</ins><span class="cx"> -del "%ConfigurationBuildDir%\buildfailed"
</span><span class="cx">
</span><span class="cx"> clean:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblyvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -274,10 +274,10 @@
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <None Include="build-LLIntAssembly.sh" />
</del><ins>+ <None Include="build-LLIntAssembly.pl" />
</ins><span class="cx"> <None Include="LLIntAssembly.make" />
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblybuildLLIntAssemblyplfromrev170922trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblybuildLLIntAssemblysh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl (from rev 170922, trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh) (0 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl (rev 0)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# 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.
+# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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 Cwd;
+use File::Path qw(make_path);
+use File::Spec;
+
+my $PWD = Cwd::cwd();
+my $XSRCROOT = Cwd::realpath(File::Spec->catdir($PWD, '..', '..', '..'));
+$ENV{'XSRCROOT'} = $XSRCROOT;
+$ENV{'SRCROOT'} = $XSRCROOT;
+
+# Make sure we don't have any leading or trailing quotes
+$ARGV[0] =~ s/^\"//;
+$ARGV[0] =~ s/\"$//;
+
+my $XDSTROOT = Cwd::realpath($ARGV[0]);
+$ENV{'XDSTROOT'} = $XDSTROOT;
+
+my $BUILD_PRODUCTS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]");
+$ENV{'BUILT_PRODUCTS_DIR'} = $BUILD_PRODUCTS_DIR;
+
+my $DERIVED_SOURCES_DIR = File::Spec->catdir($BUILD_PRODUCTS_DIR, 'JavaScriptCore', 'DerivedSources');
+unless (-d $DERIVED_SOURCES_DIR) {
+ make_path($DERIVED_SOURCES_DIR) or die "Couldn't create $DERIVED_SOURCES_DIR: $!";
+}
+
+chdir $DERIVED_SOURCES_DIR or die "Couldn't change directory to $DERIVED_SOURCES_DIR: $!";
+
+# Create a dummy asm file in case we are using the C backend
+# This is needed since LowLevelInterpreterWin.asm is part of the project.
+my $LowLevelInterpreterWin = File::Spec->catfile($DERIVED_SOURCES_DIR, 'LowLevelInterpreterWin.asm');
+
+open(OUTPUTFILENAME, '>', $LowLevelInterpreterWin) or die "Couldn't open $LowLevelInterpreterWin to write: $!";
+print OUTPUTFILENAME "END\n";
+close(OUTPUTFILENAME);
+
+# If you want to enable the LLINT C loop, set OUTPUTFILENAME to "LLIntAssembly.h"
+my $OUTPUTFILENAME = File::Spec->catfile($DERIVED_SOURCES_DIR, 'LowLevelInterpreterWin.asm');
+
+my $offlineAsm = File::Spec->catfile($XSRCROOT, 'offlineasm', 'asm.rb');
+my $lowLevelInterpreter = File::Spec->catfile($XSRCROOT, 'llint', 'LowLevelInterpreter.asm');
+my $offsetsExtractor = File::Spec->catfile($BUILD_PRODUCTS_DIR, 'LLIntOffsetsExtractor', "LLIntOffsetsExtractor$ARGV[2].exe");
+system('/usr/bin/env', 'ruby', $offlineAsm, '-I.', $lowLevelInterpreter, $offsetsExtractor, $OUTPUTFILENAME) and die "Failed to generate $OUTPUTFILENAME: $!";
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblybuildLLIntAssemblysh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-#!/usr/bin/bash
-
-SRCROOT="`pwd`/../../.."
-SRCROOT=`realpath "$SRCROOT"`
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-SRCROOT=`cygpath -m -s "$SRCROOT"`
-SRCROOT=`cygpath -u "$SRCROOT"`
-export SRCROOT
-
-XDSTROOT="$1"
-export XDSTROOT
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XDSTROOT=`cygpath -m -s "$XDSTROOT"`
-XDSTROOT=`cygpath -u "$XDSTROOT"`
-export XDSTROOT
-
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}"
-
-cd "${BUILT_PRODUCTS_DIR}/JavaScriptCore/DerivedSources"
-
-# Create a dummy asm file in case we are using the C backend
-# This is needed since LowLevelInterpreterWin.asm is part of the project.
-
-printf "END" > LowLevelInterpreterWin.asm
-
-# If you want to enable the LLINT C loop, set OUTPUTFILENAME to "LLIntAssembly.h"
-
-OUTPUTFILENAME="LowLevelInterpreterWin.asm"
-
-/usr/bin/env ruby "${SRCROOT}/offlineasm/asm.rb" "-I." "${SRCROOT}/llint/LowLevelInterpreter.asm" "${BUILT_PRODUCTS_DIR}/LLIntOffsetsExtractor/LLIntOffsetsExtractor${3}.exe" "${OUTPUTFILENAME}" || exit 1
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> all:
</span><span class="cx"> touch "%ConfigurationBuildDir%\buildfailed"
</span><del>- bash build-LLIntDesiredOffsets.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
</del><ins>+ perl build-LLIntDesiredOffsets.pl "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
</ins><span class="cx">
</span><span class="cx"> -del "%ConfigurationBuildDir%\buildfailed"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -260,10 +260,10 @@
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <None Include="build-LLIntDesiredOffsets.sh" />
</del><ins>+ <None Include="build-LLIntDesiredOffsets.pl" />
</ins><span class="cx"> <None Include="LLIntDesiredOffsets.make" />
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsbuildLLIntDesiredOffsetsplfromrev170922trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsbuildLLIntDesiredOffsetssh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.pl (from rev 170922, trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh) (0 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.pl (rev 0)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.pl 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# 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.
+# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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 Cwd;
+use File::Path qw(make_path);
+use File::Spec;
+
+my $PWD = Cwd::cwd();
+my $XSRCROOT = Cwd::realpath(File::Spec->catdir($PWD, '..', '..', '..'));
+$ENV{'XSRCROOT'} = $XSRCROOT;
+$ENV{'SRCROOT'} = $XSRCROOT;
+
+# Make sure we don't have any leading or trailing quotes
+$ARGV[0] =~ s/^\"//;
+$ARGV[0] =~ s/\"$//;
+
+my $XDSTROOT = Cwd::realpath($ARGV[0]);
+$ENV{'XDSTROOT'} = $XDSTROOT;
+
+my $BUILD_PRODUCTS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[2]", 'JavaScriptCore', 'DerivedSources');
+$ENV{'BUILT_PRODUCTS_DIR'} = $BUILD_PRODUCTS_DIR;
+
+##############################################################################
+# Step 1: Generate LLIntDesiredOffsets.h
+unless (-d $BUILD_PRODUCTS_DIR) {
+ make_path($BUILD_PRODUCTS_DIR) or die "Couldn't create $BUILD_PRODUCTS_DIR: $!";
+}
+
+my $generateOffsetExtractor = File::Spec->catfile($XSRCROOT, 'offlineasm', 'generate_offset_extractor.rb');
+my $lowLevelInterpreter = File::Spec->catfile($XSRCROOT, 'llint', 'LowLevelInterpreter.asm');
+my $OUTPUTFILENAME = File::Spec->catfile($BUILD_PRODUCTS_DIR, 'LLIntDesiredOffsets.h');
+system('/usr/bin/env', 'ruby', $generateOffsetExtractor, "-I$BUILD_PRODUCTS_DIR", $lowLevelInterpreter, $OUTPUTFILENAME) and die "Failed to generate $OUTPUTFILENAME: $!";
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsbuildLLIntDesiredOffsetssh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-#!/usr/bin/bash
-
-SRCROOT="`pwd`/../../.."
-SRCROOT=`realpath "$SRCROOT"`
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-SRCROOT=`cygpath -m -s "$SRCROOT"`
-SRCROOT=`cygpath -u "$SRCROOT"`
-export SRCROOT
-
-XDSTROOT="$1"
-export XDSTROOT
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XDSTROOT=`cygpath -m -s "$XDSTROOT"`
-XDSTROOT=`cygpath -u "$XDSTROOT"`
-export XDSTROOT
-
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore/DerivedSources"
-
-##############################################################################
-# Step 1: Generate LLIntDesiredOffsets.h
-mkdir -p "${BUILT_PRODUCTS_DIR}"
-
-/usr/bin/env ruby "${SRCROOT}/offlineasm/generate_offset_extractor.rb" "-I${BUILT_PRODUCTS_DIR}" "${SRCROOT}/llint/LowLevelInterpreter.asm" "${BUILT_PRODUCTS_DIR}/LLIntDesiredOffsets.h"
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojbuildgeneratedfilesplfromrev170922trunkSourceJavaScriptCoreJavaScriptCorevcxprojbuildgeneratedfilessh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.pl (from rev 170922, trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh) (0 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.pl (rev 0)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.pl 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# 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.
+# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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 Cwd;
+use File::Path qw(make_path);
+use File::Spec;
+
+# Not all build environments have the webkitdirs module installed.
+my $NUMCPUS = 2;
+eval "use webkitdirs";
+unless ($@) {
+ $NUMCPUS = numberOfCPUs();
+}
+
+my $PWD = Cwd::cwd();
+my $XSRCROOT = Cwd::realpath(File::Spec->updir);
+$ENV{'XSRCROOT'} = $XSRCROOT;
+$ENV{'SOURCE_ROOT'} = $XSRCROOT;
+
+# Make sure we don't have any leading or trailing quotes
+for (@ARGV) {
+ s/^\"//;
+ s/\"$//;
+}
+
+my $XDSTROOT = $ARGV[0];
+$ENV{'XDSTROOT'} = $XDSTROOT;
+
+my $SDKROOT = $ARGV[1];
+$ENV{'SDKROOT'} = $SDKROOT;
+
+my $BUILD_PRODUCTS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[2]", 'JavaScriptCore');
+$ENV{'BUILT_PRODUCTS_DIR'} = $BUILD_PRODUCTS_DIR;
+
+my $DERIVED_SOURCES_DIR = File::Spec->catdir($BUILD_PRODUCTS_DIR, 'DerivedSources');
+unless (-d $DERIVED_SOURCES_DIR) {
+ make_path($DERIVED_SOURCES_DIR) or die "Couldn't create $DERIVED_SOURCES_DIR: $!";
+}
+
+chdir $DERIVED_SOURCES_DIR or die "Couldn't change directory to $DERIVED_SOURCES_DIR: $!";
+
+$ENV{'JavaScriptCore'} = $XSRCROOT;
+$ENV{'DFTABLES_EXTENSION'} = '.exe';
+
+my $DERIVED_SOURCES_MAKEFILE = File::Spec->catfile($XSRCROOT, 'DerivedSources.make');
+
+system('/usr/bin/make', '-f', $DERIVED_SOURCES_MAKEFILE, '-j', $NUMCPUS) and die "Failed to build $DERIVED_SOURCES_MAKEFILE: $!";
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojbuildgeneratedfilessh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-#!/usr/bin/bash
-
-NUMCPUPATH="../../Tools/Scripts/num-cpus"
-if [ -x $NUMCPUPATH ]; then
- NUMCPUS=`$NUMCPUPATH`
-else
- NUMCPUS=8
-fi
-
-XSRCROOT="`pwd`/.."
-XSRCROOT=`realpath "$XSRCROOT"`
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XSRCROOT=`cygpath -m "$XSRCROOT"`
-XSRCROOT=`cygpath -u "$XSRCROOT"`
-export XSRCROOT
-export SOURCE_ROOT=$XSRCROOT
-XDSTROOT="$1"
-export XDSTROOT
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XDSTROOT=`cygpath -m -s "$XDSTROOT"`
-XDSTROOT=`cygpath -u "$XDSTROOT"`
-export XDSTROOT
-
-SDKROOT="$2"
-export SDKROOT
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-SDKROOT=`cygpath -m -s "$SDKROOT"`
-SDKROOT=`cygpath -u "$SDKROOT"`
-export SDKROOT
-
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore"
-
-mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
-cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
-
-export JavaScriptCore="${XSRCROOT}"
-export DFTABLES_EXTENSION=".exe"
-make -f "$JavaScriptCore/DerivedSources.make" -j ${NUMCPUS} || exit 1
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscjscPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WTF/ChangeLog 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-07-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ [Win] Remove uses of 'bash' in build system
+ https://bugs.webkit.org/show_bug.cgi?id=134782
+ <rdar://problem/17615533>
+
+ Reviewed by Dean Jackson.
+
+ Remove uses of 'bash' by replacing Windows-specific bash scripts
+ with Perl equivalents.
+
+ * WTF.vcxproj/WTFGenerated.make:
+ * WTF.vcxproj/WTFGenerated.vcxproj:
+ * WTF.vcxproj/WTFGenerated.vcxproj.filters:
+ * WTF.vcxproj/WTFPreBuild.cmd:
+ * WTF.vcxproj/build-generated-files.pl: Copied from Source/WTF/WTF.vcxproj/build-generated-files.sh.
+ * WTF.vcxproj/build-generated-files.sh: Removed.
+
+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Remove use of 'grep' in build steps
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134770
</span><span class="cx"> <rdar://problem/17608783>
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFGeneratedmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> all: WTFHeaderDetection.h
</span><span class="cx"> touch "%ConfigurationBuildDir%\buildfailed"
</span><del>- bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
</del><ins>+ perl build-generated-files.pl "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
</ins><span class="cx"> !IF "$(OFFICIAL_BUILD)"!="1"
</span><del>- bash -c "/usr/bin/python work-around-vs-dependency-tracking-bugs.py"
</del><ins>+ python work-around-vs-dependency-tracking-bugs.py
</ins><span class="cx"> !ENDIF
</span><span class="cx"> copy-files.cmd
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> </ProjectConfiguration>
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <None Include="build-generated-files.sh" />
</del><ins>+ <None Include="build-generated-files.pl" />
</ins><span class="cx"> <None Include="copy-files.cmd" />
</span><span class="cx"> <None Include="work-around-vs-dependency-tracking-bugs.py" />
</span><span class="cx"> <None Include="WTFGenerated.make" />
</span><span class="lines">@@ -250,4 +250,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFGeneratedvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj.filters (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj.filters 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj.filters 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup>
</span><del>- <None Include="build-generated-files.sh" />
</del><span class="cx"> <None Include="copy-files.cmd" />
</span><span class="cx"> <None Include="work-around-vs-dependency-tracking-bugs.py" />
</span><span class="cx"> <None Include="WTFGenerated.make" />
</span><ins>+ <None Include="build-generated-files.pl" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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="trunkSourceWTFWTFvcxprojbuildgeneratedfilesplfromrev170922trunkSourceWTFWTFvcxprojbuildgeneratedfilessh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WTF/WTF.vcxproj/build-generated-files.pl (from rev 170922, trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh) (0 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/build-generated-files.pl (rev 0)
+++ trunk/Source/WTF/WTF.vcxproj/build-generated-files.pl 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
+#
+# 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.
+# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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 File::Path qw(make_path);
+use File::Spec;
+use File::stat;
+
+# Make sure we don't have any leading or trailing quotes
+for (@ARGV) {
+ s/^\"//;
+ s/\"$//;
+}
+
+# Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
+my $UNVERSIONED_ICU_LIB_PATH = File::Spec->catfile($ARGV[1], "lib$ARGV[3]", "libicuuc$ARGV[2].lib");
+my $PRIVATE_INCLUDE = File::Spec->catdir($ARGV[0], 'include', 'private');
+my $ICUVERSION_H_PATH = File::Spec->catfile($PRIVATE_INCLUDE, 'ICUVersion.h');
+if ((! -f $ICUVERSION_H_PATH) or (-f $UNVERSIONED_ICU_LIB_PATH and (stat($UNVERSIONED_ICU_LIB_PATH)->mtime > stat($ICUVERSION_H_PATH)->mtime))) {
+ unless (-d $PRIVATE_INCLUDE) {
+ make_path($PRIVATE_INCLUDE) or die "Couldn't create $PRIVATE_INCLUDE: $!";
+ }
+
+ my $disableRenaming = (-f $UNVERSIONED_ICU_LIB_PATH) ? 1 : 0;
+ open(ICU_VERSION_FILE, '>', $ICUVERSION_H_PATH) or die "Unable to open $ICUVERSION_H_PATH: $!";
+ print ICU_VERSION_FILE "#define U_DISABLE_RENAMING $disableRenaming\n";
+ close(ICU_VERSION_FILE);
+}
</ins></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojbuildgeneratedfilessh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-#!/usr/bin/bash
-
-# Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
-UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${2}/lib${4}/libicuuc${3}.lib")
-ICUVERSION_H_PATH=$(cygpath -u "${1}/include/private/ICUVersion.h")
-if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \)
-then
- mkdir -p "$(dirname "${ICUVERSION_H_PATH}")"
- echo "Checking ${UNVERSIONED_ICU_LIB_PATH}"
- test ! -f "${UNVERSIONED_ICU_LIB_PATH}"
- echo "#define U_DISABLE_RENAMING $?" > "${ICUVERSION_H_PATH}"
-fi
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebCore/ChangeLog 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove uses of 'bash' in build system
+ https://bugs.webkit.org/show_bug.cgi?id=134782
+ <rdar://problem/17615533>
+
+ Reviewed by Dean Jackson.
+
+ Remove uses of 'bash' by replacing Windows-specific bash scripts
+ with Perl equivalents.
+
+ * WebCore.vcxproj/WebCoreGenerated.make:
+ * WebCore.vcxproj/WebCoreGenerated.vcxproj:
+ * WebCore.vcxproj/WebCoreGenerated.vcxproj.filters:
+ * WebCore.vcxproj/WebCorePreBuild.cmd:
+ * WebCore.vcxproj/build-generated-files.pl: Copied from Source/WebCore/WebCore.vcxproj/build-generated-files.sh.
+ * WebCore.vcxproj/build-generated-files.sh: Removed.
+ * WebCore.vcxproj/migrate-scripts.pl: Copied from Source/WebCore/WebCore.vcxproj/migrate-scripts.sh.
+ * WebCore.vcxproj/migrate-scripts.sh: Removed.
+
</ins><span class="cx"> 2014-07-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Support transparent WKWebViews
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> make:
</span><del>- if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XXWebCoreGeneratedXX/) { print } else { exit 1 }" "%ConfigurationBuildDir%\buildfailed"
</del><ins>+ if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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><del>- bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"
- bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
</del><ins>+ perl build-generated-files.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"
+ perl migrate-scripts.pl "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
</ins><span class="cx"> cmd /C copyForwardingHeaders.cmd cg cf
</span><span class="cx"> cmd /C copyWebCoreResourceFiles.cmd
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\DerivedSources.make" />
</span><del>- <None Include="build-generated-files.sh" />
</del><ins>+ <None Include="build-generated-files.pl" />
</ins><span class="cx"> <None Include="copyForwardingHeaders.cmd" />
</span><span class="cx"> <None Include="copyWebCoreResourceFiles.cmd" />
</span><del>- <None Include="migrate-scripts.sh" />
</del><ins>+ <None Include="migrate-scripts.pl" />
</ins><span class="cx"> <None Include="MigrateScripts" />
</span><span class="cx"> <None Include="WebCoreGenerated.make" />
</span><span class="cx"> </ItemGroup>
</span><span class="lines">@@ -201,4 +201,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj.filters (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj.filters 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj.filters 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup>
</span><del>- <None Include="build-generated-files.sh" />
</del><span class="cx"> <None Include="copyForwardingHeaders.cmd" />
</span><span class="cx"> <None Include="copyWebCoreResourceFiles.cmd" />
</span><span class="cx"> <None Include="MigrateScripts" />
</span><del>- <None Include="migrate-scripts.sh" />
</del><span class="cx"> <None Include="WebCoreGenerated.make" />
</span><span class="cx"> <None Include="..\DerivedSources.make" />
</span><ins>+ <None Include="build-generated-files.pl" />
+ <None Include="migrate-scripts.pl" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorePreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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="trunkSourceWebCoreWebCorevcxprojbuildgeneratedfilesplfromrev170922trunkSourceWebCoreWebCorevcxprojbuildgeneratedfilessh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl (from rev 170922, trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh) (0 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl (rev 0)
+++ trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
+#
+# 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.
+# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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 Cwd;
+use File::Path qw(make_path);
+use File::Spec;
+
+# Not all build environments have the webkitdirs module installed.
+my $NUMCPUS = 2;
+eval "use webkitdirs";
+unless ($@) {
+ $NUMCPUS = numberOfCPUs();
+}
+
+my $PWD = Cwd::cwd();
+my $XSRCROOT = Cwd::realpath(File::Spec->updir);
+$ENV{'XSRCROOT'} = $XSRCROOT;
+$ENV{'SOURCE_ROOT'} = $XSRCROOT;
+
+# Make sure we don't have any leading or trailing quotes
+for (@ARGV) {
+ s/^\"//;
+ s/\"$//;
+}
+
+my $XDSTROOT = Cwd::realpath($ARGV[0]);
+$ENV{'XDSTROOT'} = $XDSTROOT;
+
+my $SDKROOT = Cwd::realpath($ARGV[1]);
+$ENV{'SDKROOT'} = $SDKROOT;
+
+my $BUILD_PRODUCTS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebCore');
+$ENV{'BUILT_PRODUCTS_DIR'} = $BUILD_PRODUCTS_DIR;
+
+my $DERIVED_SOURCES_DIR = File::Spec->catdir($BUILD_PRODUCTS_DIR, 'DerivedSources');
+unless (-d $DERIVED_SOURCES_DIR) {
+ make_path($DERIVED_SOURCES_DIR) or die "Couldn't create $DERIVED_SOURCES_DIR: $!";
+}
+
+chdir $DERIVED_SOURCES_DIR or die "Couldn't change directory to $DERIVED_SOURCES_DIR: $!";
+
+$ENV{'WebCore'} = $XSRCROOT;
+
+my $featureDefinesCommand = File::Spec->catfile($SDKROOT, 'tools', 'scripts', 'feature-defines.pl');
+my $featureDefines = `$featureDefinesCommand $SDKROOT $ARGV[2]`;
+chomp($featureDefines);
+$ENV{'FEATURE_DEFINES'} = $featureDefines;
+$ENV{'InspectorScripts'} = File::Spec->catdir($XDSTROOT, 'include', 'private', 'JavaScriptCore');
+$ENV{'WebReplayScripts'} = File::Spec->catdir($XDSTROOT, 'include', 'private', 'JavaScriptCore');
+
+my $DERIVED_SOURCES_MAKEFILE = File::Spec->catfile($XSRCROOT, 'DerivedSources.make');
+system('/usr/bin/make', '-f', $DERIVED_SOURCES_MAKEFILE, '-j', $NUMCPUS) and die "Failed to build $DERIVED_SOURCES_MAKEFILE: $!";
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojbuildgeneratedfilessh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-#!/usr/bin/bash
-
-# Copyright (C) 2007 Apple Inc. All rights reserved.
-#
-# 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.
-# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
-
-NUMCPUPATH="../../Tools/Scripts/num-cpus"
-if [ -x $NUMCPUPATH ]; then
- NUMCPUS=`$NUMCPUPATH`
-else
- NUMCPUS=8
-fi
-
-XSRCROOT="`pwd`/.."
-XSRCROOT=`realpath "$XSRCROOT"`
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XSRCROOT=`cygpath -m -s "$XSRCROOT"`
-XSRCROOT=`cygpath -u "$XSRCROOT"`
-export XSRCROOT
-export SOURCE_ROOT=$XSRCROOT
-
-XDSTROOT="$1"
-export XDSTROOT
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XDSTROOT=`cygpath -m -s "$XDSTROOT"`
-XDSTROOT=`cygpath -u "$XDSTROOT"`
-export XDSTROOT
-
-SDKROOT="$2"
-export SDKROOT
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-SDKROOT=`cygpath -m -s "$SDKROOT"`
-SDKROOT=`cygpath -u "$SDKROOT"`
-export SDKROOT
-
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}/WebCore"
-
-mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
-cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
-
-export WebCore="${XSRCROOT}"
-export FEATURE_DEFINES=`$SDKROOT/tools/scripts/feature-defines.sh $SDKROOT $3`
-export InspectorScripts="$XDSTROOT/include/private/JavaScriptCore"
-export WebReplayScripts="$XDSTROOT/include/private/JavaScriptCore"
-
-make -f "$WebCore/DerivedSources.make" -j ${NUMCPUS} || exit 1
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojmigratescriptsplfromrev170922trunkSourceWebCoreWebCorevcxprojmigratescriptssh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/WebCore.vcxproj/migrate-scripts.pl (from rev 170922, trunk/Source/WebCore/WebCore.vcxproj/migrate-scripts.sh) (0 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/migrate-scripts.pl (rev 0)
+++ trunk/Source/WebCore/WebCore.vcxproj/migrate-scripts.pl 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2007, 2008, 2009, 2010, 2014 Apple Inc. All rights reserved.
+#
+# 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.
+# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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 Cwd;
+use File::Path qw(make_path);
+use File::Spec;
+
+# Not all build environments have the webkitdirs module installed.
+my $NUMCPUS = 2;
+eval "use webkitdirs";
+unless ($@) {
+ $NUMCPUS = numberOfCPUs();
+}
+
+# Make sure we don't have any leading or trailing quotes
+$ARGV[0] =~ s/^\"//;
+$ARGV[0] =~ s/\"$//;
+
+my $MIGRATION_DIR = File::Spec->canonpath($ARGV[0]);
+unless (-d $MIGRATION_DIR) {
+ make_path($MIGRATION_DIR) or die "Couldn't create $MIGRATION_DIR: $!";
+}
+$MIGRATION_DIR = Cwd::realpath($MIGRATION_DIR);
+
+my $PWD = Cwd::cwd();
+my $XSRCROOT = Cwd::realpath(File::Spec->updir);
+$ENV{'XSRCROOT'} = $XSRCROOT;
+$ENV{'SOURCE_ROOT'} = $XSRCROOT;
+
+my $XDSTROOT = Cwd::realpath($ARGV[0]);
+$ENV{'XDSTROOT'} = $XDSTROOT;
+
+$ENV{'WEBCORE'} = $XSRCROOT;
+$ENV{'WebCore'} = $XSRCROOT;
+$ENV{'WEBKIT_OUTPUT'} = $XDSTROOT;
+
+my $MIGRATE_SCRIPTS_MAKEFILE = File::Spec->catfile($XSRCROOT, 'WebCore.vcxproj', 'MigrateScripts');
+system('/usr/bin/make', '-f', $MIGRATE_SCRIPTS_MAKEFILE, '-j', $NUMCPUS) and die "Failed to build $MIGRATE_SCRIPTS_MAKEFILE: $!";
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojmigratescriptssh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/WebCore.vcxproj/migrate-scripts.sh (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/migrate-scripts.sh 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebCore/WebCore.vcxproj/migrate-scripts.sh 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-#!/usr/bin/bash
-
-# Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
-#
-# 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.
-# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
-
-NUMCPUPATH="../../Tools/Scripts/num-cpus"
-if [ -x $NUMCPUPATH ]; then
- NUMCPUS=`$NUMCPUPATH`
-else
- NUMCPUS=1
-fi
-
-mkdir -p "$1"
-
-XSRCROOT="`pwd`/.."
-XSRCROOT=`realpath "$XSRCROOT"`
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XSRCROOT=`cygpath -m -s "$XSRCROOT"`
-XSRCROOT=`cygpath -u "$XSRCROOT"`
-export XSRCROOT
-export SOURCE_ROOT=$XSRCROOT
-
-XDSTROOT="$1"
-export XDSTROOT
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XDSTROOT=`cygpath -m -s "$XDSTROOT"`
-XDSTROOT=`cygpath -u "$XDSTROOT"`
-export XDSTROOT
-
-export WEBCORE=$XSRCROOT
-export WEBKIT_OUTPUT=$XDSTROOT
-
-make -f "$WEBCORE/WebCore.vcxproj/MigrateScripts" -j ${NUMCPUS} || exit 1
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove uses of 'bash' in build system
+ https://bugs.webkit.org/show_bug.cgi?id=134782
+ <rdar://problem/17615533>
+
+ Reviewed by Dean Jackson.
+
+ Remove uses of 'bash' by replacing Windows-specific bash scripts
+ with Perl equivalents.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.make:
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
+ * WebInspectorUI.vcxproj/build-webinspectorui.pl: Copied from Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh.
+ * WebInspectorUI.vcxproj/build-webinspectorui.sh: Removed.
+
</ins><span class="cx"> 2014-07-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Debugger popovers should not dismiss when mousing over them
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><span class="cx"> make:
</span><del>- bash build-webinspectorui.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"
</del><ins>+ perl build-webinspectorui.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx">
</span><del>- xcopy /y /e "..\Localizations\en.lproj\*" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
</del><ins>+ xcopy /y /e "..\Localizations\en.lproj\*" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
</ins><span class="cx"> if errorlevel 1 exit 1
</span><span class="cx">
</span><del>- if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+ if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
</ins><span class="cx">
</span><span class="cx"> clean:
</span><span class="cx"> if exist "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI" del /s /q "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -778,7 +778,7 @@
</span><span class="cx"> <None Include="..\UserInterface\TreeOutline.js" />
</span><span class="cx"> <None Include="..\UserInterface\Utilities.js" />
</span><span class="cx"> <None Include="..\UserInterface\WebInspector.js" />
</span><del>- <None Include="build-webinspectorui.sh" />
</del><ins>+ <None Include="build-webinspectorui.pl" />
</ins><span class="cx"> <None Include="WebInspectorUI.make" />
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1720,6 +1720,6 @@
</span><span class="cx"> <Filter>Scripts</Filter>
</span><span class="cx"> </None>
</span><span class="cx"> <None Include="WebInspectorUI.make" />
</span><del>- <None Include="build-webinspectorui.sh" />
</del><ins>+ <None Include="build-webinspectorui.pl" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruiplfromrev170922trunkSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruish"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl (from rev 170922, trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh) (0 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl (rev 0)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# 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.
+# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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 Cwd;
+use File::Path qw(make_path);
+use File::Spec;
+
+my $PWD = Cwd::cwd();
+my $XSRCROOT = Cwd::realpath(File::Spec->updir);
+$ENV{'XSRCROOT'} = $XSRCROOT;
+$ENV{'SRCROOT'} = $XSRCROOT;
+
+# Make sure we don't have any leading or trailing quotes
+$ARGV[0] =~ s/^\"//;
+$ARGV[0] =~ s/\"$//;
+
+my $XDSTROOT = Cwd::realpath($ARGV[0]);
+$ENV{'XDSTROOT'} = $XDSTROOT;
+
+my $TARGET_BUILD_DIR = File::Spec->catdir($XDSTROOT, "bin$ARGV[3]", 'WebKit.resources');
+$ENV{'TARGET_BUILD_DIR'} = $TARGET_BUILD_DIR;
+my $JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'JavaScriptCore', 'DerivedSources');
+$ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'} = $JAVASCRIPTCORE_PRIVATE_HEADERS_DIR;
+my $WEBCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebCore', 'DerivedSources');
+$ENV{'WEBCORE_PRIVATE_HEADERS_DIR'} = $WEBCORE_PRIVATE_HEADERS_DIR;
+my $DERIVED_SOURCES_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebInspectorUI', 'DerivedSources');
+$ENV{'DERIVED_SOURCES_DIR'} = $DERIVED_SOURCES_DIR;
+
+$ENV{'UNLOCALIZED_RESOURCES_FOLDER_PATH'} = 'WebInspectorUI';
+
+if (($TARGET_BUILD_DIR =~ /Release/) || ($TARGET_BUILD_DIR =~ /Production/)) {
+ $ENV{'COMBINE_INSPECTOR_RESOURCES'} = 'YES';
+}
+
+my $copyResourcesCommand = File::Spec->catfile($XSRCROOT, 'Scripts', 'copy-user-interface-resources.pl');
+do $copyResourcesCommand;
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruish"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-#!/usr/bin/bash
-
-# Copyright (C) 2014 Apple Inc. All rights reserved.
-#
-# 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.
-# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
-
-XSRCROOT="`pwd`/.."
-XSRCROOT=`realpath "$XSRCROOT"`
-export XSRCROOT
-export SRCROOT=$XSRCROOT
-
-XDSTROOT="$1"
-export XDSTROOT
-
-export TARGET_BUILD_DIR="$XDSTROOT/bin${4}/WebKit.resources"
-export JAVASCRIPTCORE_PRIVATE_HEADERS_DIR="$XDSTROOT/obj${4}/JavaScriptCore/DerivedSources"
-export WEBCORE_PRIVATE_HEADERS_DIR="$XDSTROOT/obj${4}/WebCore/DerivedSources"
-export DERIVED_SOURCES_DIR="$XDSTROOT/obj${4}/WebInspectorUI/DerivedSources"
-
-export UNLOCALIZED_RESOURCES_FOLDER_PATH="WebInspectorUI"
-
-if [[ ${TARGET_BUILD_DIR} =~ "Release" ]] || [[ ${TARGET_BUILD_DIR} =~ "Production" ]]; then
- export COMBINE_INSPECTOR_RESOURCES="YES";
-fi
-
-/usr/bin/perl "${SRCROOT}/Scripts/copy-user-interface-resources.pl"
</del></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebKit/ChangeLog 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-07-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ [Win] Remove uses of 'bash' in build system
+ https://bugs.webkit.org/show_bug.cgi?id=134782
+ <rdar://problem/17615533>
+
+ Reviewed by Dean Jackson.
+
+ Remove uses of 'bash' by replacing Windows-specific bash scripts
+ with Perl equivalents.
+
+ * WebKit.vcxproj/Interfaces/FixMIDLHeaders.pl:
+ * WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
+ * WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:
+ * WebKit.vcxproj/WebKit/WebKitVersion.cmd:
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd:
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:
+ * WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd:
+
+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Remove use of 'grep' in build steps
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134770
</span><span class="cx"> <rdar://problem/17608783>
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojInterfacesFixMIDLHeaderspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/FixMIDLHeaders.pl (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/FixMIDLHeaders.pl 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/FixMIDLHeaders.pl 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #! /usr/bin/perl -w
</span><span class="cx">
</span><del>-# Copyright (C) 2007 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -34,6 +34,10 @@
</span><span class="cx"> use strict;
</span><span class="cx"> use warnings;
</span><span class="cx">
</span><ins>+# Make sure we don't have any leading or trailing quotes
+$ARGV[0] =~ s/^\"//;
+$ARGV[0] =~ s/\"$//;
+
</ins><span class="cx"> my $dir = $ARGV[0];
</span><span class="cx">
</span><span class="cx"> $dir = `cygpath -u '$dir'`;
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojInterfacesInterfacesPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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="trunkSourceWebKitWebKitvcxprojWebKitWebKitVersioncmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -4,4 +4,4 @@
</span><span class="cx"> set WEBKITVERSIONFILE=%WEBKITVERSIONDIR%\WebKitVersion.h
</span><span class="cx"> set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx">
</span><del>-bash -c '/usr/bin/perl "%WEBKITVERSIONSCRIPT%" --config "%WEBKITVERSIONCONFIG%" --outputDir "%WEBKITVERSIONDIR%"'
</del><ins>+perl "%WEBKITVERSIONSCRIPT%" --config "%WEBKITVERSIONCONFIG%" --outputDir "%WEBKITVERSIONDIR%"
</ins></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportGeneratorBuildCmdcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-%SystemDrive%\cygwin\bin\which.exe bash
</del><ins>+%SystemDrive%\cygwin\bin\which.exe ruby
</ins><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><span class="cx">
</span><span class="lines">@@ -6,4 +6,4 @@
</span><span class="cx">
</span><span class="cx"> echo Generating export definitions
</span><span class="cx"> del /F /Q "%GeneratorDirectory%/DerivedSources/WebKitExportGenerator.cpp"
</span><del>-bash -c "./make-export-file-generator ./WebKitExports.def.in '%GeneratorDirectory%/DerivedSources/WebKitExportGenerator.cpp'"
</del><ins>+ruby ./make-export-file-generator ./WebKitExports.def.in '%GeneratorDirectory%/DerivedSources/WebKitExportGenerator.cpp'
</ins></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportGeneratorPreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</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" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Tools/ChangeLog 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-07-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ [Win] Remove uses of 'bash' in build system
+ https://bugs.webkit.org/show_bug.cgi?id=134782
+ <rdar://problem/17615533>
+
+ Reviewed by Dean Jackson.
+
+ Remove uses of 'bash' by replacing Windows-specific bash scripts
+ with Perl equivalents.
+
+ * 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:
+
+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Remove use of 'grep' in build steps
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134770
</span><span class="cx"> <rdar://problem/17608783>
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreePreBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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 (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> %SystemDrive%\cygwin\bin\which.exe perl
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><span class="cx"> cmd /c
</span><del>-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
</del><ins>+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "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="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/WebKitLibraries/ChangeLog 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-07-09 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove uses of 'bash' in build system
+ https://bugs.webkit.org/show_bug.cgi?id=134782
+ <rdar://problem/17615533>
+
+ Reviewed by Dean Jackson.
+
+ Remove uses of 'bash' by replacing Windows-specific bash scripts
+ with Perl equivalents.
+
+ * win/tools/scripts/feature-defines.pl: Copied from WebKitLibraries/win/tools/scripts/feature-defines.sh.
+ * win/tools/scripts/feature-defines.sh: Removed.
+
</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="trunkWebKitLibrarieswintoolsscriptsfeaturedefinesplfromrev170922trunkWebKitLibrarieswintoolsscriptsfeaturedefinessh"></a>
<div class="copfile"><h4>Copied: trunk/WebKitLibraries/win/tools/scripts/feature-defines.pl (from rev 170922, trunk/WebKitLibraries/win/tools/scripts/feature-defines.sh) (0 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/scripts/feature-defines.pl (rev 0)
+++ trunk/WebKitLibraries/win/tools/scripts/feature-defines.pl 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2013-2014 Apple Inc. All rights reserved.
+#
+# 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
+
+# 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 File::Spec;
+
+my $FeatureDefines = ($ARGV[1] eq 'cairo') ? 'FeatureDefinesCairo.props' : 'FeatureDefines.props';
+my $FeatureDefinesFile = File::Spec->catfile($ARGV[0], 'tools', 'vsprops', $FeatureDefines);
+
+open(FEATURE_DEFINES, '<', $FeatureDefinesFile) or die "Unable to open $FeatureDefinesFile: $!";
+my @lines = <FEATURE_DEFINES>;
+close(FEATURE_DEFINES);
+
+my @enabled = grep(/<ENABLE_/, @lines);
+@enabled = grep(!/\/>/, @enabled);
+for (@enabled) {
+ s/<\/.*>//;
+ s/<.*>//;
+ s/^\s+//;
+ s/\s+$//;
+ chomp();
+}
+
+my $result = join(' ', @enabled);
+
+print "$result";
</ins></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsscriptsfeaturedefinessh"></a>
<div class="delfile"><h4>Deleted: trunk/WebKitLibraries/win/tools/scripts/feature-defines.sh (170936 => 170937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/scripts/feature-defines.sh 2014-07-09 22:33:57 UTC (rev 170936)
+++ trunk/WebKitLibraries/win/tools/scripts/feature-defines.sh 2014-07-09 23:48:26 UTC (rev 170937)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-#!/usr/bin/bash
-
-# Copyright (C) 2013 Apple Inc. All rights reserved.
-#
-# 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.
-
-if [ "$2" = "cairo" ]; then
- FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.props
-else
- FeatureDefines=$1/tools/vsprops/FeatureDefines.props
-fi
-
-grep "<ENABLE_" $FeatureDefines | sed '/\/>/d' | sed 's/<\/.*>//' | sed 's/<.*>//' | tr -d '\n'
-
</del></span></pre>
</div>
</div>
</body>
</html>