Title: [292824] trunk
- Revision
- 292824
- Author
- hironori.fu...@sony.com
- Date
- 2022-04-13 13:05:28 -0700 (Wed, 13 Apr 2022)
Log Message
[WinCairo] WEBKIT_LIBRARIES env var should be customizable
https://bugs.webkit.org/show_bug.cgi?id=239268
Reviewed by Yusuke Suzuki.
* Tools/Scripts/update-webkit-wincairo-libs.py:
* Source/WebKitLegacy/CMakeLists.txt:
* Source/WebKitLegacy/PlatformWin.cmake:
Canonical link: https://commits.webkit.org/249600@main
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/CMakeLists.txt (292823 => 292824)
--- trunk/Source/WebKitLegacy/CMakeLists.txt 2022-04-13 19:53:23 UTC (rev 292823)
+++ trunk/Source/WebKitLegacy/CMakeLists.txt 2022-04-13 20:05:28 UTC (rev 292824)
@@ -57,7 +57,7 @@
set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-umbrella WebKit")
endif ()
-if (MSVC)
+if (MSVC AND NOT WTF_PLATFORM_WIN_CAIRO)
add_custom_command(
TARGET WebKitLegacy
POST_BUILD
Modified: trunk/Source/WebKitLegacy/ChangeLog (292823 => 292824)
--- trunk/Source/WebKitLegacy/ChangeLog 2022-04-13 19:53:23 UTC (rev 292823)
+++ trunk/Source/WebKitLegacy/ChangeLog 2022-04-13 20:05:28 UTC (rev 292824)
@@ -1,3 +1,29 @@
+2022-04-12 Fujii Hironori <hironori.fu...@sony.com>
+
+ [WinCairo] WEBKIT_LIBRARIES env var should be customizable
+ https://bugs.webkit.org/show_bug.cgi?id=239268
+
+ Reviewed by Yusuke Suzuki.
+
+ Even though WEBKIT_LIBRARIES is a env var, it wasn't customizable
+ for WinCairo. It should set to WebKitLibraries\win directory for
+ WinCairo builds.
+
+ This has two problems:
+ 1. It is the same directory with one AppleWin is using. This is error prone. See Bug#238988.
+ 2. WebKitLibraries\win directory is a source directory. It isn't a good practise to overwrite source directories.
+
+ It should be customizable to set it to a WinCairo specific directory. For example,
+ > set WEBKIT_LIBRARIES=%~dp0WinCairoLibraries
+
+ If I changed the env var, the WinCairo build failed because
+ auto-version.pl and version-stamp.pl were missing. They are in
+ WebKitLibraries/win/tools/scripts directory. However, WinCairo
+ doesn't need both scripts.
+
+ * CMakeLists.txt: Don't use version-stamp.pl for WinCairo builds.
+ * PlatformWin.cmake: Don't use auto-version.pl for WinCairo builds.
+
2022-04-05 Elliott Williams <e...@apple.com>
Fix STP build error "no such file or directory: 'Technology'"
Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (292823 => 292824)
--- trunk/Source/WebKitLegacy/PlatformWin.cmake 2022-04-13 19:53:23 UTC (rev 292823)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2022-04-13 20:05:28 UTC (rev 292824)
@@ -378,11 +378,18 @@
USES_TERMINAL VERBATIM)
endfunction()
-add_custom_command(
- OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/include/autoversion.h
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${WebKitLegacy_DERIVED_SOURCES_DIR}
- VERBATIM)
+if (WTF_PLATFORM_WIN_CAIRO)
+ file(WRITE ${WebKitLegacy_DERIVED_SOURCES_DIR}/include/autoversion.h
+ "#define __BUILD_NUMBER_MAJOR__ 0\n"
+ "#define __BUILD_NUMBER_MINOR__ 0\n"
+ "#define __BUILD_NUMBER_SHORT__ \"\"\n")
+else ()
+ add_custom_command(
+ OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/include/autoversion.h
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${WebKitLegacy_DERIVED_SOURCES_DIR}
+ VERBATIM)
+endif ()
GENERATE_INTERFACE(win/Interfaces/WebKit.idl)
GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleApplication.idl)
Modified: trunk/Tools/ChangeLog (292823 => 292824)
--- trunk/Tools/ChangeLog 2022-04-13 19:53:23 UTC (rev 292823)
+++ trunk/Tools/ChangeLog 2022-04-13 20:05:28 UTC (rev 292824)
@@ -1,3 +1,13 @@
+2022-04-12 Fujii Hironori <hironori.fu...@sony.com>
+
+ [WinCairo] WEBKIT_LIBRARIES env var should be customizable
+ https://bugs.webkit.org/show_bug.cgi?id=239268
+
+ Reviewed by Yusuke Suzuki.
+
+ * Scripts/update-webkit-wincairo-libs.py:
+ Output to WEBKIT_LIBRARIES directory if the env var is set.
+
2022-04-13 Simon Fraser <simon.fra...@apple.com>
[css-scroll-snap] scrollIntoView fails with scroll-snap-type on :root
Modified: trunk/Tools/Scripts/update-webkit-wincairo-libs.py (292823 => 292824)
--- trunk/Tools/Scripts/update-webkit-wincairo-libs.py 2022-04-13 19:53:23 UTC (rev 292823)
+++ trunk/Tools/Scripts/update-webkit-wincairo-libs.py 2022-04-13 20:05:28 UTC (rev 292824)
@@ -25,7 +25,7 @@
import importlib
import json
-import os.path
+import os
import sys
import zipfile
@@ -33,7 +33,7 @@
repo = 'WebKitForWindows/WebKitRequirements'
file = 'WebKitRequirementsWin64.zip'
-output = 'WebKitLibraries/win'
+output = os.getenv('WEBKIT_LIBRARIES', 'WebKitLibraries/win')
options = [repo, file, '-o', output]
# Check if there's a specific version to request
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
