Title: [244669] trunk
Revision
244669
Author
[email protected]
Date
2019-04-25 16:08:09 -0700 (Thu, 25 Apr 2019)

Log 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/_javascript_Core:

* CMakeLists.txt:

Source/WebKitLegacy:

* PlatformWin.cmake:

Source/WTF:

* wtf/CMakeLists.txt:

Modified Paths

Diff

Modified: trunk/ChangeLog (244668 => 244669)


--- trunk/ChangeLog	2019-04-25 22:41:59 UTC (rev 244668)
+++ trunk/ChangeLog	2019-04-25 23:08:09 UTC (rev 244669)
@@ -1,3 +1,15 @@
+2019-04-25  Basuke Suzuki  <[email protected]>
+
+        [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  <[email protected]>
 
         Start using C++17

Modified: trunk/Source/_javascript_Core/CMakeLists.txt (244668 => 244669)


--- trunk/Source/_javascript_Core/CMakeLists.txt	2019-04-25 22:41:59 UTC (rev 244668)
+++ trunk/Source/_javascript_Core/CMakeLists.txt	2019-04-25 23:08:09 UTC (rev 244669)
@@ -1319,7 +1319,7 @@
 add_custom_target(stageSharedScripts DEPENDS ${_javascript_Core_SCRIPTS})
 add_dependencies(_javascript_Core stageSharedScripts ${_javascript_Core_EXTRA_DEPENDENCIES})
 
-if (MSVC)
+if (USE_VERSION_STAMPER)
     add_custom_command(
         TARGET _javascript_Core
         PRE_BUILD

Modified: trunk/Source/_javascript_Core/ChangeLog (244668 => 244669)


--- trunk/Source/_javascript_Core/ChangeLog	2019-04-25 22:41:59 UTC (rev 244668)
+++ trunk/Source/_javascript_Core/ChangeLog	2019-04-25 23:08:09 UTC (rev 244669)
@@ -1,3 +1,15 @@
+2019-04-25  Basuke Suzuki  <[email protected]>
+
+        [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  <[email protected]>
 
         Disable date and time inputs on iOSMac.

Modified: trunk/Source/WTF/ChangeLog (244668 => 244669)


--- trunk/Source/WTF/ChangeLog	2019-04-25 22:41:59 UTC (rev 244668)
+++ trunk/Source/WTF/ChangeLog	2019-04-25 23:08:09 UTC (rev 244669)
@@ -1,3 +1,15 @@
+2019-04-25  Basuke Suzuki  <[email protected]>
+
+        [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  <[email protected]>
 
         Disable date and time inputs on iOSMac.

Modified: trunk/Source/WTF/wtf/CMakeLists.txt (244668 => 244669)


--- trunk/Source/WTF/wtf/CMakeLists.txt	2019-04-25 22:41:59 UTC (rev 244668)
+++ trunk/Source/WTF/wtf/CMakeLists.txt	2019-04-25 23:08:09 UTC (rev 244669)
@@ -512,7 +512,9 @@
 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

Modified: trunk/Source/WebKitLegacy/ChangeLog (244668 => 244669)


--- trunk/Source/WebKitLegacy/ChangeLog	2019-04-25 22:41:59 UTC (rev 244668)
+++ trunk/Source/WebKitLegacy/ChangeLog	2019-04-25 23:08:09 UTC (rev 244669)
@@ -1,3 +1,15 @@
+2019-04-25  Basuke Suzuki  <[email protected]>
+
+        [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  <[email protected]>
 
         Add Xcode version check for Header post-processing scripts

Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (244668 => 244669)


--- trunk/Source/WebKitLegacy/PlatformWin.cmake	2019-04-25 22:41:59 UTC (rev 244668)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake	2019-04-25 23:08:09 UTC (rev 244669)
@@ -395,11 +395,13 @@
     "${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}")

Modified: trunk/Source/cmake/OptionsWin.cmake (244668 => 244669)


--- trunk/Source/cmake/OptionsWin.cmake	2019-04-25 22:41:59 UTC (rev 244668)
+++ trunk/Source/cmake/OptionsWin.cmake	2019-04-25 23:08:09 UTC (rev 244669)
@@ -14,6 +14,8 @@
 
 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.
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
@@ -98,6 +100,7 @@
     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()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to