Title: [202989] branches/safari-602.1.40-branch/Source

Diff

Modified: branches/safari-602.1.40-branch/Source/_javascript_Core/CMakeLists.txt (202988 => 202989)


--- branches/safari-602.1.40-branch/Source/_javascript_Core/CMakeLists.txt	2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/_javascript_Core/CMakeLists.txt	2016-07-08 17:45:51 UTC (rev 202989)
@@ -1350,12 +1350,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: branches/safari-602.1.40-branch/Source/_javascript_Core/ChangeLog (202988 => 202989)


--- branches/safari-602.1.40-branch/Source/_javascript_Core/ChangeLog	2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/_javascript_Core/ChangeLog	2016-07-08 17:45:51 UTC (rev 202989)
@@ -1,3 +1,20 @@
+2016-07-08  Babak Shafiei  <[email protected]>
+
+        Merge r202987.
+
+    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  Babak Shafiei  <[email protected]>
 
         Merge patch for rdar://problem/27175583.

Modified: branches/safari-602.1.40-branch/Source/WTF/ChangeLog (202988 => 202989)


--- branches/safari-602.1.40-branch/Source/WTF/ChangeLog	2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WTF/ChangeLog	2016-07-08 17:45:51 UTC (rev 202989)
@@ -1,3 +1,20 @@
+2016-07-08  Babak Shafiei  <[email protected]>
+
+        Merge r202987.
+
+    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  Babak Shafiei  <[email protected]>
 
         Merge patch for rdar://problem/27175583.

Modified: branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt (202988 => 202989)


--- branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt	2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt	2016-07-08 17:45:51 UTC (rev 202989)
@@ -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: branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt (202988 => 202989)


--- branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt	2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt	2016-07-08 17:45:51 UTC (rev 202989)
@@ -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: branches/safari-602.1.40-branch/Source/WebKit/ChangeLog (202988 => 202989)


--- branches/safari-602.1.40-branch/Source/WebKit/ChangeLog	2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WebKit/ChangeLog	2016-07-08 17:45:51 UTC (rev 202989)
@@ -1,3 +1,20 @@
+2016-07-08  Babak Shafiei  <[email protected]>
+
+        Merge r202987.
+
+    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-03  Per Arne Vollan  <[email protected]>
 
         [Win] DLLs are missing version information.

Modified: branches/safari-602.1.40-branch/Source/WebKit/PlatformWin.cmake (202988 => 202989)


--- branches/safari-602.1.40-branch/Source/WebKit/PlatformWin.cmake	2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WebKit/PlatformWin.cmake	2016-07-08 17:45:51 UTC (rev 202989)
@@ -371,8 +371,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