Title: [202799] trunk/Source
Revision
202799
Author
[email protected]
Date
2016-07-03 23:27:32 -0700 (Sun, 03 Jul 2016)

Log Message

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

Reviewed by Brent Fulgham.

Source/_javascript_Core:

Run perl version stamp utility.
        
* CMakeLists.txt:

Source/WebKit:

WTF will generate autoversion.h in the prebuild step.
Run the perl version stamp utility.

* CMakeLists.txt:
* PlatformWin.cmake:

Source/WTF:

Generate autoversion.h in the prebuild step.
Run the perl version stamp utility.

* wtf/CMakeLists.txt:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/CMakeLists.txt (202798 => 202799)


--- trunk/Source/_javascript_Core/CMakeLists.txt	2016-07-04 05:59:26 UTC (rev 202798)
+++ trunk/Source/_javascript_Core/CMakeLists.txt	2016-07-04 06:27:32 UTC (rev 202799)
@@ -1350,3 +1350,12 @@
 
 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 (202798 => 202799)


--- trunk/Source/_javascript_Core/ChangeLog	2016-07-04 05:59:26 UTC (rev 202798)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-07-04 06:27:32 UTC (rev 202799)
@@ -1,3 +1,14 @@
+2016-07-03  Per Arne Vollan  <[email protected]>
+
+        [Win] DLLs are missing version information.
+        https://bugs.webkit.org/show_bug.cgi?id=159349
+
+        Reviewed by Brent Fulgham.
+
+        Run perl version stamp utility.
+        
+        * CMakeLists.txt:
+
 2016-07-01  Yusuke Suzuki  <[email protected]>
 
         [JSC] MacroAssemblerX86::branch8 should accept unsigned 8bit value

Modified: trunk/Source/WTF/ChangeLog (202798 => 202799)


--- trunk/Source/WTF/ChangeLog	2016-07-04 05:59:26 UTC (rev 202798)
+++ trunk/Source/WTF/ChangeLog	2016-07-04 06:27:32 UTC (rev 202799)
@@ -1,3 +1,15 @@
+2016-07-03  Per Arne Vollan  <[email protected]>
+
+        [Win] DLLs are missing version information.
+        https://bugs.webkit.org/show_bug.cgi?id=159349
+
+        Reviewed by Brent Fulgham.
+
+        Generate autoversion.h in the prebuild step.
+        Run the perl version stamp utility.
+
+        * wtf/CMakeLists.txt:
+
 2016-07-03  Saam Barati  <[email protected]>
 
         BytecodeGenerator::getVariablesUnderTDZ is too conservative

Modified: trunk/Source/WTF/wtf/CMakeLists.txt (202798 => 202799)


--- trunk/Source/WTF/wtf/CMakeLists.txt	2016-07-04 05:59:26 UTC (rev 202798)
+++ trunk/Source/WTF/wtf/CMakeLists.txt	2016-07-04 06:27:32 UTC (rev 202799)
@@ -294,4 +294,17 @@
 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 (202798 => 202799)


--- trunk/Source/WebKit/CMakeLists.txt	2016-07-04 05:59:26 UTC (rev 202798)
+++ trunk/Source/WebKit/CMakeLists.txt	2016-07-04 06:27:32 UTC (rev 202799)
@@ -56,3 +56,12 @@
 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 (202798 => 202799)


--- trunk/Source/WebKit/ChangeLog	2016-07-04 05:59:26 UTC (rev 202798)
+++ trunk/Source/WebKit/ChangeLog	2016-07-04 06:27:32 UTC (rev 202799)
@@ -1,3 +1,16 @@
+2016-07-03  Per Arne Vollan  <[email protected]>
+
+        [Win] DLLs are missing version information.
+        https://bugs.webkit.org/show_bug.cgi?id=159349
+
+        Reviewed by Brent Fulgham.
+
+        WTF will generate autoversion.h in the prebuild step.
+        Run the perl version stamp utility.
+
+        * CMakeLists.txt:
+        * PlatformWin.cmake:
+
 2016-06-21  Anders Carlsson  <[email protected]>
 
         Rename NoncopyableFunction to Function

Modified: trunk/Source/WebKit/PlatformWin.cmake (202798 => 202799)


--- trunk/Source/WebKit/PlatformWin.cmake	2016-07-04 05:59:26 UTC (rev 202798)
+++ trunk/Source/WebKit/PlatformWin.cmake	2016-07-04 06:27:32 UTC (rev 202799)
@@ -371,15 +371,8 @@
     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