Changeset 173327 in webkit


Ignore:
Timestamp:
Sep 5, 2014 12:42:08 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[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.

Location:
trunk/Source/JavaScriptCore
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r173326 r173327  
     12014-09-05  peavo@outlook.com  <peavo@outlook.com>
     2
     3        [WinCairo] jsc.exe won't run.
     4        https://bugs.webkit.org/show_bug.cgi?id=136481
     5
     6        Reviewed by Alex Christensen.
     7       
     8        We need to define WIN_CAIRO to avoid looking for the AAS folder.
     9
     10        * JavaScriptCore.vcxproj/jsc/DLLLauncherWinCairo.props: Added.
     11        * JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj:
     12        * JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj:
     13        * JavaScriptCore.vcxproj/testapi/testapiCommonCFLite.props:
     14        * JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj:
     15
    1162014-09-05  David Kilzer  <ddkilzer@apple.com>
    217

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj

    r173171 r173327  
    132132    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    133133    <Import Project="jscRelease.props" />
     134    <Import Project="DLLLauncherWinCairo.props" />
    134135  </ImportGroup>
    135136  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
    136137    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    137138    <Import Project="jscRelease.props" />
     139    <Import Project="DLLLauncherWinCairo.props" />
    138140  </ImportGroup>
    139141  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
    … …  
    156158    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    157159    <Import Project="jscDebug.props" />
     160    <Import Project="DLLLauncherWinCairo.props" />
    158161  </ImportGroup>
    159162  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
    160163    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    161164    <Import Project="jscDebug.props" />
     165    <Import Project="DLLLauncherWinCairo.props" />
    162166  </ImportGroup>
    163167  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj

    r173171 r173327  
    132132    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    133133    <Import Project="testRegExpRelease.props" />
     134    <Import Project="..\jsc\DLLLauncherWinCairo.props" />
    134135  </ImportGroup>
    135136  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
    136137    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    137138    <Import Project="testRegExpRelease.props" />
     139    <Import Project="..\jsc\DLLLauncherWinCairo.props" />
    138140  </ImportGroup>
    139141  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
    … …  
    156158    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    157159    <Import Project="testRegExpDebug.props" />
     160    <Import Project="..\jsc\DLLLauncherWinCairo.props" />
    158161  </ImportGroup>
    159162  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
    160163    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    161164    <Import Project="testRegExpDebug.props" />
     165    <Import Project="..\jsc\DLLLauncherWinCairo.props" />
    162166  </ImportGroup>
    163167  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiCommonCFLite.props

    r173171 r173327  
    1010    </Link>
    1111    <ClCompile>
    12       <PreprocessorDefinitions>WIN_CAIRO;NOMINMAX;USE_CONSOLE_ENTRY_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     12      <PreprocessorDefinitions>NOMINMAX;USE_CONSOLE_ENTRY_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1313      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\API;$(ConfigurationBuildDir)\include\JavaScriptCore;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1414    </ClCompile>

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj

    r173171 r173327  
    132132    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    133133    <Import Project="testapiReleaseCFLite.props" />
     134    <Import Project="..\jsc\DLLLauncherWinCairo.props" />
    134135  </ImportGroup>
    135136  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
    136137    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    137138    <Import Project="testapiReleaseCFLite.props" />
     139    <Import Project="..\jsc\DLLLauncherWinCairo.props" />
    138140  </ImportGroup>
    139141  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
    … …  
    156158    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    157159    <Import Project="testapiDebugCFLite.props" />
     160    <Import Project="..\jsc\DLLLauncherWinCairo.props" />
    158161  </ImportGroup>
    159162  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
    160163    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    161164    <Import Project="testapiDebugCFLite.props" />
     165    <Import Project="..\jsc\DLLLauncherWinCairo.props" />
    162166  </ImportGroup>
    163167  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
Note: See TracChangeset for help on using the changeset viewer.