Changeset 202799 in webkit


Ignore:
Timestamp:
Jul 3, 2016 11:27:32 PM (8 years ago)
Author:
pvollan@apple.com
Message:

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

Reviewed by Brent Fulgham.

Source/JavaScriptCore:

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:
Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r202717 r202799  
    13511351add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})
    13521352add_dependencies(JavaScriptCore stageSharedScripts)
     1353
     1354if (MSVC)
     1355    add_custom_command(
     1356        TARGET JavaScriptCore
     1357        POST_BUILD
     1358        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:JavaScriptCore>
     1359        VERBATIM)
     1360endif ()
     1361

  • trunk/Source/JavaScriptCore/ChangeLog

    r202797 r202799  
     12016-07-03  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] DLLs are missing version information.
     4        https://bugs.webkit.org/show_bug.cgi?id=159349
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Run perl version stamp utility.
     9       
     10        * CMakeLists.txt:
     11
    1122016-07-01  Yusuke Suzuki  <utatane.tea@gmail.com>
    213

  • trunk/Source/WTF/ChangeLog

    r202795 r202799  
     12016-07-03  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] DLLs are missing version information.
     4        https://bugs.webkit.org/show_bug.cgi?id=159349
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Generate autoversion.h in the prebuild step.
     9        Run the perl version stamp utility.
     10
     11        * wtf/CMakeLists.txt:
     12
    1132016-07-03  Saam Barati  <sbarati@apple.com>
    214

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r201941 r202799  
    295295    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
    296296    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
     297
     298    add_custom_command(
     299        TARGET WTF
     300        PRE_BUILD
     301        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT_DIR}
     302        VERBATIM)
     303
     304    add_custom_command(
     305        TARGET WTF
     306        POST_BUILD
     307        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:WTF>
     308        VERBATIM)
     309
    297310endif ()

  • trunk/Source/WebKit/CMakeLists.txt

    r199289 r202799  
    5757    set_target_properties(WebKit PROPERTIES LINK_FLAGS "-umbrella WebKit")
    5858endif ()
     59
     60if (MSVC)
     61    add_custom_command(
     62        TARGET WebKit
     63        POST_BUILD
     64        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:WebKit>
     65        VERBATIM)
     66endif ()
     67

  • trunk/Source/WebKit/ChangeLog

    r202439 r202799  
     12016-07-03  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] DLLs are missing version information.
     4        https://bugs.webkit.org/show_bug.cgi?id=159349
     5
     6        Reviewed by Brent Fulgham.
     7
     8        WTF will generate autoversion.h in the prebuild step.
     9        Run the perl version stamp utility.
     10
     11        * CMakeLists.txt:
     12        * PlatformWin.cmake:
     13
    1142016-06-21  Anders Carlsson  <andersca@apple.com>
    215

  • trunk/Source/WebKit/PlatformWin.cmake

    r201908 r202799  
    372372    win/Interfaces/Accessible2/AccessibleText2.idl
    373373    win/Interfaces/Accessible2/IA2CommonTypes.idl
    374     "${DERIVED_SOURCES_WEBKIT_DIR}/include/autoversion.h"
    375 )
    376 
    377 add_custom_command(
    378     OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/include/autoversion.h
    379     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
    380     COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT_DIR}
    381     VERBATIM)
     374)
    382375
    383376GENERATE_INTERFACE(win/Interfaces/WebKit.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
Note: See TracChangeset for help on using the changeset viewer.