Changeset 244669 in webkit

Timestamp:

Apr 25, 2019 4:08:09 PM (5 years ago)

Author:

Basuke Suzuki

Message:

[Win] Add flag to enable version information stamping and disable by default.
​https://bugs.webkit.org/show_bug.cgi?id=197249

Reviewed by Ross Kirsling.

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/JavaScriptCore:

• CMakeLists.txt:

Source/WebKitLegacy:

• PlatformWin.cmake:

Source/WTF:

• wtf/CMakeLists.txt:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/CMakeLists.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/CMakeLists.txt (modified) (1 diff)
• Source/WebKitLegacy/ChangeLog (modified) (1 diff)
• Source/WebKitLegacy/PlatformWin.cmake (modified) (1 diff)
• Source/cmake/OptionsWin.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+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 Ross Kirsling.
+
+        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:
+
 2019-04-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -1320 +1320 @@
 add_dependencies(JavaScriptCore stageSharedScripts ${JavaScriptCore_EXTRA_DEPENDENCIES})
 
-if (MSVC)
+if (USE_VERSION_STAMPER)
     add_custom_command(
         TARGET JavaScriptCore

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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 Ross Kirsling.
+
+        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-25  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+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 Ross Kirsling.
+
+        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-25  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WTF/wtf/CMakeLists.txt

@@ -513 +513 @@
     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

trunk/Source/WebKitLegacy/ChangeLog

@@ +1 @@
+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 Ross Kirsling.
+
+        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-23  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKitLegacy/PlatformWin.cmake

@@ -396 +396 @@
 )
 
-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}")

trunk/Source/cmake/OptionsWin.cmake

@@ -14 +14 @@
 
 WEBKIT_OPTION_BEGIN()
+
+WEBKIT_OPTION_DEFINE(USE_VERSION_STAMPER "Toggle stamping version information during build" PRIVATE OFF)
 
 # FIXME: Most of these options should not be public.
@@ -99 +101 @@
     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 ()