Title: [202987] trunk/Source
Revision
202987
Author
[email protected]
Date
2016-07-08 10:17:42 -0700 (Fri, 08 Jul 2016)

Log Message

Unreviewed, rolling out r202799.
https://bugs.webkit.org/show_bug.cgi?id=159568

Caused build failure (Requested by perarne on #webkit).

Reverted changeset:

"[Win] DLLs are missing version information."
https://bugs.webkit.org/show_bug.cgi?id=159349
http://trac.webkit.org/changeset/202799

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/CMakeLists.txt (202986 => 202987)


--- trunk/Source/_javascript_Core/CMakeLists.txt	2016-07-08 17:15:00 UTC (rev 202986)
+++ trunk/Source/_javascript_Core/CMakeLists.txt	2016-07-08 17:17:42 UTC (rev 202987)
@@ -1354,12 +1354,3 @@
 
 add_custom_target(stageSharedScripts DEPENDS ${_javascript_Core_SCRIPTS})
 add_dependencies(_javascript_Core stageSharedScripts)
-
-if (MSVC)
-    add_custom_command(
-        TARGET _javascript_Core
-        POST_BUILD
-        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:_javascript_Core>
-        VERBATIM)
-endif ()
-

Modified: trunk/Source/_javascript_Core/ChangeLog (202986 => 202987)


--- trunk/Source/_javascript_Core/ChangeLog	2016-07-08 17:15:00 UTC (rev 202986)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-07-08 17:17:42 UTC (rev 202987)
@@ -1,3 +1,16 @@
+2016-07-08  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r202799.
+        https://bugs.webkit.org/show_bug.cgi?id=159568
+
+        Caused build failure (Requested by perarne on #webkit).
+
+        Reverted changeset:
+
+        "[Win] DLLs are missing version information."
+        https://bugs.webkit.org/show_bug.cgi?id=159349
+        http://trac.webkit.org/changeset/202799
+
 2016-07-08  Youenn Fablet  <[email protected]>
 
         Built-in generator should generate files with a default copyright

Modified: trunk/Source/WTF/ChangeLog (202986 => 202987)


--- trunk/Source/WTF/ChangeLog	2016-07-08 17:15:00 UTC (rev 202986)
+++ trunk/Source/WTF/ChangeLog	2016-07-08 17:17:42 UTC (rev 202987)
@@ -1,3 +1,16 @@
+2016-07-08  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r202799.
+        https://bugs.webkit.org/show_bug.cgi?id=159568
+
+        Caused build failure (Requested by perarne on #webkit).
+
+        Reverted changeset:
+
+        "[Win] DLLs are missing version information."
+        https://bugs.webkit.org/show_bug.cgi?id=159349
+        http://trac.webkit.org/changeset/202799
+
 2016-07-08  Jiewen Tan  <[email protected]>
 
         Define DYLD_MACOSX_VERSION_10_12

Modified: trunk/Source/WTF/wtf/CMakeLists.txt (202986 => 202987)


--- trunk/Source/WTF/wtf/CMakeLists.txt	2016-07-08 17:15:00 UTC (rev 202986)
+++ trunk/Source/WTF/wtf/CMakeLists.txt	2016-07-08 17:17:42 UTC (rev 202987)
@@ -294,17 +294,4 @@
 if (MSVC)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
-
-    add_custom_command(
-        TARGET WTF
-        PRE_BUILD
-        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT_DIR}
-        VERBATIM)
-
-    add_custom_command(
-        TARGET WTF
-        POST_BUILD
-        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:WTF>
-        VERBATIM)
-
 endif ()

Modified: trunk/Source/WebKit/CMakeLists.txt (202986 => 202987)


--- trunk/Source/WebKit/CMakeLists.txt	2016-07-08 17:15:00 UTC (rev 202986)
+++ trunk/Source/WebKit/CMakeLists.txt	2016-07-08 17:17:42 UTC (rev 202987)
@@ -56,12 +56,3 @@
 if (APPLE)
     set_target_properties(WebKit PROPERTIES LINK_FLAGS "-umbrella WebKit")
 endif ()
-
-if (MSVC)
-    add_custom_command(
-        TARGET WebKit
-        POST_BUILD
-        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:WebKit>
-        VERBATIM)
-endif ()
-

Modified: trunk/Source/WebKit/ChangeLog (202986 => 202987)


--- trunk/Source/WebKit/ChangeLog	2016-07-08 17:15:00 UTC (rev 202986)
+++ trunk/Source/WebKit/ChangeLog	2016-07-08 17:17:42 UTC (rev 202987)
@@ -1,3 +1,16 @@
+2016-07-08  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r202799.
+        https://bugs.webkit.org/show_bug.cgi?id=159568
+
+        Caused build failure (Requested by perarne on #webkit).
+
+        Reverted changeset:
+
+        "[Win] DLLs are missing version information."
+        https://bugs.webkit.org/show_bug.cgi?id=159349
+        http://trac.webkit.org/changeset/202799
+
 2016-07-07  Alex Christensen  <[email protected]>
 
         Use SocketProvider to create WebSocketChannels

Modified: trunk/Source/WebKit/PlatformWin.cmake (202986 => 202987)


--- trunk/Source/WebKit/PlatformWin.cmake	2016-07-08 17:15:00 UTC (rev 202986)
+++ trunk/Source/WebKit/PlatformWin.cmake	2016-07-08 17:17:42 UTC (rev 202987)
@@ -372,8 +372,15 @@
     win/Interfaces/Accessible2/AccessibleText.idl
     win/Interfaces/Accessible2/AccessibleText2.idl
     win/Interfaces/Accessible2/IA2CommonTypes.idl
+    "${DERIVED_SOURCES_WEBKIT_DIR}/include/autoversion.h"
 )
 
+add_custom_command(
+    OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/include/autoversion.h
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT_DIR}
+    VERBATIM)
+
 GENERATE_INTERFACE(win/Interfaces/WebKit.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleApplication.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
 GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to