Diff
Modified: branches/safari-602.1.40-branch/ChangeLog (203123 => 203124)
--- branches/safari-602.1.40-branch/ChangeLog 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/ChangeLog 2016-07-12 20:24:08 UTC (rev 203124)
@@ -1,3 +1,18 @@
+2016-07-12 Babak Shafiei <[email protected]>
+
+ Merge r203111.
+
+ 2016-07-12 Per Arne Vollan <[email protected]>
+
+ [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 <[email protected]>
ENABLE_MEDIA_SOURCE should depend on ENABLE_VIDEO
Modified: branches/safari-602.1.40-branch/Source/_javascript_Core/CMakeLists.txt (203123 => 203124)
--- branches/safari-602.1.40-branch/Source/_javascript_Core/CMakeLists.txt 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/Source/_javascript_Core/CMakeLists.txt 2016-07-12 20:24:08 UTC (rev 203124)
@@ -1350,3 +1350,17 @@
add_custom_target(stageSharedScripts DEPENDS ${_javascript_Core_SCRIPTS})
add_dependencies(_javascript_Core stageSharedScripts)
+
+if (MSVC)
+ add_custom_command(
+ TARGET _javascript_Core
+ PRE_BUILD
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_DIR}
+ VERBATIM)
+
+ add_custom_command(
+ TARGET _javascript_Core
+ POST_BUILD
+ COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/WebKitLibraries/win/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_DIR} $<TARGET_FILE:_javascript_Core>
+ VERBATIM)
+endif ()
Modified: branches/safari-602.1.40-branch/Source/_javascript_Core/ChangeLog (203123 => 203124)
--- branches/safari-602.1.40-branch/Source/_javascript_Core/ChangeLog 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/Source/_javascript_Core/ChangeLog 2016-07-12 20:24:08 UTC (rev 203124)
@@ -1,3 +1,18 @@
+2016-07-12 Babak Shafiei <[email protected]>
+
+ Merge r203111.
+
+ 2016-07-12 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 and run perl version stamp utility.
+
+ * CMakeLists.txt:
+
2016-07-08 Babak Shafiei <[email protected]>
Merge r202987.
Modified: branches/safari-602.1.40-branch/Source/WTF/ChangeLog (203123 => 203124)
--- branches/safari-602.1.40-branch/Source/WTF/ChangeLog 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/Source/WTF/ChangeLog 2016-07-12 20:24:08 UTC (rev 203124)
@@ -1,3 +1,18 @@
+2016-07-12 Babak Shafiei <[email protected]>
+
+ Merge r203111.
+
+ 2016-07-12 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 and run perl version stamp utility.
+
+ * wtf/CMakeLists.txt:
+
2016-07-08 Babak Shafiei <[email protected]>
Merge r202987.
Modified: branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt (203123 => 203124)
--- branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt 2016-07-12 20:24:08 UTC (rev 203124)
@@ -294,4 +294,16 @@
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 ()
Modified: branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt (203123 => 203124)
--- branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt 2016-07-12 20:24:08 UTC (rev 203124)
@@ -56,3 +56,11 @@
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 ()
Modified: branches/safari-602.1.40-branch/Source/WebKit/ChangeLog (203123 => 203124)
--- branches/safari-602.1.40-branch/Source/WebKit/ChangeLog 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/Source/WebKit/ChangeLog 2016-07-12 20:24:08 UTC (rev 203124)
@@ -1,3 +1,18 @@
+2016-07-12 Babak Shafiei <[email protected]>
+
+ Merge r203111.
+
+ 2016-07-12 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-08 Babak Shafiei <[email protected]>
Merge r202987.
Modified: branches/safari-602.1.40-branch/Source/cmake/tools/scripts/version-stamp.pl (203123 => 203124)
--- branches/safari-602.1.40-branch/Source/cmake/tools/scripts/version-stamp.pl 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/Source/cmake/tools/scripts/version-stamp.pl 2016-07-12 20:24:08 UTC (rev 203124)
@@ -89,6 +89,9 @@
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__'}";
Modified: branches/safari-602.1.40-branch/WebKitLibraries/ChangeLog (203123 => 203124)
--- branches/safari-602.1.40-branch/WebKitLibraries/ChangeLog 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/WebKitLibraries/ChangeLog 2016-07-12 20:24:08 UTC (rev 203124)
@@ -1,3 +1,18 @@
+2016-07-12 Babak Shafiei <[email protected]>
+
+ Merge r203111.
+
+ 2016-07-12 Per Arne Vollan <[email protected]>
+
+ [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 <[email protected]>
Update existing WebKitSystemInterface Libraries.
Modified: branches/safari-602.1.40-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl (203123 => 203124)
--- branches/safari-602.1.40-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2016-07-12 19:40:25 UTC (rev 203123)
+++ branches/safari-602.1.40-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2016-07-12 20:24:08 UTC (rev 203124)
@@ -89,6 +89,9 @@
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__'}";
