Changeset 187908 in webkit
- Timestamp:
- Aug 4, 2015 4:10:36 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r187897 r187908 1 2015-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 1 11 2015-08-04 Joseph Pecoraro <pecoraro@apple.com> 2 12 -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
r187677 r187908 1171 1171 <Filter>dfg</Filter> 1172 1172 </ClCompile> 1173 <ClCompile Include="..\dfg\DFGDesiredWriteBarriers.cpp">1174 <Filter>dfg</Filter>1175 </ClCompile>1176 1173 <ClCompile Include="..\dfg\DFGDisassembler.cpp"> 1177 1174 <Filter>dfg</Filter> … … 1313 1310 </ClCompile> 1314 1311 <ClCompile Include="..\dfg\DFGStackLayoutPhase.cpp"> 1315 <Filter>dfg</Filter>1316 </ClCompile>1317 <ClCompile Include="..\dfg\DFGStoreBarrierElisionPhase.cpp">1318 1312 <Filter>dfg</Filter> 1319 1313 </ClCompile> … … 1831 1825 <Filter>wasm</Filter> 1832 1826 </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" /> 1833 1834 </ItemGroup> 1834 1835 <ItemGroup> … … 3556 3557 <Filter>dfg</Filter> 3557 3558 </ClInclude> 3558 <ClInclude Include="..\dfg\DFGDesiredWriteBarriers.h">3559 <Filter>dfg</Filter>3560 </ClInclude>3561 3559 <ClInclude Include="..\dfg\DFGDisassembler.h"> 3562 3560 <Filter>dfg</Filter> … … 3749 3747 </ClInclude> 3750 3748 <ClInclude Include="..\dfg\DFGStackLayoutPhase.h"> 3751 <Filter>dfg</Filter>3752 </ClInclude>3753 <ClInclude Include="..\dfg\DFGStoreBarrierElisionPhase.h">3754 3749 <Filter>dfg</Filter> 3755 3750 </ClInclude> … … 4371 4366 <Filter>wasm</Filter> 4372 4367 </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" /> 4373 4374 </ItemGroup> 4374 4375 <ItemGroup> -
trunk/Source/WTF/ChangeLog
r187875 r187908 1 2015-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 1 13 2015-08-04 Commit Queue <commit-queue@webkit.org> 2 14 -
trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
r185847 r187908 714 714 <Filter>wtf\win</Filter> 715 715 </ClInclude> 716 <ClInclude Include="..\wtf\TinyPtrSet.h" /> 716 717 </ItemGroup> 717 718 <ItemGroup> -
trunk/Source/WTF/wtf/Platform.h
r187819 r187908 1107 1107 #endif 1108 1108 1109 #if COMPILER(MSVC) 1109 #if COMPILER(MSVC) && _MSC_VER < 1900 1110 1110 #undef __STDC_LIMIT_MACROS 1111 1111 #define __STDC_LIMIT_MACROS -
trunk/Source/WebKit/win/ChangeLog
r187894 r187908 1 2015-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 1 11 2015-08-04 Alex Christensen <achristensen@webkit.org> 2 12 -
trunk/Source/WebKit/win/WebView.cpp
r187891 r187908 540 540 cfurlCacheDirectory = WebCore::localUserSpecificStorageDirectory().createCFString(); 541 541 } 542 cacheDirectory = String(cfurlCacheDirectory );542 cacheDirectory = String(cfurlCacheDirectory.get()); 543 543 CFIndex cacheMemoryCapacity = 0; 544 544 CFIndex cacheDiskCapacity = 0; -
trunk/Tools/ChangeLog
r187888 r187908 1 2015-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 1 20 2015-08-04 Brian Burg <bburg@apple.com> 2 21 -
trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props
r159499 r187908 7 7 <ClCompile> 8 8 <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>10 9 </ClCompile> 11 10 <Link> -
trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h
r187886 r187908 32 32 #include <string> 33 33 34 #if defined(_MSC_VER) && _MSC_VER < 1900 35 #define snprintf _snprintf 36 #endif 37 34 38 // Helper classes for implementing has_member 35 39 typedef char (&no_tag)[1]; -
trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py
r185581 r187908 1 1 # Copyright (c) 2011 Google Inc. All rights reserved. 2 # Copyright (c) 2015 Apple Inc. All rights reserved. 2 3 # 3 4 # Redistribution and use in source and binary forms, with or without … … 166 167 167 168 def _determine_win_version(self, win_version_tuple): 169 if win_version_tuple[:3] == (0, 0, 10240): 170 return 'win10' 168 171 if win_version_tuple[:3] == (6, 1, 7600): 169 172 return '7sp0' -
trunk/Tools/Scripts/webkitpy/port/win.py
r182481 r187908 48 48 port_name = "win" 49 49 50 VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win "]50 VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win-win10", "win"] 51 51 52 52 ARCHITECTURES = ['x86', 'x86_64'] -
trunk/Tools/Scripts/webkitpy/port/win_unittest.py
r180240 r187908 64 64 65 65 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') 69 69 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) 73 73 74 74 def _assert_version(self, port_name, expected_version): -
trunk/WebKitLibraries/ChangeLog
r187772 r187908 1 2015-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 1 11 2015-08-03 Filip Pizlo <fpizlo@apple.com> 2 12 -
trunk/WebKitLibraries/win/tools/vsprops/common.props
r187370 r187908 41 41 <ClCompile> 42 42 <AdditionalOptions>/bigobj /GS %(AdditionalOptions)</AdditionalOptions> 43 <PreprocessorDefinitions>_WINDOWS;WINVER=0x 502;_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> 46 46 <ExceptionHandling>false</ExceptionHandling> 47 47 <RuntimeTypeInfo>false</RuntimeTypeInfo>
Note: See TracChangeset
for help on using the changeset viewer.