Diff
Modified: trunk/ChangeLog (254680 => 254681)
--- trunk/ChangeLog 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/ChangeLog 2020-01-16 15:56:57 UTC (rev 254681)
@@ -1,3 +1,18 @@
+2020-01-16 Per Arne Vollan <[email protected]>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=206299
+
+ Reviewed by Brent Fulgham.
+
+ This patch has been created by [email protected] and [email protected]. Add target files for WTF and
+ _javascript_Core. Also, to make sure headers are copied to the forwarding headers directory, add the CMake
+ keywork ALL when adding custom target for copying files.
+
+ * Source/cmake/TargetJavaScriptCore.cmake: Added.
+ * Source/cmake/TargetWTF.cmake: Added.
+ * Source/cmake/WebKitMacros.cmake:
+
2020-01-10 Dean Jackson <[email protected]>
[WebGL] Clarify USE_OPENGL_ES_3
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (254680 => 254681)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2020-01-16 15:56:57 UTC (rev 254681)
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.10)
include(WebKitCommon)
+include(target/TargetWTF)
set_property(DIRECTORY . PROPERTY FOLDER "_javascript_Core")
list(APPEND _javascript_Core_UNIFIED_SOURCE_LIST_FILES
Modified: trunk/Source/_javascript_Core/ChangeLog (254680 => 254681)
--- trunk/Source/_javascript_Core/ChangeLog 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-01-16 15:56:57 UTC (rev 254681)
@@ -1,3 +1,15 @@
+2020-01-16 Per Arne Vollan <[email protected]>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=206299
+
+ Reviewed by Brent Fulgham.
+
+ Include required target. Build internal builds with VS2019.
+
+ * CMakeLists.txt:
+ * _javascript_Core.vcxproj/_javascript_Core.proj:
+
2020-01-16 Caio Lima <[email protected]>
[JSC] 32-bit platforms should use a PC base register
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (254680 => 254681)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2020-01-16 15:56:57 UTC (rev 254681)
@@ -54,9 +54,9 @@
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 15 2017"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -A Win32 -G "Visual Studio 16 2019"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
- <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 15 2017 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -A x64 -G "Visual Studio 16 2019"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
Modified: trunk/Source/WTF/ChangeLog (254680 => 254681)
--- trunk/Source/WTF/ChangeLog 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/WTF/ChangeLog 2020-01-16 15:56:57 UTC (rev 254681)
@@ -1,3 +1,14 @@
+2020-01-16 Per Arne Vollan <[email protected]>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=206299
+
+ Reviewed by Brent Fulgham.
+
+ Build internal builds with VS2019.
+
+ * WTF.vcxproj/WTF.proj:
+
2020-01-15 Sam Weinig <[email protected]>
Platform.h is out of control Part 5: Split HAVE_* macro definitions out of Platform.h and into a new PlatformHave.h
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.proj (254680 => 254681)
--- trunk/Source/WTF/WTF.vcxproj/WTF.proj 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.proj 2020-01-16 15:56:57 UTC (rev 254681)
@@ -46,9 +46,9 @@
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 15 2017"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -A Win32 -G "Visual Studio 16 2019"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
- <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 15 2017 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -A x64 -G "Visual Studio 16 2019"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
Modified: trunk/Source/WebCore/CMakeLists.txt (254680 => 254681)
--- trunk/Source/WebCore/CMakeLists.txt 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-01-16 15:56:57 UTC (rev 254681)
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.10)
include(WebKitCommon)
+include(target/TargetWTF)
+include(target/TargetJavaScriptCore)
include(WebCoreMacros.cmake)
include(Headers.cmake)
Modified: trunk/Source/WebCore/ChangeLog (254680 => 254681)
--- trunk/Source/WebCore/ChangeLog 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/WebCore/ChangeLog 2020-01-16 15:56:57 UTC (rev 254681)
@@ -1,3 +1,15 @@
+2020-01-16 Per Arne Vollan <[email protected]>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=206299
+
+ Reviewed by Brent Fulgham.
+
+ Include required targets. Build internal builds with VS2019.
+
+ * CMakeLists.txt:
+ * WebCore.vcxproj/WebCore.proj:
+
2020-01-16 Tomoki Imai <[email protected]>
Do not detect the stopped animations in Nicosia::Animation to avoid flashback
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (254680 => 254681)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2020-01-16 15:56:57 UTC (rev 254681)
@@ -54,9 +54,9 @@
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 15 2017"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -A Win32 -G "Visual Studio 16 2019"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
- <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 15 2017 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -A x64 -G "Visual Studio 16 2019"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
Modified: trunk/Source/WebKitLegacy/CMakeLists.txt (254680 => 254681)
--- trunk/Source/WebKitLegacy/CMakeLists.txt 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/WebKitLegacy/CMakeLists.txt 2020-01-16 15:56:57 UTC (rev 254681)
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.10)
include(WebKitCommon)
+include(target/TargetWTF)
+include(target/TargetJavaScriptCore)
set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy")
set(WebKitLegacy_SOURCES
Modified: trunk/Source/WebKitLegacy/ChangeLog (254680 => 254681)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-01-16 15:56:57 UTC (rev 254681)
@@ -1,3 +1,15 @@
+2020-01-16 Per Arne Vollan <[email protected]>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=206299
+
+ Reviewed by Brent Fulgham.
+
+ Include required targets. Build internal builds with VS2019.
+
+ * CMakeLists.txt:
+ * WebKitLegacy.vcxproj/WebKitLegacy.proj:
+
2020-01-07 Sihui Liu <[email protected]>
REGRESSION (r248734): different threads write m_storageMap of StorageAreaImpl at the same time
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (254680 => 254681)
--- trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2020-01-16 15:56:57 UTC (rev 254681)
@@ -54,9 +54,9 @@
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 15 2017"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -A Win32 -G "Visual Studio 16 2019"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
- <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 15 2017 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -A x64 -G "Visual Studio 16 2019"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
Modified: trunk/Source/cmake/WebKitMacros.cmake (254680 => 254681)
--- trunk/Source/cmake/WebKitMacros.cmake 2020-01-16 15:43:23 UTC (rev 254680)
+++ trunk/Source/cmake/WebKitMacros.cmake 2020-01-16 15:56:57 UTC (rev 254681)
@@ -370,7 +370,7 @@
)
list(APPEND dst_files ${dst_file})
endforeach ()
- add_custom_target(${target_name} DEPENDS ${dst_files})
+ add_custom_target(${target_name} ALL DEPENDS ${dst_files})
endfunction()
# Helper macros for debugging CMake problems.
Added: trunk/Source/cmake/target/TargetJavaScriptCore.cmake (0 => 254681)
--- trunk/Source/cmake/target/TargetJavaScriptCore.cmake (rev 0)
+++ trunk/Source/cmake/target/TargetJavaScriptCore.cmake 2020-01-16 15:56:57 UTC (rev 254681)
@@ -0,0 +1,19 @@
+if (NOT TARGET WebKit::_javascript_Core)
+ if (NOT INTERNAL_BUILD)
+ message(FATAL_ERROR "WebKit::_javascript_Core target not found")
+ endif ()
+
+ # This should be moved to an if block if the Apple Mac/iOS build moves completely to CMake
+ # Just assuming Windows for the moment
+ add_library(WebKit::_javascript_Core SHARED IMPORTED)
+ set_target_properties(WebKit::_javascript_Core PROPERTIES
+ IMPORTED_LOCATION ${WEBKIT_LIBRARIES_RUNTIME_DIR}/_javascript_Core${DEBUG_SUFFIX}.dll
+ IMPORTED_IMPLIB ${WEBKIT_LIBRARIES_LINK_DIR}/_javascript_Core${DEBUG_SUFFIX}.lib
+ # Should add Apple::CoreFoundation here when https://bugs.webkit.org/show_bug.cgi?id=205085 lands
+ INTERFACE_LINK_LIBRARIES "WebKit::WTF;ICU::data;ICU::i18n;ICU::uc"
+ )
+ target_include_directories(WebKit::_javascript_Core INTERFACE
+ ${_javascript_Core_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}
+ )
+endif ()
Added: trunk/Source/cmake/target/TargetWTF.cmake (0 => 254681)
--- trunk/Source/cmake/target/TargetWTF.cmake (rev 0)
+++ trunk/Source/cmake/target/TargetWTF.cmake 2020-01-16 15:56:57 UTC (rev 254681)
@@ -0,0 +1,18 @@
+if (NOT TARGET WebKit::WTF)
+ if (NOT INTERNAL_BUILD)
+ message(FATAL_ERROR "WebKit::WTF target not found")
+ endif ()
+
+ # This should be moved to an if block if the Apple Mac/iOS build moves completely to CMake
+ # Just assuming Windows for the moment
+ add_library(WebKit::WTF SHARED IMPORTED)
+ set_target_properties(WebKit::WTF PROPERTIES
+ IMPORTED_LOCATION ${WEBKIT_LIBRARIES_RUNTIME_DIR}/WTF${DEBUG_SUFFIX}.dll
+ IMPORTED_IMPLIB ${WEBKIT_LIBRARIES_LINK_DIR}/WTF${DEBUG_SUFFIX}.lib
+ # Should add Apple::CoreFoundation here when https://bugs.webkit.org/show_bug.cgi?id=205085 lands
+ INTERFACE_LINK_LIBRARIES "ICU::data;ICU::i18n;ICU::uc"
+ )
+ target_include_directories(WebKit::WTF INTERFACE
+ ${WTF_FRAMEWORK_HEADERS_DIR}
+ )
+endif ()
