[Win] Update Apple Windows build for VS2015
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Aug 2015 23:10:36 +0000 (23:10 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Aug 2015 23:10:36 +0000 (23:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=147653

Reviewed by Dean Jackson.

Source/JavaScriptCore:

* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Drive-by-fix.
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187908 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
Source/WTF/wtf/Platform.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props
Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h
Tools/Scripts/webkitpy/common/system/platforminfo.py
Tools/Scripts/webkitpy/port/win.py
Tools/Scripts/webkitpy/port/win_unittest.py
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/common.props

index 9ffcd07..a39e55b 100644 (file)
@@ -1,3 +1,13 @@
+2015-08-04  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Update Apple Windows build for VS2015
+        https://bugs.webkit.org/show_bug.cgi?id=147653
+
+        Reviewed by Dean Jackson.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Drive-by-fix.
+        Show JSC files in proper project locations in IDE.
+
 2015-08-04  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Object previews for SVG elements shows SVGAnimatedString instead of text
index 009b2f1..9a25dfd 100644 (file)
     <ClCompile Include="..\dfg\DFGDesiredWeakReferences.cpp">
       <Filter>dfg</Filter>
     </ClCompile>
-    <ClCompile Include="..\dfg\DFGDesiredWriteBarriers.cpp">
-      <Filter>dfg</Filter>
-    </ClCompile>
     <ClCompile Include="..\dfg\DFGDisassembler.cpp">
       <Filter>dfg</Filter>
     </ClCompile>
     <ClCompile Include="..\dfg\DFGStackLayoutPhase.cpp">
       <Filter>dfg</Filter>
     </ClCompile>
-    <ClCompile Include="..\dfg\DFGStoreBarrierElisionPhase.cpp">
-      <Filter>dfg</Filter>
-    </ClCompile>
     <ClCompile Include="..\dfg\DFGThunks.cpp">
       <Filter>dfg</Filter>
     </ClCompile>
     <ClCompile Include="..\wasm\WASMReader.cpp">
       <Filter>wasm</Filter>
     </ClCompile>
+    <ClCompile Include="..\bytecode\TrackedReferences.cpp" />
+    <ClCompile Include="..\dfg\DFGCombinedLiveness.cpp" />
+    <ClCompile Include="..\dfg\DFGConstantHoistingPhase.cpp" />
+    <ClCompile Include="..\dfg\DFGIntegerRangeOptimizationPhase.cpp" />
+    <ClCompile Include="..\dfg\DFGMinifiedGraph.cpp" />
+    <ClCompile Include="..\dfg\DFGOSRExitFuzz.cpp" />
+    <ClCompile Include="..\dfg\DFGStoreBarrierInsertionPhase.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\API\APICallbackFunction.h">
     <ClInclude Include="..\dfg\DFGDesiredWeakReferences.h">
       <Filter>dfg</Filter>
     </ClInclude>
-    <ClInclude Include="..\dfg\DFGDesiredWriteBarriers.h">
-      <Filter>dfg</Filter>
-    </ClInclude>
     <ClInclude Include="..\dfg\DFGDisassembler.h">
       <Filter>dfg</Filter>
     </ClInclude>
     <ClInclude Include="..\dfg\DFGStackLayoutPhase.h">
       <Filter>dfg</Filter>
     </ClInclude>
-    <ClInclude Include="..\dfg\DFGStoreBarrierElisionPhase.h">
-      <Filter>dfg</Filter>
-    </ClInclude>
     <ClInclude Include="..\dfg\DFGStructureAbstractValue.h">
       <Filter>dfg</Filter>
     </ClInclude>
     <ClInclude Include="..\wasm\WASMReader.h">
       <Filter>wasm</Filter>
     </ClInclude>
+    <ClInclude Include="..\bytecode\TrackedReferences.h" />
+    <ClInclude Include="..\dfg\DFGCombinedLiveness.h" />
+    <ClInclude Include="..\dfg\DFGConstantHoistingPhase.h" />
+    <ClInclude Include="..\dfg\DFGIntegerRangeOptimizationPhase.h" />
+    <ClInclude Include="..\dfg\DFGOSRExitFuzz.h" />
+    <ClInclude Include="..\dfg\DFGStoreBarrierInsertionPhase.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="JavaScriptCorePreLink.cmd" />
       <Filter>jit</Filter>
     </MASM>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 8a4a985..8af74d7 100644 (file)
@@ -1,3 +1,15 @@
+2015-08-04  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Update Apple Windows build for VS2015
+        https://bugs.webkit.org/show_bug.cgi?id=147653
+
+        Reviewed by Dean Jackson.
+
+        * 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.
+
 2015-08-04  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r187815 and r187817.
index fb7e7c4..9979369 100644 (file)
     <ClInclude Include="..\wtf\win\WorkItemWin.h">
       <Filter>wtf\win</Filter>
     </ClInclude>
+    <ClInclude Include="..\wtf\TinyPtrSet.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="WTFPostBuild.cmd" />
     <None Include="WTFPreBuild.cmd" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 608f69b..5499c49 100644 (file)
 #define ENABLE_PLATFORM_FONT_LOOKUP 1
 #endif
 
-#if COMPILER(MSVC)
+#if COMPILER(MSVC) && _MSC_VER < 1900
 #undef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
 #undef _HAS_EXCEPTIONS
index 37c8681..0a556da 100644 (file)
@@ -1,3 +1,13 @@
+2015-08-04  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Update Apple Windows build for VS2015
+        https://bugs.webkit.org/show_bug.cgi?id=147653
+
+        Reviewed by Dean Jackson.
+
+        * WebView.cpp:
+        (WebView::setCacheModel): Add explicit 'get' to satisfy compiler.
+
 2015-08-04  Alex Christensen  <achristensen@webkit.org>
 
         Fix Windows build after r187886.
index a4c2618..5cdc599 100644 (file)
@@ -539,7 +539,7 @@ void WebView::setCacheModel(WebCacheModel cacheModel)
         else
             cfurlCacheDirectory = WebCore::localUserSpecificStorageDirectory().createCFString();
     }
-    cacheDirectory = String(cfurlCacheDirectory);
+    cacheDirectory = String(cfurlCacheDirectory.get());
     CFIndex cacheMemoryCapacity = 0;
     CFIndex cacheDiskCapacity = 0;
 #elif USE(CURL)
index de4bf0a..f1fba76 100644 (file)
@@ -1,3 +1,22 @@
+2015-08-04  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Update Apple Windows build for VS2015
+        https://bugs.webkit.org/show_bug.cgi?id=147653
+
+        Reviewed by Dean Jackson.
+
+        * 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.
+
 2015-08-04  Brian Burg  <bburg@apple.com>
 
         Unreviewed, update email addresses in contributors.json and watchlist.
index ff33e6f..0aa60f0 100644 (file)
@@ -6,7 +6,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <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>
-      <PreprocessorDefinitions>snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
index 16aa6ae..d7a5163 100644 (file)
 #include <map>
 #include <string>
 
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define snprintf _snprintf
+#endif
+
 // Helper classes for implementing has_member
 typedef char (&no_tag)[1];
 typedef char (&yes_tag)[2];
index ddc8dd2..9110057 100644 (file)
@@ -1,4 +1,5 @@
 # Copyright (c) 2011 Google Inc. All rights reserved.
+# Copyright (c) 2015 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -165,6 +166,8 @@ class PlatformInfo(object):
         return 'lucid'
 
     def _determine_win_version(self, win_version_tuple):
+        if win_version_tuple[:3] == (0, 0, 10240):
+            return 'win10'
         if win_version_tuple[:3] == (6, 1, 7600):
             return '7sp0'
         if win_version_tuple[:2] == (6, 0):
index 3a3f31c..ab69969 100644 (file)
@@ -47,7 +47,7 @@ _log = logging.getLogger(__name__)
 class WinPort(ApplePort):
     port_name = "win"
 
-    VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win"]
+    VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win-win10", "win"]
 
     ARCHITECTURES = ['x86', 'x86_64']
 
index 1ef187a..18e454c 100644 (file)
@@ -63,13 +63,13 @@ class WinPortTest(port_testcase.PortTestCase):
         self.assertEqual(port.baseline_search_path(), absolute_search_paths)
 
     def test_baseline_search_path(self):
-        self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win', 'mac'], 'xp')
-        self._assert_search_path(['win-vista', 'win-7sp0', 'win', 'mac'], 'vista')
-        self._assert_search_path(['win-7sp0', 'win', 'mac'], '7sp0')
+        self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac'], 'xp')
+        self._assert_search_path(['win-vista', 'win-7sp0', 'win-win10', 'win', 'mac'], 'vista')
+        self._assert_search_path(['win-7sp0', 'win-win10', 'win', 'mac'], '7sp0')
 
-        self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'xp', use_webkit2=True)
-        self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'vista', use_webkit2=True)
-        self._assert_search_path(['win-wk2', 'win-7sp0', 'win', 'mac-wk2', 'mac'], '7sp0', use_webkit2=True)
+        self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], 'xp', use_webkit2=True)
+        self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], 'vista', use_webkit2=True)
+        self._assert_search_path(['win-wk2', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], '7sp0', use_webkit2=True)
 
     def _assert_version(self, port_name, expected_version):
         host = MockSystemHost(os_name='win', os_version=expected_version)
index b960aca..5670cd5 100644 (file)
@@ -1,3 +1,13 @@
+2015-08-04  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Update Apple Windows build for VS2015
+        https://bugs.webkit.org/show_bug.cgi?id=147653
+
+        Reviewed by Dean Jackson.
+
+        * win/tools/vsprops/common.props: Fix build flags to use Windows 7
+        (WINVER=0x601) as minimum build target for 64-bit builds.
+
 2015-08-03  Filip Pizlo  <fpizlo@apple.com>
 
         Check in LLVM 3.6.2 binary drops for El Capitan
index 2d8288a..98c7ec8 100644 (file)
@@ -40,9 +40,9 @@ nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalOptions>/bigobj /GS %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;WINVER=0x601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;WINVER=0x601;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <WarningLevel>Level4</WarningLevel>