Title: [203138] branches/safari-602.1.40-branch/Source
- Revision
- 203138
- Author
- [email protected]
- Date
- 2016-07-12 16:57:12 -0700 (Tue, 12 Jul 2016)
Log Message
Merged r203134. rdar://problem/27312176
Modified Paths
Diff
Modified: branches/safari-602.1.40-branch/Source/_javascript_Core/CMakeLists.txt (203137 => 203138)
--- branches/safari-602.1.40-branch/Source/_javascript_Core/CMakeLists.txt 2016-07-12 23:49:21 UTC (rev 203137)
+++ branches/safari-602.1.40-branch/Source/_javascript_Core/CMakeLists.txt 2016-07-12 23:57:12 UTC (rev 203138)
@@ -1361,6 +1361,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: branches/safari-602.1.40-branch/Source/_javascript_Core/ChangeLog (203137 => 203138)
--- branches/safari-602.1.40-branch/Source/_javascript_Core/ChangeLog 2016-07-12 23:49:21 UTC (rev 203137)
+++ branches/safari-602.1.40-branch/Source/_javascript_Core/ChangeLog 2016-07-12 23:57:12 UTC (rev 203138)
@@ -1,5 +1,20 @@
2016-07-12 Babak Shafiei <[email protected]>
+ Merge r203134.
+
+ 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 Babak Shafiei <[email protected]>
+
Merge r203111.
2016-07-12 Per Arne Vollan <[email protected]>
Modified: branches/safari-602.1.40-branch/Source/WTF/ChangeLog (203137 => 203138)
--- branches/safari-602.1.40-branch/Source/WTF/ChangeLog 2016-07-12 23:49:21 UTC (rev 203137)
+++ branches/safari-602.1.40-branch/Source/WTF/ChangeLog 2016-07-12 23:57:12 UTC (rev 203138)
@@ -1,5 +1,20 @@
2016-07-12 Babak Shafiei <[email protected]>
+ Merge r203134.
+
+ 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 Babak Shafiei <[email protected]>
+
Merge r203111.
2016-07-12 Per Arne Vollan <[email protected]>
Modified: branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt (203137 => 203138)
--- branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt 2016-07-12 23:49:21 UTC (rev 203137)
+++ branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt 2016-07-12 23:57:12 UTC (rev 203138)
@@ -304,6 +304,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: branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt (203137 => 203138)
--- branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt 2016-07-12 23:49:21 UTC (rev 203137)
+++ branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt 2016-07-12 23:57:12 UTC (rev 203138)
@@ -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: branches/safari-602.1.40-branch/Source/WebKit/ChangeLog (203137 => 203138)
--- branches/safari-602.1.40-branch/Source/WebKit/ChangeLog 2016-07-12 23:49:21 UTC (rev 203137)
+++ branches/safari-602.1.40-branch/Source/WebKit/ChangeLog 2016-07-12 23:57:12 UTC (rev 203138)
@@ -1,5 +1,20 @@
2016-07-12 Babak Shafiei <[email protected]>
+ Merge r203134.
+
+ 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 Babak Shafiei <[email protected]>
+
Merge r203111.
2016-07-12 Per Arne Vollan <[email protected]>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
