Title: [196016] tags/Safari-602.1.18.2
- Revision
- 196016
- Author
- [email protected]
- Date
- 2016-02-02 10:24:58 -0800 (Tue, 02 Feb 2016)
Log Message
Merged r195968. rdar://problem/24434627
Modified Paths
Diff
Modified: tags/Safari-602.1.18.2/ChangeLog (196015 => 196016)
--- tags/Safari-602.1.18.2/ChangeLog 2016-02-02 18:23:43 UTC (rev 196015)
+++ tags/Safari-602.1.18.2/ChangeLog 2016-02-02 18:24:58 UTC (rev 196016)
@@ -1,3 +1,17 @@
+2016-02-02 Babak Shafiei <[email protected]>
+
+ Merge r195968.
+
+ 2016-02-01 Alex Christensen <[email protected]>
+
+ [Win] WTFHeaderDetection.h no longer needed
+ https://bugs.webkit.org/show_bug.cgi?id=153753
+ rdar://problem/24434627
+
+ Reviewed by Darin Adler.
+
+ * Source/cmake/WebKitFS.cmake:
+
2016-01-27 Alexey Proskuryakov <[email protected]>
Remove ENABLE_CURRENTSRC
Modified: tags/Safari-602.1.18.2/Source/WTF/ChangeLog (196015 => 196016)
--- tags/Safari-602.1.18.2/Source/WTF/ChangeLog 2016-02-02 18:23:43 UTC (rev 196015)
+++ tags/Safari-602.1.18.2/Source/WTF/ChangeLog 2016-02-02 18:24:58 UTC (rev 196016)
@@ -1,3 +1,18 @@
+2016-02-02 Babak Shafiei <[email protected]>
+
+ Merge r195968.
+
+ 2016-02-01 Alex Christensen <[email protected]>
+
+ [Win] WTFHeaderDetection.h no longer needed
+ https://bugs.webkit.org/show_bug.cgi?id=153753
+ rdar://problem/24434627
+
+ Reviewed by Darin Adler.
+
+ * wtf/Platform.h:
+ * wtf/PlatformWin.cmake:
+
2016-01-28 Darin Adler <[email protected]>
Remove equalIgnoringCase since all callers really wanted equalIgnoringASCIICase
Modified: tags/Safari-602.1.18.2/Source/WTF/wtf/Platform.h (196015 => 196016)
--- tags/Safari-602.1.18.2/Source/WTF/wtf/Platform.h 2016-02-02 18:23:43 UTC (rev 196015)
+++ tags/Safari-602.1.18.2/Source/WTF/wtf/Platform.h 2016-02-02 18:24:58 UTC (rev 196016)
@@ -653,8 +653,6 @@
#define HAVE_ALIGNED_MALLOC 1
#define HAVE_ISDEBUGGERPRESENT 1
-#include <WTF/WTFHeaderDetection.h>
-
#endif
#if OS(WINDOWS)
Modified: tags/Safari-602.1.18.2/Source/WTF/wtf/PlatformWin.cmake (196015 => 196016)
--- tags/Safari-602.1.18.2/Source/WTF/wtf/PlatformWin.cmake 2016-02-02 18:23:43 UTC (rev 196015)
+++ tags/Safari-602.1.18.2/Source/WTF/wtf/PlatformWin.cmake 2016-02-02 18:24:58 UTC (rev 196016)
@@ -25,20 +25,8 @@
)
endif ()
-list(APPEND WTF_HEADERS
- "${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
-)
-
set(WTF_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WTF/preBuild.cmd")
file(WRITE "${WTF_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n")
file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF)
-# FIXME: This should run testOSXLevel.cmd if it is available.
-# https://bugs.webkit.org/show_bug.cgi?id=135861
-add_custom_command(
- OUTPUT "${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
- WORKING_DIRECTORY "${DERIVED_SOURCES_WTF_DIR}"
- COMMAND echo /* No Legible Output Support Found */ > WTFHeaderDetection.h
- VERBATIM)
-
set(WTF_OUTPUT_NAME WTF${DEBUG_SUFFIX})
Modified: tags/Safari-602.1.18.2/Source/cmake/WebKitFS.cmake (196015 => 196016)
--- tags/Safari-602.1.18.2/Source/cmake/WebKitFS.cmake 2016-02-02 18:23:43 UTC (rev 196015)
+++ tags/Safari-602.1.18.2/Source/cmake/WebKitFS.cmake 2016-02-02 18:24:58 UTC (rev 196016)
@@ -30,10 +30,8 @@
set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
-set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WTF_DIR})
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/_javascript_Core/runtime)
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
