Attachment 368256 Details for Bug 197249 – PATCH

[patch] PATCH

197249.diff (text/plain), 6.37 KB, created by Basuke Suzuki on 2019-04-25 12:06:30 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2019-04-25 12:06:30 PDT

Size: 6.37 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 189d95b3979..c47308ff27f 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-04-25  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win] Add flag to enable version information stamping and disable by default.
>+        https://bugs.webkit.org/show_bug.cgi?id=197249
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This feature is only used in AppleWin port. Add flag for this task and make it OFF by default.
>+        Then enable it by default on AppleWin.
>+
>+        * Source/cmake/OptionsWin.cmake:
>+        * Source/cmake/WebKitFeatures.cmake:
>+
> 2019-04-20  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake][Win] Use target oriented design for WebKitLegacy
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index ab69001d005..a12c0748d60 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -1319,7 +1319,7 @@ endif ()
> add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})
> add_dependencies(JavaScriptCore stageSharedScripts ${JavaScriptCore_EXTRA_DEPENDENCIES})
> 
>-if (MSVC)
>+if (USE_VERSION_STAMPER)
>     add_custom_command(
>         TARGET JavaScriptCore
>         PRE_BUILD
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index f1ae22bdaaf..8eb67d419f6 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-04-25  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win] Add flag to enable version information stamping and disable by default.
>+        https://bugs.webkit.org/show_bug.cgi?id=197249
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This feature is only used in AppleWin port. Add flag for this task and make it OFF by default.
>+        Then enable it by default on AppleWin.
>+
>+        * CMakeLists.txt:
>+
> 2019-04-22  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] Use volatile load to populate backing page in MarkedBlock::Footer instead of using holdLock
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 118e2b14437..a076d8d3479 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-04-25  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win] Add flag to enable version information stamping and disable by default.
>+        https://bugs.webkit.org/show_bug.cgi?id=197249
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This feature is only used in AppleWin port. Add flag for this task and make it OFF by default.
>+        Then enable it by default on AppleWin.
>+
>+        * wtf/CMakeLists.txt:
>+
> 2019-04-21  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [WTF] Generic memoryFootprint() implementation should use bmalloc on Linux
>diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
>index 3c3f25161db..7f25dcca683 100644
>--- a/Source/WTF/wtf/CMakeLists.txt
>+++ b/Source/WTF/wtf/CMakeLists.txt
>@@ -513,7 +513,9 @@ WEBKIT_MAKE_FORWARDING_HEADERS(WTF
> if (MSVC)
>     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
>     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
>+endif ()
> 
>+if (USE_VERSION_STAMPER)
>     add_custom_command(
>         TARGET WTF
>         PRE_BUILD
>diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
>index e4282d41c5c..780b1037d04 100644
>--- a/Source/WebKitLegacy/ChangeLog
>+++ b/Source/WebKitLegacy/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-04-25  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win] Add flag to enable version information stamping and disable by default.
>+        https://bugs.webkit.org/show_bug.cgi?id=197249
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This feature is only used in AppleWin port. Add flag for this task and make it OFF by default.
>+        Then enable it by default on AppleWin.
>+
>+        * PlatformWin.cmake:
>+
> 2019-04-20  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake][Win] Use target oriented design for WebKitLegacy
>diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake
>index 3506b154db7..d172741f676 100644
>--- a/Source/WebKitLegacy/PlatformWin.cmake
>+++ b/Source/WebKitLegacy/PlatformWin.cmake
>@@ -395,11 +395,13 @@ set(WEBKITLEGACY_IDL_DEPENDENCIES
>     "${WebKitLegacy_DERIVED_SOURCES_DIR}/include/autoversion.h"
> )
> 
>-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 (USE_VERSION_STAMPER)
>+    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 ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
> GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleApplication.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
>diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
>index 0b46991befb..77002ff9f0a 100644
>--- a/Source/cmake/OptionsWin.cmake
>+++ b/Source/cmake/OptionsWin.cmake
>@@ -98,6 +98,7 @@ else ()
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE OFF)
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC OFF)
>+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_VERSION_STAMPER PRIVATE ON)
> endif ()
> 
> WEBKIT_OPTION_END()
>diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
>index e089abb972f..acde7baaf53 100644
>--- a/Source/cmake/WebKitFeatures.cmake
>+++ b/Source/cmake/WebKitFeatures.cmake
>@@ -221,6 +221,7 @@ macro(WEBKIT_OPTION_BEGIN)
>     WEBKIT_OPTION_DEFINE(ENABLE_WIRELESS_PLAYBACK_TARGET "Enable wireless playback target support" PRIVATE OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" PRIVATE ON)
>     WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" PRIVATE ${USE_SYSTEM_MALLOC_DEFAULT})
>+    WEBKIT_OPTION_DEFINE(USE_VERSION_STAMPER "Toggle stamping version information during build" PRIVATE OFF)
> 
>     WEBKIT_OPTION_CONFLICT(ENABLE_JIT ENABLE_C_LOOP)
>     WEBKIT_OPTION_CONFLICT(ENABLE_SAMPLING_PROFILER ENABLE_C_LOOP)

Flags:

ross.kirsling: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 197249: 368186 | 368256 | 368278 | 368363 | 368364 | 368466