Title: [203134] trunk/Source
- Revision
- 203134
- Author
- [email protected]
- Date
- 2016-07-12 16:14:11 -0700 (Tue, 12 Jul 2016)
Log Message
[Win] Fix for build error when trying to version stamp dll.
https://bugs.webkit.org/show_bug.cgi?id=159692
Reviewed by Brent Fulgham.
Use correct path to version stamp script.
Source/_javascript_Core:
* CMakeLists.txt:
Source/WebKit:
* CMakeLists.txt:
Source/WTF:
* wtf/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (203133 => 203134)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2016-07-12 22:43:20 UTC (rev 203133)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2016-07-12 23:14:11 UTC (rev 203134)
@@ -1365,6 +1365,6 @@
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>
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_DIR} $<TARGET_FILE:_javascript_Core>
VERBATIM)
endif ()
Modified: trunk/Source/_javascript_Core/ChangeLog (203133 => 203134)
--- trunk/Source/_javascript_Core/ChangeLog 2016-07-12 22:43:20 UTC (rev 203133)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-07-12 23:14:11 UTC (rev 203134)
@@ -1,3 +1,14 @@
+2016-07-12 Per Arne Vollan <[email protected]>
+
+ [Win] Fix for build error when trying to version stamp dll.
+ https://bugs.webkit.org/show_bug.cgi?id=159692
+
+ Reviewed by Brent Fulgham.
+
+ Use correct path to version stamp script.
+
+ * CMakeLists.txt:
+
2016-07-12 Benjamin Poulain <[email protected]>
[JSC] Array.prototype.join() fails some conformance tests
Modified: trunk/Source/WTF/ChangeLog (203133 => 203134)
--- trunk/Source/WTF/ChangeLog 2016-07-12 22:43:20 UTC (rev 203133)
+++ trunk/Source/WTF/ChangeLog 2016-07-12 23:14:11 UTC (rev 203134)
@@ -1,3 +1,14 @@
+2016-07-12 Per Arne Vollan <[email protected]>
+
+ [Win] Fix for build error when trying to version stamp dll.
+ https://bugs.webkit.org/show_bug.cgi?id=159692
+
+ Reviewed by Brent Fulgham.
+
+ Use correct path to version stamp script.
+
+ * wtf/CMakeLists.txt:
+
2016-07-12 Benjamin Poulain <[email protected]>
[JSC] Array.prototype.join() fails some conformance tests
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (203133 => 203134)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2016-07-12 22:43:20 UTC (rev 203133)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2016-07-12 23:14:11 UTC (rev 203134)
@@ -317,6 +317,6 @@
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>
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_DIR} $<TARGET_FILE:WTF>
VERBATIM)
endif ()
Modified: trunk/Source/WebKit/CMakeLists.txt (203133 => 203134)
--- trunk/Source/WebKit/CMakeLists.txt 2016-07-12 22:43:20 UTC (rev 203133)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-07-12 23:14:11 UTC (rev 203134)
@@ -61,6 +61,6 @@
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>
+ 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 (203133 => 203134)
--- trunk/Source/WebKit/ChangeLog 2016-07-12 22:43:20 UTC (rev 203133)
+++ trunk/Source/WebKit/ChangeLog 2016-07-12 23:14:11 UTC (rev 203134)
@@ -1,5 +1,16 @@
2016-07-12 Per Arne Vollan <[email protected]>
+ [Win] Fix for build error when trying to version stamp dll.
+ https://bugs.webkit.org/show_bug.cgi?id=159692
+
+ Reviewed by Brent Fulgham.
+
+ Use correct path to version stamp script.
+
+ * CMakeLists.txt:
+
+2016-07-12 Per Arne Vollan <[email protected]>
+
[Win] DLLs are missing version information.
https://bugs.webkit.org/show_bug.cgi?id=159349
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
