Title: [195968] trunk
Revision
195968
Author
achristen...@apple.com
Date
2016-02-01 11:05:43 -0800 (Mon, 01 Feb 2016)

Log Message

[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:

Source/WTF:

* wtf/Platform.h:
* wtf/PlatformWin.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (195967 => 195968)


--- trunk/ChangeLog	2016-02-01 18:24:40 UTC (rev 195967)
+++ trunk/ChangeLog	2016-02-01 19:05:43 UTC (rev 195968)
@@ -1,3 +1,13 @@
+2016-02-01  Alex Christensen  <achristen...@webkit.org>
+
+        [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-31  Joonghun Park  <jh718.p...@samsung.com>
 
         [EFL] All API tests are broken on 15.10

Modified: trunk/Source/WTF/ChangeLog (195967 => 195968)


--- trunk/Source/WTF/ChangeLog	2016-02-01 18:24:40 UTC (rev 195967)
+++ trunk/Source/WTF/ChangeLog	2016-02-01 19:05:43 UTC (rev 195968)
@@ -1,3 +1,14 @@
+2016-02-01  Alex Christensen  <achristen...@webkit.org>
+
+        [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-31  Darin Adler  <da...@apple.com>
 
         Cut down on calls to String::lower; mostly replace with convertToASCIILowercase

Modified: trunk/Source/WTF/wtf/Platform.h (195967 => 195968)


--- trunk/Source/WTF/wtf/Platform.h	2016-02-01 18:24:40 UTC (rev 195967)
+++ trunk/Source/WTF/wtf/Platform.h	2016-02-01 19:05:43 UTC (rev 195968)
@@ -659,8 +659,6 @@
 #define HAVE_ALIGNED_MALLOC 1
 #define HAVE_ISDEBUGGERPRESENT 1
 
-#include <WTF/WTFHeaderDetection.h>
-
 #endif
 
 #if OS(WINDOWS)

Modified: trunk/Source/WTF/wtf/PlatformWin.cmake (195967 => 195968)


--- trunk/Source/WTF/wtf/PlatformWin.cmake	2016-02-01 18:24:40 UTC (rev 195967)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake	2016-02-01 19:05:43 UTC (rev 195968)
@@ -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: trunk/Source/cmake/WebKitFS.cmake (195967 => 195968)


--- trunk/Source/cmake/WebKitFS.cmake	2016-02-01 18:24:40 UTC (rev 195967)
+++ trunk/Source/cmake/WebKitFS.cmake	2016-02-01 19:05:43 UTC (rev 195968)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to