Changeset 244676 in webkit

Timestamp:

Apr 25, 2019, 8:46:43 PM (7 years ago)

Author:

Fujii Hironori

Message:

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

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  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        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  <Basuke.Suzuki@sony.com>
 

trunk/Source/JavaScriptCore/CMakeLists.txt

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-25  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        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  <Basuke.Suzuki@sony.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-04-25  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        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  <Basuke.Suzuki@sony.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  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        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  <Basuke.Suzuki@sony.com>
 

trunk/Source/WebKitLegacy/PlatformWin.cmake

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

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.
@@ -101 +99 @@
     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 ()