<!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>[280597] branches/safari-612.1.15.4-branch/Source</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/280597">280597</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-08-03 09:50:38 -0700 (Tue, 03 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Speculative build fix. rdar://79147214.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6121154branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreproj">branches/safari-612.1.15.4-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj</a></li>
<li><a href="#branchessafari6121154branchSourceMakefile">branches/safari-612.1.15.4-branch/Source/Makefile</a></li>
<li><a href="#branchessafari6121154branchSourceWTFWTFvcxprojWTFproj">branches/safari-612.1.15.4-branch/Source/WTF/WTF.vcxproj/WTF.proj</a></li>
<li><a href="#branchessafari6121154branchSourceWebCoreWebCorevcxprojWebCoreproj">branches/safari-612.1.15.4-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj</a></li>
<li><a href="#branchessafari6121154branchSourceWebKitLegacyWebKitLegacyvcxprojWebKitLegacyproj">branches/safari-612.1.15.4-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj</a></li>
<li><a href="#branchessafari6121154branchSourcecmakeWinToolsmake">branches/safari-612.1.15.4-branch/Source/cmake/WinTools.make</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6121154branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreproj"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.4-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj (280596 => 280597)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.4-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj       2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj  2021-08-03 16:50:38 UTC (rev 280597)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx">     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</span><span class="cx">     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
</span><span class="cx">     <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><del>-       <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
</del><ins>+    <SourceSubdirectory>\Source\JavaScriptCore</SourceSubdirectory>
+       <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
</ins><span class="cx">   </PropertyGroup>
</span><span class="cx">  
</span><span class="cx">   <!-- Prepare for build -->
</span><span class="lines">@@ -74,7 +75,7 @@
</span><span class="cx">     <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\JavaScriptCore\inspector\**\*.*">
</span><span class="cx">       <Output TaskParameter="Include" ItemName="InspectorFiles" />
</span><span class="cx">     </CreateItem>
</span><del>-    <CreateItem Include="$(SRCROOT)\API\*.h">
</del><ins>+    <CreateItem Include="$(SRCROOT)$(SourceSubdirectory)\API\*.h">
</ins><span class="cx">       <Output TaskParameter="Include" ItemName="APIFiles" />
</span><span class="cx">     </CreateItem>
</span><span class="cx">     <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
</span></span></pre></div>
<a id="branchessafari6121154branchSourceMakefile"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.4-branch/Source/Makefile (280596 => 280597)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.4-branch/Source/Makefile        2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/Makefile   2021-08-03 16:50:38 UTC (rev 280597)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+SAFARITOOLS_MODULE =
</ins><span class="cx"> WEBINSPECTORUI_MODULE =
</span><span class="cx"> 
</span><span class="cx"> TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
</span><span class="lines">@@ -10,6 +11,9 @@
</span><span class="cx">          WEBINSPECTORUI_MODULE = WebInspectorUI
</span><span class="cx">  endif
</span><span class="cx"> else
</span><ins>+       ifeq ($(MAKECMDGOALS),installsrc)
+               SAFARITOOLS_MODULE = cmake
+       endif
</ins><span class="cx">   WEBINSPECTORUI_MODULE = WebInspectorUI
</span><span class="cx"> endif
</span><span class="cx"> 
</span><span class="lines">@@ -17,7 +21,7 @@
</span><span class="cx">  WEBINSPECTORUI_MODULE =
</span><span class="cx"> endif
</span><span class="cx"> 
</span><del>-MODULES = bmalloc WTF JavaScriptCore ThirdParty WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit
</del><ins>+MODULES = $(SAFARITOOLS_MODULE) bmalloc WTF JavaScriptCore ThirdParty WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit $(SAFARITOOLS_MODULE)
</ins><span class="cx"> 
</span><span class="cx"> define build_target_for_each_module
</span><span class="cx">  for dir in $(MODULES); do \
</span></span></pre></div>
<a id="branchessafari6121154branchSourceWTFWTFvcxprojWTFproj"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.4-branch/Source/WTF/WTF.vcxproj/WTF.proj (280596 => 280597)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.4-branch/Source/WTF/WTF.vcxproj/WTF.proj        2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/WTF/WTF.vcxproj/WTF.proj   2021-08-03 16:50:38 UTC (rev 280597)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx">     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</span><span class="cx">     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</span><span class="cx">     <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><del>-       <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWTF_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
</del><ins>+    <SourceSubdirectory>\Source\WTF</SourceSubdirectory>
+       <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWTF_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
</ins><span class="cx">   </PropertyGroup>
</span><span class="cx"> 
</span><span class="cx">   <!-- Prepare for build -->
</span></span></pre></div>
<a id="branchessafari6121154branchSourceWebCoreWebCorevcxprojWebCoreproj"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.4-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj (280596 => 280597)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.4-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj    2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj       2021-08-03 16:50:38 UTC (rev 280597)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx">     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</span><span class="cx">     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
</span><span class="cx">     <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><del>-       <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/')) -DPAL_DIR=$(SRCROOT.Replace('\','/'))/PAL</CMakeCommandCommon>
</del><ins>+    <SourceSubdirectory>\Source\WebCore</SourceSubdirectory>
+       <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/')) -DPAL_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))/PAL</CMakeCommandCommon>
</ins><span class="cx">   </PropertyGroup>
</span><span class="cx">  
</span><span class="cx">   <!-- Prepare for build -->
</span></span></pre></div>
<a id="branchessafari6121154branchSourceWebKitLegacyWebKitLegacyvcxprojWebKitLegacyproj"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.4-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (280596 => 280597)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.4-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj     2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj        2021-08-03 16:50:38 UTC (rev 280597)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx">     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</span><span class="cx">     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
</span><span class="cx">     <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><del>-       <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
</del><ins>+    <SourceSubdirectory>\Source\WebKitLegacy</SourceSubdirectory>
+       <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
</ins><span class="cx">   </PropertyGroup>
</span><span class="cx">  
</span><span class="cx">   <!-- Prepare for build -->
</span></span></pre></div>
<a id="branchessafari6121154branchSourcecmakeWinToolsmake"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.15.4-branch/Source/cmake/WinTools.make (280596 => 280597)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.15.4-branch/Source/cmake/WinTools.make     2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/cmake/WinTools.make        2021-08-03 16:50:38 UTC (rev 280597)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> install:
</span><del>-    xcopy "$(SRCROOT)\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
-    xcopy "$(SRCROOT)\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
-    xcopy "$(SRCROOT)\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
</del><ins>+    xcopy "$(SRCROOT)\Source\cmake\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
+    xcopy "$(SRCROOT)\Source\cmake\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
+    xcopy "$(SRCROOT)\Source\cmake\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
</ins></span></pre>
</div>
</div>

</body>
</html>