Diff
Modified: trunk/ChangeLog (281724 => 281725)
--- trunk/ChangeLog 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/ChangeLog 2021-08-27 21:50:04 UTC (rev 281725)
@@ -1,3 +1,13 @@
+2021-08-27 Russell Epstein <[email protected]>
+
+ Land Windows build fixes from safari-612.1.29.14-branch.
+ https://bugs.webkit.org/show_bug.cgi?id=229627
+
+ Reviewed by Per Arne Vollan.
+
+ * Source/Makefile:
+ * Source/cmake/WinTools.make:
+
2021-08-27 Carlos Alberto Lopez Perez <[email protected]>
[CMake] ICU 61.2 is required to build WebKit since r281375
Modified: trunk/Source/_javascript_Core/ChangeLog (281724 => 281725)
--- trunk/Source/_javascript_Core/ChangeLog 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-08-27 21:50:04 UTC (rev 281725)
@@ -1,3 +1,12 @@
+2021-08-27 Russell Epstein <[email protected]>
+
+ Land Windows build fixes from safari-612.1.29.14-branch.
+ https://bugs.webkit.org/show_bug.cgi?id=229627.
+
+ Reviewed by Per Arne Vollan.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj:
+
2021-08-27 Mark Lam <[email protected]>
Changed ARM64 probe trampoline to do ptr auth the standard way.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (281724 => 281725)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2021-08-27 21:50:04 UTC (rev 281725)
@@ -28,7 +28,8 @@
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
- <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+ <SourceSubdirectory>\Source\_javascript_Core</SourceSubdirectory>
+ <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
</PropertyGroup>
<!-- Prepare for build -->
@@ -74,7 +75,7 @@
<CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\_javascript_Core\inspector\**\*.*">
<Output TaskParameter="Include" ItemName="InspectorFiles" />
</CreateItem>
- <CreateItem Include="$(SRCROOT)\API\*.h">
+ <CreateItem Include="$(SRCROOT)$(SourceSubdirectory)\API\*.h">
<Output TaskParameter="Include" ItemName="APIFiles" />
</CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
Modified: trunk/Source/Makefile (281724 => 281725)
--- trunk/Source/Makefile 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/Makefile 2021-08-27 21:50:04 UTC (rev 281725)
@@ -50,3 +50,4 @@
installsrc:
@$(build_target_for_each_module)
+ cp -R ../Source/cmake $(SRCROOT)/Source/
Modified: trunk/Source/WTF/ChangeLog (281724 => 281725)
--- trunk/Source/WTF/ChangeLog 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/WTF/ChangeLog 2021-08-27 21:50:04 UTC (rev 281725)
@@ -1,3 +1,12 @@
+2021-08-27 Russell Epstein <[email protected]>
+
+ Land Windows build fixes from safari-612.1.29.14-branch
+ https://bugs.webkit.org/show_bug.cgi?id=229627
+
+ Reviewed by Per Arne Vollan.
+
+ * WTF.vcxproj/WTF.proj:
+
2021-08-27 Antti Koivisto <[email protected]>
[CSS Cascade Layers] Initial support
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.proj (281724 => 281725)
--- trunk/Source/WTF/WTF.vcxproj/WTF.proj 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.proj 2021-08-27 21:50:04 UTC (rev 281725)
@@ -28,7 +28,8 @@
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
- <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWTF_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+ <SourceSubdirectory>\Source\WTF</SourceSubdirectory>
+ <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWTF_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
</PropertyGroup>
<!-- Prepare for build -->
Modified: trunk/Source/WebCore/ChangeLog (281724 => 281725)
--- trunk/Source/WebCore/ChangeLog 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/WebCore/ChangeLog 2021-08-27 21:50:04 UTC (rev 281725)
@@ -1,3 +1,12 @@
+2021-08-27 Russell Epstein <[email protected]>
+
+ Land Windows build fixes from safari-612.1.29.14-branch.
+ https://bugs.webkit.org/show_bug.cgi?id=229627.
+
+ Reviewed by Per Arne Vollan.
+
+ * WebCore.vcxproj/WebCore.proj:
+
2021-08-27 Simon Fraser <[email protected]>
[CSS3 Backgrounds and Borders] The border image area should be empty if border-style is none and border-image-width is not set
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (281724 => 281725)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2021-08-27 21:50:04 UTC (rev 281725)
@@ -28,7 +28,8 @@
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
- <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/')) -DPAL_DIR=$(SRCROOT.Replace('\','/'))/PAL</CMakeCommandCommon>
+ <SourceSubdirectory>\Source\WebCore</SourceSubdirectory>
+ <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/')) -DPAL_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))/PAL</CMakeCommandCommon>
</PropertyGroup>
<!-- Prepare for build -->
Modified: trunk/Source/WebInspectorUI/ChangeLog (281724 => 281725)
--- trunk/Source/WebInspectorUI/ChangeLog 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/WebInspectorUI/ChangeLog 2021-08-27 21:50:04 UTC (rev 281725)
@@ -1,3 +1,13 @@
+2021-08-27 Russell Epstein <[email protected]>
+
+ Land Windows build fixes from safari-612.1.29.14-branch.
+ https://bugs.webkit.org/show_bug.cgi?id=229627
+
+ Reviewed by Per Arne Vollan.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.make:
+ * WebInspectorUI.vcxproj/WebInspectorUI.proj:
+
2021-08-26 Patrick Angle <[email protected]>
Web Inspector: Rename `ContextualDocumentation*` to `CSSDocumentation` to reduce path length and improve code readability
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (281724 => 281725)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2021-08-27 21:50:04 UTC (rev 281725)
@@ -9,9 +9,6 @@
@xcopy /y /e "..\UserInterface\*" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
if errorlevel 1 exit 1
- @xcopy /y /e "%_javascript_CORE_PRIVATE_HEADERS_DIR%\inspector\InspectorBackendCommands.js" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
- if errorlevel 1 exit 1
-
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
clean:
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj (281724 => 281725)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2021-08-27 21:50:04 UTC (rev 281725)
@@ -65,9 +65,16 @@
<CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.resources\**\*.*">
<Output TaskParameter="Include" ItemName="Bin64Resources" />
</CreateItem>
+ <CreateItem Include="$(WebKit_Libraries)\include\private\_javascript_Core\inspector\InspectorBackendCommands.js">
+ <Output TaskParameter="Include" ItemName="InspectorBackendCommandsFile" />
+ </CreateItem>
<Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\%(RecursiveDir)%(Filename)%(Extension)')" />
+
+ <Message Text="Copying @(InspectorBackendCommandsFile) to $(DSTROOT)" />
+ <Copy SourceFiles="@(InspectorBackendCommandsFile)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\WebInspectorUI\Protocol" />
+ <Copy SourceFiles="@(InspectorBackendCommandsFile)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\WebInspectorUI\Protocol" />
</Target>
</Project>
Modified: trunk/Source/WebKitLegacy/ChangeLog (281724 => 281725)
--- trunk/Source/WebKitLegacy/ChangeLog 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/WebKitLegacy/ChangeLog 2021-08-27 21:50:04 UTC (rev 281725)
@@ -1,3 +1,12 @@
+2021-08-27 Russell Epstein <[email protected]>
+
+ Land Windows build fixes from safari-612.1.29.14-branch.
+ https://bugs.webkit.org/show_bug.cgi?id=229627.
+
+ Reviewed by Per Arne Vollan.
+
+ * WebKitLegacy.vcxproj/WebKitLegacy.proj:
+
2021-08-07 Myles C. Maxfield <[email protected]>
Deduplicate logging channel algorithms
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (281724 => 281725)
--- trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2021-08-27 21:50:04 UTC (rev 281725)
@@ -28,7 +28,8 @@
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
- <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+ <SourceSubdirectory>\Source\WebKitLegacy</SourceSubdirectory>
+ <CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
</PropertyGroup>
<!-- Prepare for build -->
Modified: trunk/Source/cmake/WinTools.make (281724 => 281725)
--- trunk/Source/cmake/WinTools.make 2021-08-27 21:30:29 UTC (rev 281724)
+++ trunk/Source/cmake/WinTools.make 2021-08-27 21:50:04 UTC (rev 281725)
@@ -1,4 +1,4 @@
install:
- xcopy "$(SRCROOT)\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
- xcopy "$(SRCROOT)\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
- xcopy "$(SRCROOT)\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
+ xcopy "$(SRCROOT)\Source\cmake\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
+ xcopy "$(SRCROOT)\Source\cmake\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
+ xcopy "$(SRCROOT)\Source\cmake\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
