Changeset 187908 in webkit


Ignore:
Timestamp:
Aug 4, 2015 4:10:36 PM (9 years ago)
Author:
Brent Fulgham
Message:

[Win] Update Apple Windows build for VS2015
​https://bugs.webkit.org/show_bug.cgi?id=147653

Reviewed by Dean Jackson.

Source/JavaScriptCore:

Show JSC files in proper project locations in IDE.

Source/WebKit/win:

  • WebView.cpp:

(WebView::setCacheModel): Add explicit 'get' to satisfy compiler.

Source/WTF:

  • WTF.vcxproj/WTF.vcxproj.filters: Drive-by-fix to place files in

proper project locations in the IDE.

  • wtf/Platform.h: Don't define the _HAS_EXCEPTIONS macro when building with

Visual Studio 2015.

Tools:

  • DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/PluginTest.h: If building with

something older than VS2015, define snprintf as _snprintf.

  • DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props:

Remove unneeded macro definition for snprintf.

  • Scripts/webkitpy/common/system/platforminfo.py:

(PlatformInfo._determine_win_version): Recognize Windows 10.

  • Scripts/webkitpy/port/win.py:

(WinPort): Ditto.

  • Scripts/webkitpy/port/win_unittest.py:

(WinPortTest.test_baseline_search_path): Include Windows 10 in tests.
(WinPortTest._assert_version): Ditto.

WebKitLibraries:

  • win/tools/vsprops/common.props: Fix build flags to use Windows 7

(WINVER=0x601) as minimum build target for 64-bit builds.

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r187897 r187908  
     12015-08-04  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Update Apple Windows build for VS2015
     4        https://bugs.webkit.org/show_bug.cgi?id=147653
     5
     6        Reviewed by Dean Jackson.
     7
     8        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Drive-by-fix.
     9        Show JSC files in proper project locations in IDE.
     10
    1112015-08-04  Joseph Pecoraro  <pecoraro@apple.com>
    212

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

    r187677 r187908  
    11711171      <Filter>dfg</Filter>
    11721172    </ClCompile>
    1173     <ClCompile Include="..\dfg\DFGDesiredWriteBarriers.cpp">
    1174       <Filter>dfg</Filter>
    1175     </ClCompile>
    11761173    <ClCompile Include="..\dfg\DFGDisassembler.cpp">
    11771174      <Filter>dfg</Filter>
    … …  
    13131310    </ClCompile>
    13141311    <ClCompile Include="..\dfg\DFGStackLayoutPhase.cpp">
    1315       <Filter>dfg</Filter>
    1316     </ClCompile>
    1317     <ClCompile Include="..\dfg\DFGStoreBarrierElisionPhase.cpp">
    13181312      <Filter>dfg</Filter>
    13191313    </ClCompile>
    … …  
    18311825      <Filter>wasm</Filter>
    18321826    </ClCompile>
     1827    <ClCompile Include="..\bytecode\TrackedReferences.cpp" />
     1828    <ClCompile Include="..\dfg\DFGCombinedLiveness.cpp" />
     1829    <ClCompile Include="..\dfg\DFGConstantHoistingPhase.cpp" />
     1830    <ClCompile Include="..\dfg\DFGIntegerRangeOptimizationPhase.cpp" />
     1831    <ClCompile Include="..\dfg\DFGMinifiedGraph.cpp" />
     1832    <ClCompile Include="..\dfg\DFGOSRExitFuzz.cpp" />
     1833    <ClCompile Include="..\dfg\DFGStoreBarrierInsertionPhase.cpp" />
    18331834  </ItemGroup>
    18341835  <ItemGroup>
    … …  
    35563557      <Filter>dfg</Filter>
    35573558    </ClInclude>
    3558     <ClInclude Include="..\dfg\DFGDesiredWriteBarriers.h">
    3559       <Filter>dfg</Filter>
    3560     </ClInclude>
    35613559    <ClInclude Include="..\dfg\DFGDisassembler.h">
    35623560      <Filter>dfg</Filter>
    … …  
    37493747    </ClInclude>
    37503748    <ClInclude Include="..\dfg\DFGStackLayoutPhase.h">
    3751       <Filter>dfg</Filter>
    3752     </ClInclude>
    3753     <ClInclude Include="..\dfg\DFGStoreBarrierElisionPhase.h">
    37543749      <Filter>dfg</Filter>
    37553750    </ClInclude>
    … …  
    43714366      <Filter>wasm</Filter>
    43724367    </ClInclude>
     4368    <ClInclude Include="..\bytecode\TrackedReferences.h" />
     4369    <ClInclude Include="..\dfg\DFGCombinedLiveness.h" />
     4370    <ClInclude Include="..\dfg\DFGConstantHoistingPhase.h" />
     4371    <ClInclude Include="..\dfg\DFGIntegerRangeOptimizationPhase.h" />
     4372    <ClInclude Include="..\dfg\DFGOSRExitFuzz.h" />
     4373    <ClInclude Include="..\dfg\DFGStoreBarrierInsertionPhase.h" />
    43734374  </ItemGroup>
    43744375  <ItemGroup>

  • trunk/Source/WTF/ChangeLog

    r187875 r187908  
     12015-08-04  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Update Apple Windows build for VS2015
     4        https://bugs.webkit.org/show_bug.cgi?id=147653
     5
     6        Reviewed by Dean Jackson.
     7
     8        * WTF.vcxproj/WTF.vcxproj.filters: Drive-by-fix to place files in
     9        proper project locations in the IDE.
     10        * wtf/Platform.h: Don't define the _HAS_EXCEPTIONS macro when building with
     11        Visual Studio 2015.
     12
    1132015-08-04  Commit Queue  <commit-queue@webkit.org>
    214

  • trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters

    r185847 r187908  
    714714      <Filter>wtf\win</Filter>
    715715    </ClInclude>
     716    <ClInclude Include="..\wtf\TinyPtrSet.h" />
    716717  </ItemGroup>
    717718  <ItemGroup>

  • trunk/Source/WTF/wtf/Platform.h

    r187819 r187908  
    11071107#endif
    11081108
    1109 #if COMPILER(MSVC)
     1109#if COMPILER(MSVC) && _MSC_VER < 1900
    11101110#undef __STDC_LIMIT_MACROS
    11111111#define __STDC_LIMIT_MACROS

  • trunk/Source/WebKit/win/ChangeLog

    r187894 r187908  
     12015-08-04  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Update Apple Windows build for VS2015
     4        https://bugs.webkit.org/show_bug.cgi?id=147653
     5
     6        Reviewed by Dean Jackson.
     7
     8        * WebView.cpp:
     9        (WebView::setCacheModel): Add explicit 'get' to satisfy compiler.
     10
    1112015-08-04  Alex Christensen  <achristensen@webkit.org>
    212

  • trunk/Source/WebKit/win/WebView.cpp

    r187891 r187908  
    540540            cfurlCacheDirectory = WebCore::localUserSpecificStorageDirectory().createCFString();
    541541    }
    542     cacheDirectory = String(cfurlCacheDirectory);
     542    cacheDirectory = String(cfurlCacheDirectory.get());
    543543    CFIndex cacheMemoryCapacity = 0;
    544544    CFIndex cacheDiskCapacity = 0;

  • trunk/Tools/ChangeLog

    r187888 r187908  
     12015-08-04  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Update Apple Windows build for VS2015
     4        https://bugs.webkit.org/show_bug.cgi?id=147653
     5
     6        Reviewed by Dean Jackson.
     7
     8        * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/PluginTest.h: If building with
     9        something older than VS2015, define snprintf as _snprintf.
     10        * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props:
     11        Remove unneeded macro definition for snprintf.
     12        * Scripts/webkitpy/common/system/platforminfo.py:
     13        (PlatformInfo._determine_win_version): Recognize Windows 10.
     14        * Scripts/webkitpy/port/win.py:
     15        (WinPort): Ditto.
     16        * Scripts/webkitpy/port/win_unittest.py:
     17        (WinPortTest.test_baseline_search_path): Include Windows 10 in tests.
     18        (WinPortTest._assert_version): Ditto.
     19
    1202015-08-04  Brian Burg  <bburg@apple.com>
    221

  • trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props

    r159499 r187908  
    77    <ClCompile>
    88      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\TestNetscapePlugIn;$(ProjectDir)..\..\TestNetscapePlugIn\win;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\JavaScriptCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9       <PreprocessorDefinitions>snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    109    </ClCompile>
    1110    <Link>

  • trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h

    r187886 r187908  
    3232#include <string>
    3333
     34#if defined(_MSC_VER) && _MSC_VER < 1900
     35#define snprintf _snprintf
     36#endif
     37
    3438// Helper classes for implementing has_member
    3539typedef char (&no_tag)[1];

  • trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py

    r185581 r187908  
    11# Copyright (c) 2011 Google Inc. All rights reserved.
     2# Copyright (c) 2015 Apple Inc. All rights reserved.
    23#
    34# Redistribution and use in source and binary forms, with or without
    … …  
    166167
    167168    def _determine_win_version(self, win_version_tuple):
     169        if win_version_tuple[:3] == (0, 0, 10240):
     170            return 'win10'
    168171        if win_version_tuple[:3] == (6, 1, 7600):
    169172            return '7sp0'

  • trunk/Tools/Scripts/webkitpy/port/win.py

    r182481 r187908  
    4848    port_name = "win"
    4949
    50     VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win"]
     50    VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win-win10", "win"]
    5151
    5252    ARCHITECTURES = ['x86', 'x86_64']

  • trunk/Tools/Scripts/webkitpy/port/win_unittest.py

    r180240 r187908  
    6464
    6565    def test_baseline_search_path(self):
    66         self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win', 'mac'], 'xp')
    67         self._assert_search_path(['win-vista', 'win-7sp0', 'win', 'mac'], 'vista')
    68         self._assert_search_path(['win-7sp0', 'win', 'mac'], '7sp0')
     66        self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac'], 'xp')
     67        self._assert_search_path(['win-vista', 'win-7sp0', 'win-win10', 'win', 'mac'], 'vista')
     68        self._assert_search_path(['win-7sp0', 'win-win10', 'win', 'mac'], '7sp0')
    6969
    70         self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'xp', use_webkit2=True)
    71         self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'vista', use_webkit2=True)
    72         self._assert_search_path(['win-wk2', 'win-7sp0', 'win', 'mac-wk2', 'mac'], '7sp0', use_webkit2=True)
     70        self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], 'xp', use_webkit2=True)
     71        self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], 'vista', use_webkit2=True)
     72        self._assert_search_path(['win-wk2', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], '7sp0', use_webkit2=True)
    7373
    7474    def _assert_version(self, port_name, expected_version):

  • trunk/WebKitLibraries/ChangeLog

    r187772 r187908  
     12015-08-04  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Update Apple Windows build for VS2015
     4        https://bugs.webkit.org/show_bug.cgi?id=147653
     5
     6        Reviewed by Dean Jackson.
     7
     8        * win/tools/vsprops/common.props: Fix build flags to use Windows 7
     9        (WINVER=0x601) as minimum build target for 64-bit builds.
     10
    1112015-08-03  Filip Pizlo  <fpizlo@apple.com>
    212

  • trunk/WebKitLibraries/win/tools/vsprops/common.props

    r187370 r187908  
    4141    <ClCompile>
    4242      <AdditionalOptions>/bigobj /GS %(AdditionalOptions)</AdditionalOptions>
    43       <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    44       <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;WINVER=0x601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    45       <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64</PreprocessorDefinitions>
     43      <PreprocessorDefinitions>_WINDOWS;WINVER=0x601;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     44      <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     45      <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    4646      <ExceptionHandling>false</ExceptionHandling>
    4747      <RuntimeTypeInfo>false</RuntimeTypeInfo>
Note: See TracChangeset for help on using the changeset viewer.