<!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>[173327] trunk/Source/JavaScriptCore</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/173327">173327</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-05 12:42:08 -0700 (Fri, 05 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] jsc.exe won't run.
https://bugs.webkit.org/show_bug.cgi?id=136481
Patch by peavo@outlook.com <peavo@outlook.com> on 2014-09-05
Reviewed by Alex Christensen.
We need to define WIN_CAIRO to avoid looking for the AAS folder.
* JavaScriptCore.vcxproj/jsc/DLLLauncherWinCairo.props: Added.
* JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj:
* JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj:
* JavaScriptCore.vcxproj/testapi/testapiCommonCFLite.props:
* JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscjscLaunchervcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpLaunchervcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapiCommonCFLiteprops">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiCommonCFLite.props</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapiLaunchervcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscDLLLauncherWinCairoprops">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/DLLLauncherWinCairo.props</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173326 => 173327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-05 19:42:08 UTC (rev 173327)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-05 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] jsc.exe won't run.
+ https://bugs.webkit.org/show_bug.cgi?id=136481
+
+ Reviewed by Alex Christensen.
+
+ We need to define WIN_CAIRO to avoid looking for the AAS folder.
+
+ * JavaScriptCore.vcxproj/jsc/DLLLauncherWinCairo.props: Added.
+ * JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj:
+ * JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj:
+ * JavaScriptCore.vcxproj/testapi/testapiCommonCFLite.props:
+ * JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj:
+
</ins><span class="cx"> 2014-09-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> JavaScriptCore should build with newer clang
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscDLLLauncherWinCairoprops"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/DLLLauncherWinCairo.props (0 => 173327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/DLLLauncherWinCairo.props (rev 0)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/DLLLauncherWinCairo.props 2014-09-05 19:42:08 UTC (rev 173327)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>WIN_CAIRO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscjscLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj (173326 => 173327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj 2014-09-05 19:42:08 UTC (rev 173327)
</span><span class="lines">@@ -131,10 +131,12 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="jscRelease.props" />
</span><ins>+ <Import Project="DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="jscRelease.props" />
</span><ins>+ <Import Project="DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="lines">@@ -155,10 +157,12 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="jscDebug.props" />
</span><ins>+ <Import Project="DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="jscDebug.props" />
</span><ins>+ <Import Project="DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj (173326 => 173327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj 2014-09-05 19:42:08 UTC (rev 173327)
</span><span class="lines">@@ -131,10 +131,12 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="testRegExpRelease.props" />
</span><ins>+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="testRegExpRelease.props" />
</span><ins>+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="lines">@@ -155,10 +157,12 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="testRegExpDebug.props" />
</span><ins>+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="testRegExpDebug.props" />
</span><ins>+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapiCommonCFLiteprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiCommonCFLite.props (173326 => 173327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiCommonCFLite.props 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiCommonCFLite.props 2014-09-05 19:42:08 UTC (rev 173327)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> <SubSystem>Console</SubSystem>
</span><span class="cx"> </Link>
</span><span class="cx"> <ClCompile>
</span><del>- <PreprocessorDefinitions>WIN_CAIRO;NOMINMAX;USE_CONSOLE_ENTRY_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</del><ins>+ <PreprocessorDefinitions>NOMINMAX;USE_CONSOLE_ENTRY_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ins><span class="cx"> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\API;$(ConfigurationBuildDir)\include\JavaScriptCore;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapiLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj (173326 => 173327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj 2014-09-05 19:42:08 UTC (rev 173327)
</span><span class="lines">@@ -131,10 +131,12 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="testapiReleaseCFLite.props" />
</span><ins>+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="testapiReleaseCFLite.props" />
</span><ins>+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="lines">@@ -155,10 +157,12 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="testapiDebugCFLite.props" />
</span><ins>+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="testapiDebugCFLite.props" />
</span><ins>+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span></span></pre>
</div>
</div>
</body>
</html>