[Win] DLLs are missing version information.
authorpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Jul 2016 11:14:43 +0000 (11:14 +0000)
committerpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Jul 2016 11:14:43 +0000 (11:14 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203111 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/cmake/tools/scripts/version-stamp.pl
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/scripts/version-stamp.pl

index 1af5e53..fa45d63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-07-12  Per Arne Vollan  <pvollan@apple.com>
+
+        [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.
+
 2016-07-05  Olivier Blin  <olivier.blin@softathome.com>
 
         ENABLE_MEDIA_SOURCE should depend on ENABLE_VIDEO
index c19e621..57482f0 100644 (file)
@@ -1354,3 +1354,17 @@ endif ()
 
 add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})
 add_dependencies(JavaScriptCore stageSharedScripts)
+
+if (MSVC)
+    add_custom_command(
+        TARGET JavaScriptCore
+        PRE_BUILD
+        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_DIR}
+        VERBATIM)
+
+    add_custom_command(
+        TARGET JavaScriptCore
+        POST_BUILD
+        COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/WebKitLibraries/win/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_DIR} $<TARGET_FILE:JavaScriptCore>
+        VERBATIM)
+endif ()
index d607326..5fd6cd0 100644 (file)
@@ -1,3 +1,14 @@
+2016-07-12  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] DLLs are missing version information.
+        https://bugs.webkit.org/show_bug.cgi?id=159349
+
+        Reviewed by Brent Fulgham.
+
+        Generate autoversion.h and run perl version stamp utility.
+
+        * CMakeLists.txt:
+
 2016-07-11  Caio Lima  <ticaiolima@gmail.com>
 
         ECMAScript 2016: %TypedArray%.prototype.includes implementation
index 8f8d712..c98ed15 100644 (file)
@@ -1,3 +1,14 @@
+2016-07-12  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] DLLs are missing version information.
+        https://bugs.webkit.org/show_bug.cgi?id=159349
+
+        Reviewed by Brent Fulgham.
+
+        Generate autoversion.h and run perl version stamp utility.
+
+        * wtf/CMakeLists.txt:
+
 2016-07-11  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Implement grapheme cluster iterator on StringView
index 6ecdce6..0d3cf96 100644 (file)
@@ -307,4 +307,16 @@ WEBKIT_FRAMEWORK(WTF)
 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_DIR}
+        VERBATIM)
+
+    add_custom_command(
+        TARGET WTF
+        POST_BUILD
+        COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/WebKitLibraries/win/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_DIR} $<TARGET_FILE:WTF>
+        VERBATIM)
 endif ()
index 0ced054..cc1f606 100644 (file)
@@ -56,3 +56,11 @@ endif ()
 if (APPLE)
     set_target_properties(WebKit PROPERTIES LINK_FLAGS "-umbrella WebKit")
 endif ()
+
+if (MSVC)
+    add_custom_command(
+        TARGET WebKit
+        POST_BUILD
+        COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/WebKitLibraries/win/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:WebKit>
+        VERBATIM)
+endif ()
index 79485a7..5f66ece 100644 (file)
@@ -1,3 +1,14 @@
+2016-07-12  Per Arne Vollan  <pvollan@apple.com>
+
+        [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-11  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r203064.
index 7e023c5..497fc43 100644 (file)
@@ -89,6 +89,9 @@ print "Processing version $components{'__VERSION_TEXT__'} for $target\n";
 
 my $TARGET_PATH = File::Spec->canonpath($target);
 
+# Replace forward slashes with backslashes in case we are running Cygwin Perl.
+$TARGET_PATH =~ s/\//\\/g;
+
 print "Adjusting RC_PROJECTSOURCEVERSION and RC_ProjectSourceVersion to be safe for VersionStamper.\n";
 
 my $SAFE_PROJECT_VERSION = "$components{'__FULL_BUILD_MAJOR_VERSION__'}.$components{'__VERSION_MINOR__'}.$components{'__VERSION_TINY__'}";
index e85f710..25d8281 100644 (file)
@@ -1,3 +1,14 @@
+2016-07-12  Per Arne Vollan  <pvollan@apple.com>
+
+        [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.
+
+        * win/tools/scripts/version-stamp.pl: Replace forward slashes with backslashes.
+
 2016-06-14  Lucas Forschler  <lforschler@apple.com>
 
         Update existing WebKitSystemInterface Libraries.
index 7e023c5..497fc43 100644 (file)
@@ -89,6 +89,9 @@ print "Processing version $components{'__VERSION_TEXT__'} for $target\n";
 
 my $TARGET_PATH = File::Spec->canonpath($target);
 
+# Replace forward slashes with backslashes in case we are running Cygwin Perl.
+$TARGET_PATH =~ s/\//\\/g;
+
 print "Adjusting RC_PROJECTSOURCEVERSION and RC_ProjectSourceVersion to be safe for VersionStamper.\n";
 
 my $SAFE_PROJECT_VERSION = "$components{'__FULL_BUILD_MAJOR_VERSION__'}.$components{'__VERSION_MINOR__'}.$components{'__VERSION_TINY__'}";