Diff
Modified: trunk/ChangeLog (244675 => 244676)
--- trunk/ChangeLog 2019-04-26 02:55:36 UTC (rev 244675)
+++ trunk/ChangeLog 2019-04-26 03:46:43 UTC (rev 244676)
@@ -1,3 +1,16 @@
+2019-04-25 Fujii Hironori <[email protected]>
+
+ Unreviewed, rolling out r244669.
+
+ Windows ports can't clean build.
+
+ Reverted changeset:
+
+ "[Win] Add flag to enable version information stamping and
+ disable by default."
+ https://bugs.webkit.org/show_bug.cgi?id=197249
+ https://trac.webkit.org/changeset/244669
+
2019-04-25 Basuke Suzuki <[email protected]>
[Win] Add flag to enable version information stamping and disable by default.
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (244675 => 244676)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2019-04-26 02:55:36 UTC (rev 244675)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2019-04-26 03:46:43 UTC (rev 244676)
@@ -1319,7 +1319,7 @@
add_custom_target(stageSharedScripts DEPENDS ${_javascript_Core_SCRIPTS})
add_dependencies(_javascript_Core stageSharedScripts ${_javascript_Core_EXTRA_DEPENDENCIES})
-if (USE_VERSION_STAMPER)
+if (MSVC)
add_custom_command(
TARGET _javascript_Core
PRE_BUILD
Modified: trunk/Source/_javascript_Core/ChangeLog (244675 => 244676)
--- trunk/Source/_javascript_Core/ChangeLog 2019-04-26 02:55:36 UTC (rev 244675)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-04-26 03:46:43 UTC (rev 244676)
@@ -1,3 +1,16 @@
+2019-04-25 Fujii Hironori <[email protected]>
+
+ Unreviewed, rolling out r244669.
+
+ Windows ports can't clean build.
+
+ Reverted changeset:
+
+ "[Win] Add flag to enable version information stamping and
+ disable by default."
+ https://bugs.webkit.org/show_bug.cgi?id=197249
+ https://trac.webkit.org/changeset/244669
+
2019-04-25 Basuke Suzuki <[email protected]>
[Win] Add flag to enable version information stamping and disable by default.
Modified: trunk/Source/WTF/ChangeLog (244675 => 244676)
--- trunk/Source/WTF/ChangeLog 2019-04-26 02:55:36 UTC (rev 244675)
+++ trunk/Source/WTF/ChangeLog 2019-04-26 03:46:43 UTC (rev 244676)
@@ -1,3 +1,16 @@
+2019-04-25 Fujii Hironori <[email protected]>
+
+ Unreviewed, rolling out r244669.
+
+ Windows ports can't clean build.
+
+ Reverted changeset:
+
+ "[Win] Add flag to enable version information stamping and
+ disable by default."
+ https://bugs.webkit.org/show_bug.cgi?id=197249
+ https://trac.webkit.org/changeset/244669
+
2019-04-25 Basuke Suzuki <[email protected]>
[Win] Add flag to enable version information stamping and disable by default.
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (244675 => 244676)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2019-04-26 02:55:36 UTC (rev 244675)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2019-04-26 03:46:43 UTC (rev 244676)
@@ -512,9 +512,7 @@
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 (244675 => 244676)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-04-26 02:55:36 UTC (rev 244675)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-04-26 03:46:43 UTC (rev 244676)
@@ -1,3 +1,16 @@
+2019-04-25 Fujii Hironori <[email protected]>
+
+ Unreviewed, rolling out r244669.
+
+ Windows ports can't clean build.
+
+ Reverted changeset:
+
+ "[Win] Add flag to enable version information stamping and
+ disable by default."
+ https://bugs.webkit.org/show_bug.cgi?id=197249
+ https://trac.webkit.org/changeset/244669
+
2019-04-25 Basuke Suzuki <[email protected]>
[Win] Add flag to enable version information stamping and disable by default.
Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (244675 => 244676)
--- trunk/Source/WebKitLegacy/PlatformWin.cmake 2019-04-26 02:55:36 UTC (rev 244675)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2019-04-26 03:46:43 UTC (rev 244676)
@@ -395,13 +395,11 @@
"${WebKitLegacy_DERIVED_SOURCES_DIR}/include/autoversion.h"
)
-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 ()
+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)
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 (244675 => 244676)
--- trunk/Source/cmake/OptionsWin.cmake 2019-04-26 02:55:36 UTC (rev 244675)
+++ trunk/Source/cmake/OptionsWin.cmake 2019-04-26 03:46:43 UTC (rev 244676)
@@ -14,8 +14,6 @@
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)
@@ -100,7 +98,6 @@
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()
