Title: [173327] trunk/Source/_javascript_Core
- Revision
- 173327
- Author
- commit-qu...@webkit.org
- Date
- 2014-09-05 12:42:08 -0700 (Fri, 05 Sep 2014)
Log Message
[WinCairo] jsc.exe won't run.
https://bugs.webkit.org/show_bug.cgi?id=136481
Patch by pe...@outlook.com <pe...@outlook.com> on 2014-09-05
Reviewed by Alex Christensen.
We need to define WIN_CAIRO to avoid looking for the AAS folder.
* _javascript_Core.vcxproj/jsc/DLLLauncherWinCairo.props: Added.
* _javascript_Core.vcxproj/jsc/jscLauncher.vcxproj:
* _javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj:
* _javascript_Core.vcxproj/testapi/testapiCommonCFLite.props:
* _javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj:
Modified Paths
Added Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (173326 => 173327)
--- trunk/Source/_javascript_Core/ChangeLog 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-09-05 19:42:08 UTC (rev 173327)
@@ -1,3 +1,18 @@
+2014-09-05 pe...@outlook.com <pe...@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.
+
+ * _javascript_Core.vcxproj/jsc/DLLLauncherWinCairo.props: Added.
+ * _javascript_Core.vcxproj/jsc/jscLauncher.vcxproj:
+ * _javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj:
+ * _javascript_Core.vcxproj/testapi/testapiCommonCFLite.props:
+ * _javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj:
+
2014-09-05 David Kilzer <ddkil...@apple.com>
_javascript_Core should build with newer clang
Added: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/DLLLauncherWinCairo.props (0 => 173327)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/DLLLauncherWinCairo.props (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/DLLLauncherWinCairo.props 2014-09-05 19:42:08 UTC (rev 173327)
@@ -0,0 +1,12 @@
+<?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>
\ No newline at end of file
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscLauncher.vcxproj (173326 => 173327)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscLauncher.vcxproj 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscLauncher.vcxproj 2014-09-05 19:42:08 UTC (rev 173327)
@@ -131,10 +131,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="jscRelease.props" />
+ <Import Project="DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="jscRelease.props" />
+ <Import Project="DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -155,10 +157,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="jscDebug.props" />
+ <Import Project="DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="jscDebug.props" />
+ <Import Project="DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj (173326 => 173327)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj 2014-09-05 19:42:08 UTC (rev 173327)
@@ -131,10 +131,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="testRegExpRelease.props" />
+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="testRegExpRelease.props" />
+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -155,10 +157,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="testRegExpDebug.props" />
+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="testRegExpDebug.props" />
+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiCommonCFLite.props (173326 => 173327)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiCommonCFLite.props 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiCommonCFLite.props 2014-09-05 19:42:08 UTC (rev 173327)
@@ -9,7 +9,7 @@
<SubSystem>Console</SubSystem>
</Link>
<ClCompile>
- <PreprocessorDefinitions>WIN_CAIRO;NOMINMAX;USE_CONSOLE_ENTRY_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NOMINMAX;USE_CONSOLE_ENTRY_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\API;$(ConfigurationBuildDir)\include\_javascript_Core;$(ConfigurationBuildDir)\include\private\_javascript_Core;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj (173326 => 173327)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj 2014-09-05 19:33:29 UTC (rev 173326)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj 2014-09-05 19:42:08 UTC (rev 173327)
@@ -131,10 +131,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="testapiReleaseCFLite.props" />
+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="testapiReleaseCFLite.props" />
+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -155,10 +157,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="testapiDebugCFLite.props" />
+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="testapiDebugCFLite.props" />
+ <Import Project="..\jsc\DLLLauncherWinCairo.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
