Changeset 203111 in webkit


Ignore:
Timestamp:
Jul 12, 2016 4:14:43 AM (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.

.:

The version stamping will fail if the target path has forward slashes.

  • Source/cmake/tools/scripts/version-stamp.pl: Replace forward slashes with backslashes.

Source/JavaScriptCore:

Generate autoversion.h and run perl version stamp utility.

  • CMakeLists.txt:

Source/WebKit:

Run perl version stamp utility.

  • CMakeLists.txt:

Source/WTF:

Generate autoversion.h and run perl version stamp utility.

  • wtf/CMakeLists.txt:

WebKitLibraries:

The version stamping will fail if the target path has forward slashes.

  • win/tools/scripts/version-stamp.pl: Replace forward slashes with backslashes.
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r202850 r203111  
     12016-07-12  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        The version stamping will fail if the target path has forward slashes.
     9
     10        * Source/cmake/tools/scripts/version-stamp.pl: Replace forward slashes with backslashes.
     11
    1122016-07-05  Olivier Blin  <olivier.blin@softathome.com>
    213
  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r203081 r203111  
    13551355add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})
    13561356add_dependencies(JavaScriptCore stageSharedScripts)
     1357
     1358if (MSVC)
     1359    add_custom_command(
     1360        TARGET JavaScriptCore
     1361        PRE_BUILD
     1362        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_DIR}
     1363        VERBATIM)
     1364
     1365    add_custom_command(
     1366        TARGET JavaScriptCore
     1367        POST_BUILD
     1368        COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/WebKitLibraries/win/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_DIR} $<TARGET_FILE:JavaScriptCore>
     1369        VERBATIM)
     1370endif ()
  • trunk/Source/JavaScriptCore/ChangeLog

    r203107 r203111  
     12016-07-12  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 and run perl version stamp utility.
     9
     10        * CMakeLists.txt:
     11
    1122016-07-11  Caio Lima  <ticaiolima@gmail.com>
    213
  • trunk/Source/WTF/ChangeLog

    r203078 r203111  
     12016-07-12  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 and run perl version stamp utility.
     9
     10        * wtf/CMakeLists.txt:
     11
    1122016-07-11  Myles C. Maxfield  <mmaxfield@apple.com>
    213
  • trunk/Source/WTF/wtf/CMakeLists.txt

    r203038 r203111  
    308308    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
    309309    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
     310
     311    add_custom_command(
     312        TARGET WTF
     313        PRE_BUILD
     314        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_DIR}
     315        VERBATIM)
     316
     317    add_custom_command(
     318        TARGET WTF
     319        POST_BUILD
     320        COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/WebKitLibraries/win/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_DIR} $<TARGET_FILE:WTF>
     321        VERBATIM)
    310322endif ()
  • trunk/Source/WebKit/CMakeLists.txt

    r202987 r203111  
    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} ${CMAKE_SOURCE_DIR}/WebKitLibraries/win/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:WebKit>
     65        VERBATIM)
     66endif ()
  • trunk/Source/WebKit/ChangeLog

    r203079 r203111  
     12016-07-12  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-11  Commit Queue  <commit-queue@webkit.org>
    213
  • trunk/Source/cmake/tools/scripts/version-stamp.pl

    r172982 r203111  
    9090my $TARGET_PATH = File::Spec->canonpath($target);
    9191
     92# Replace forward slashes with backslashes in case we are running Cygwin Perl.
     93$TARGET_PATH =~ s/\//\\/g;
     94
    9295print "Adjusting RC_PROJECTSOURCEVERSION and RC_ProjectSourceVersion to be safe for VersionStamper.\n";
    9396
  • trunk/WebKitLibraries/ChangeLog

    r202045 r203111  
     12016-07-12  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        The version stamping will fail if the target path has forward slashes.
     9
     10        * win/tools/scripts/version-stamp.pl: Replace forward slashes with backslashes.
     11
    1122016-06-14  Lucas Forschler  <lforschler@apple.com>
    213
  • trunk/WebKitLibraries/win/tools/scripts/version-stamp.pl

    r172982 r203111  
    9090my $TARGET_PATH = File::Spec->canonpath($target);
    9191
     92# Replace forward slashes with backslashes in case we are running Cygwin Perl.
     93$TARGET_PATH =~ s/\//\\/g;
     94
    9295print "Adjusting RC_PROJECTSOURCEVERSION and RC_ProjectSourceVersion to be safe for VersionStamper.\n";
    9396
Note: See TracChangeset for help on using the changeset viewer.