Diff
Modified: trunk/Source/_javascript_Core/API/tests/JSNode.c (109836 => 109837)
--- trunk/Source/_javascript_Core/API/tests/JSNode.c 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/API/tests/JSNode.c 2012-03-06 03:37:47 UTC (rev 109837)
@@ -30,7 +30,7 @@
#include "JSValueRef.h"
#include "Node.h"
#include "NodeList.h"
-#include "UnusedParam.h"
+#include <wtf/UnusedParam.h>
#include <wtf/Assertions.h>
static JSValueRef JSNode_appendChild(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
Modified: trunk/Source/_javascript_Core/API/tests/JSNodeList.c (109836 => 109837)
--- trunk/Source/_javascript_Core/API/tests/JSNodeList.c 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/API/tests/JSNodeList.c 2012-03-06 03:37:47 UTC (rev 109837)
@@ -27,7 +27,7 @@
#include "JSNodeList.h"
#include "JSObjectRef.h"
#include "JSValueRef.h"
-#include "UnusedParam.h"
+#include <wtf/UnusedParam.h>
#include <wtf/Assertions.h>
static JSValueRef JSNodeList_item(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
Modified: trunk/Source/_javascript_Core/ChangeLog (109836 => 109837)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-06 03:37:47 UTC (rev 109837)
@@ -1,3 +1,54 @@
+2012-03-05 Eric Seidel <[email protected]>
+
+ Update _javascript_Core files to use fully-qualified WTF include paths
+ https://bugs.webkit.org/show_bug.cgi?id=79960
+
+ Reviewed by Adam Barth.
+
+ This change does 5 small/related things:
+ 1. Updates _javascript_Core.xcodeproj to install WTF headers into $BUILD/usr/local/include
+ (WebCore, WebKit were already setup to look there, but _javascript_Core.xcodeproj
+ was not installing headers there.)
+ 2. Makes _javascript_Core targets include $BUILD/usr/local/include in their
+ header search path, as that's where the WTF headers will be installed.
+ 3. Similarly updates _javascript_Core.vcproj/copy-files.cmd to copy WTF headers to PrivateHeaders/wtf/*
+ in addition to the current behavior of flattening all headers to PrivateHeaders/*.h.
+ 4. Updates a bunch of JSC files to use #include <wtf/Foo.h> instead of #include "Foo.h"
+ since soon the WTF headers will not be part of the _javascript_Core Xcode project.
+ 5. Makes build-webkit build the WTF XCode project by default.
+
+ * API/tests/JSNode.c:
+ * API/tests/JSNodeList.c:
+ * Configurations/Base.xcconfig:
+ * assembler/MacroAssemblerCodeRef.h:
+ * bytecompiler/BytecodeGenerator.h:
+ * dfg/DFGOperations.cpp:
+ * heap/GCAssertions.h:
+ * heap/HandleHeap.h:
+ * heap/HandleStack.h:
+ * heap/MarkedSpace.h:
+ * heap/PassWeak.h:
+ * heap/Strong.h:
+ * heap/Weak.h:
+ * jit/HostCallReturnValue.cpp:
+ * jit/JIT.cpp:
+ * jit/JITStubs.cpp:
+ * jit/ThunkGenerators.cpp:
+ * parser/Lexer.cpp:
+ * runtime/Completion.cpp:
+ * runtime/Executable.cpp:
+ * runtime/Identifier.h:
+ * runtime/InitializeThreading.cpp:
+ * runtime/JSDateMath.cpp:
+ * runtime/JSGlobalObjectFunctions.cpp:
+ * runtime/JSStringBuilder.h:
+ * runtime/JSVariableObject.h:
+ * runtime/NumberPrototype.cpp:
+ * runtime/WriteBarrier.h:
+ * tools/CodeProfile.cpp:
+ * tools/TieredMMapArray.h:
+ * yarr/YarrJIT.cpp:
+
2012-03-05 Oliver Hunt <[email protected]>
Add basic support for constant blinding to the JIT
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (109836 => 109837)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2012-03-06 03:37:47 UTC (rev 109837)
@@ -71,7 +71,7 @@
// FIXME: _javascript_Core 64-bit builds should build with -Wshorten-64-to-32
WARNING_CFLAGS_macosx_ppc64 = $(WARNING_CFLAGS_BASE);
WARNING_CFLAGS_macosx_x86_64 = $(WARNING_CFLAGS_BASE);
-HEADER_SEARCH_PATHS = . icu $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
CLANG_CXX_LIBRARY = $(CLANG_CXX_LIBRARY_$(TARGET_MAC_OS_X_VERSION_MAJOR));
CLANG_CXX_LIBRARY_1060 = libstdc++;
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/copy-files.cmd (109836 => 109837)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/copy-files.cmd 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/copy-files.cmd 2012-03-06 03:37:47 UTC (rev 109837)
@@ -58,6 +58,19 @@
xcopy /y /d ..\..\%%d\*.h "%PrivateHeadersDirectory%" >NUL
)
+echo Copying WTF headers...
+for %%d in (
+ wtf
+ wtf\dtoa
+ wtf\text
+ wtf\threads
+ wtf\unicode
+ wtf\unicode\icu
+) do (
+ mkdir "%PrivateHeadersDirectory%\%%d" 2>NUL
+ xcopy /y /d ..\..\%%d\*.h "%PrivateHeadersDirectory%\%%d" >NUL
+)
+
echo Copying resources...
mkdir "%ResourcesDirectory%" 2>NUL
xcopy /y /d ..\_javascript_Core.resources\* "%ResourcesDirectory%" >NUL
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (109836 => 109837)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2012-03-06 03:37:47 UTC (rev 109837)
@@ -3502,6 +3502,7 @@
buildConfigurationList = 149C275D08902AFE008A9EFC /* Build configuration list for PBXNativeTarget "_javascript_Core" */;
buildPhases = (
5D2F7CF90C6875BB00B5B72B /* Update Info.plist with version information */,
+ A8D7082715049EA2001063BC /* Copy WTF Headers */,
932F5B3F0822A1C700736975 /* Headers */,
932F5B910822A1C700736975 /* Sources */,
932F5BD20822A1C700736975 /* Frameworks */,
@@ -3730,6 +3731,20 @@
shellPath = /bin/sh;
shellScript = "if [ \"${TARGET_GCC_VERSION}\" = \"LLVM_COMPILER\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-exit-time-destructors ]; then\n ../../Tools/Scripts/check-for-exit-time-destructors || exit $?\nfi";
};
+ A8D7082715049EA2001063BC /* Copy WTF Headers */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Copy WTF Headers";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# WTF_PRIVATE_HEADERS_PATH will be replaced by PRIVATE_HEADERS_FOLDER_PATH\n# in the equivalent build-phase when WTF is its own project.\nWTF_PRIVATE_HEADERS_PATH=\"/usr/local/include\"\n\nif [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\nPRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%%/}${WTF_PRIVATE_HEADERS_PATH}\"\nelse\nPRIVATE_HEADERS_PATH=\"${DSTROOT%%/}${WTF_PRIVATE_HEADERS_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/wtf\" \"${PRIVATE_HEADERS_PATH}\"\n";
+ };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h (109836 => 109837)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -27,9 +27,9 @@
#define MacroAssemblerCodeRef_h
#include "ExecutableAllocator.h"
-#include "PassRefPtr.h"
-#include "RefPtr.h"
-#include "UnusedParam.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefPtr.h>
+#include <wtf/UnusedParam.h>
// ASSERT_VALID_CODE_POINTER checks that ptr is a non-null pointer, and that it is a valid
// instruction address on the platform (for example, check any alignment requirements).
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h (109836 => 109837)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -32,7 +32,7 @@
#define BytecodeGenerator_h
#include "CodeBlock.h"
-#include "HashTraits.h"
+#include <wtf/HashTraits.h>
#include "Instruction.h"
#include "Label.h"
#include "LabelScope.h"
Modified: trunk/Source/_javascript_Core/dfg/DFGOperations.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -31,7 +31,7 @@
#include "DFGRepatch.h"
#include "HostCallReturnValue.h"
#include "GetterSetter.h"
-#include "InlineASM.h"
+#include <wtf/InlineASM.h>
#include "Interpreter.h"
#include "JSActivation.h"
#include "JSByteArray.h"
Modified: trunk/Source/_javascript_Core/heap/GCAssertions.h (109836 => 109837)
--- trunk/Source/_javascript_Core/heap/GCAssertions.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/heap/GCAssertions.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -26,7 +26,7 @@
#ifndef GCAssertions_h
#define GCAssertions_h
-#include "Assertions.h"
+#include <wtf/Assertions.h>
#if ENABLE(GC_VALIDATION)
#define ASSERT_GC_OBJECT_LOOKS_VALID(cell) do { \
Modified: trunk/Source/_javascript_Core/heap/HandleHeap.h (109836 => 109837)
--- trunk/Source/_javascript_Core/heap/HandleHeap.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/heap/HandleHeap.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -26,11 +26,11 @@
#ifndef HandleHeap_h
#define HandleHeap_h
-#include "BlockStack.h"
+#include <wtf/BlockStack.h>
#include "Handle.h"
-#include "HashCountedSet.h"
-#include "SentinelLinkedList.h"
-#include "SinglyLinkedList.h"
+#include <wtf/HashCountedSet.h>
+#include <wtf/SentinelLinkedList.h>
+#include <wtf/SinglyLinkedList.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/heap/HandleStack.h (109836 => 109837)
--- trunk/Source/_javascript_Core/heap/HandleStack.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/heap/HandleStack.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -26,8 +26,8 @@
#ifndef HandleStack_h
#define HandleStack_h
-#include "Assertions.h"
-#include "BlockStack.h"
+#include <wtf/Assertions.h>
+#include <wtf/BlockStack.h>
#include "Handle.h"
#include <wtf/UnusedParam.h>
Modified: trunk/Source/_javascript_Core/heap/MarkedSpace.h (109836 => 109837)
--- trunk/Source/_javascript_Core/heap/MarkedSpace.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/heap/MarkedSpace.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -26,7 +26,7 @@
#include "MarkedAllocator.h"
#include "MarkedBlock.h"
#include "MarkedBlockSet.h"
-#include "PageAllocationAligned.h"
+#include <wtf/PageAllocationAligned.h>
#include <wtf/Bitmap.h>
#include <wtf/DoublyLinkedList.h>
#include <wtf/FixedArray.h>
Modified: trunk/Source/_javascript_Core/heap/PassWeak.h (109836 => 109837)
--- trunk/Source/_javascript_Core/heap/PassWeak.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/heap/PassWeak.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -26,10 +26,10 @@
#ifndef PassWeak_h
#define PassWeak_h
-#include "Assertions.h"
+#include <wtf/Assertions.h>
#include "Handle.h"
-#include "NullPtr.h"
-#include "TypeTraits.h"
+#include <wtf/NullPtr.h>
+#include <wtf/TypeTraits.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/heap/Strong.h (109836 => 109837)
--- trunk/Source/_javascript_Core/heap/Strong.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/heap/Strong.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -26,7 +26,7 @@
#ifndef Strong_h
#define Strong_h
-#include "Assertions.h"
+#include <wtf/Assertions.h>
#include "Handle.h"
#include "HandleHeap.h"
Modified: trunk/Source/_javascript_Core/heap/Weak.h (109836 => 109837)
--- trunk/Source/_javascript_Core/heap/Weak.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/heap/Weak.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -26,7 +26,7 @@
#ifndef Weak_h
#define Weak_h
-#include "Assertions.h"
+#include <wtf/Assertions.h>
#include "Handle.h"
#include "HandleHeap.h"
#include "JSGlobalData.h"
Modified: trunk/Source/_javascript_Core/jit/HostCallReturnValue.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/jit/HostCallReturnValue.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/jit/HostCallReturnValue.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -27,7 +27,7 @@
#include "HostCallReturnValue.h"
#include "CallFrame.h"
-#include "InlineASM.h"
+#include <wtf/InlineASM.h>
#include "JSObject.h"
#include "JSValueInlineMethods.h"
#include "ScopeChain.h"
Modified: trunk/Source/_javascript_Core/jit/JIT.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/jit/JIT.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/jit/JIT.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -35,7 +35,7 @@
#endif
#include "CodeBlock.h"
-#include "CryptographicallyRandomNumber.h"
+#include <wtf/CryptographicallyRandomNumber.h>
#include "DFGNode.h" // for DFG_SUCCESS_STATS
#include "Interpreter.h"
#include "JITInlineMethods.h"
Modified: trunk/Source/_javascript_Core/jit/JITStubs.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/jit/JITStubs.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/jit/JITStubs.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -43,7 +43,7 @@
#include "ExceptionHelpers.h"
#include "GetterSetter.h"
#include "Heap.h"
-#include "InlineASM.h"
+#include <wtf/InlineASM.h>
#include "JIT.h"
#include "JITExceptions.h"
#include "JSActivation.h"
Modified: trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -27,7 +27,7 @@
#include "ThunkGenerators.h"
#include "CodeBlock.h"
-#include "InlineASM.h"
+#include <wtf/InlineASM.h>
#include "SpecializedThunkJIT.h"
#include <wtf/text/StringImpl.h>
Modified: trunk/Source/_javascript_Core/parser/Lexer.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/parser/Lexer.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/parser/Lexer.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -31,7 +31,7 @@
#include "Identifier.h"
#include "NodeInfo.h"
#include "Nodes.h"
-#include "dtoa.h"
+#include <wtf/dtoa.h>
#include <ctype.h>
#include <limits.h>
#include <string.h>
Modified: trunk/Source/_javascript_Core/runtime/Completion.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/Completion.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/Completion.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -30,7 +30,7 @@
#include "Interpreter.h"
#include "Parser.h"
#include "Debugger.h"
-#include "WTFThreadData.h"
+#include <wtf/WTFThreadData.h>
#include <stdio.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/runtime/Executable.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/Executable.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/Executable.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -34,7 +34,7 @@
#include "JITDriver.h"
#include "Parser.h"
#include "UStringBuilder.h"
-#include "Vector.h"
+#include <wtf/Vector.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/runtime/Identifier.h (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/Identifier.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/Identifier.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -22,7 +22,7 @@
#define Identifier_h
#include "JSGlobalData.h"
-#include "ThreadSpecific.h"
+#include <wtf/ThreadSpecific.h>
#include "UString.h"
#include <wtf/WTFThreadData.h>
#include <wtf/text/CString.h>
Modified: trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -37,7 +37,7 @@
#include "JSGlobalObject.h"
#include "UString.h"
#include "WriteBarrier.h"
-#include "dtoa.h"
+#include <wtf/dtoa.h>
#include <wtf/Threading.h>
#include <wtf/dtoa/cached-powers.h>
Modified: trunk/Source/_javascript_Core/runtime/JSDateMath.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/JSDateMath.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/JSDateMath.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -72,8 +72,6 @@
#include "config.h"
#include "JSDateMath.h"
-#include "Assertions.h"
-#include "ASCIICType.h"
#include "CurrentTime.h"
#include "JSObject.h"
#include "MathExtras.h"
@@ -86,6 +84,8 @@
#include <limits>
#include <stdint.h>
#include <time.h>
+#include <wtf/ASCIICType.h>
+#include <wtf/Assertions.h>
#include <wtf/text/StringBuilder.h>
#if HAVE(ERRNO_H)
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObjectFunctions.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/JSGlobalObjectFunctions.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObjectFunctions.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -35,7 +35,7 @@
#include "Nodes.h"
#include "Parser.h"
#include "UStringBuilder.h"
-#include "dtoa.h"
+#include <wtf/dtoa.h>
#include <stdio.h>
#include <stdlib.h>
#include <wtf/ASCIICType.h>
Modified: trunk/Source/_javascript_Core/runtime/JSStringBuilder.h (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/JSStringBuilder.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/JSStringBuilder.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -29,7 +29,7 @@
#include "ExceptionHelpers.h"
#include "JSString.h"
#include "UStringConcatenate.h"
-#include "Vector.h"
+#include <wtf/Vector.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/runtime/JSVariableObject.h (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/JSVariableObject.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/JSVariableObject.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -32,7 +32,7 @@
#include "JSObject.h"
#include "Register.h"
#include "SymbolTable.h"
-#include "UnusedParam.h"
+#include <wtf/UnusedParam.h>
#include <wtf/OwnArrayPtr.h>
#include <wtf/UnusedParam.h>
Modified: trunk/Source/_javascript_Core/runtime/NumberPrototype.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/NumberPrototype.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/NumberPrototype.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -29,7 +29,7 @@
#include "JSString.h"
#include "Operations.h"
#include "Uint16WithFraction.h"
-#include "dtoa.h"
+#include <wtf/dtoa.h>
#include <wtf/Assertions.h>
#include <wtf/MathExtras.h>
#include <wtf/Vector.h>
Modified: trunk/Source/_javascript_Core/runtime/WriteBarrier.h (109836 => 109837)
--- trunk/Source/_javascript_Core/runtime/WriteBarrier.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/runtime/WriteBarrier.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -30,7 +30,7 @@
#include "HandleTypes.h"
#include "Heap.h"
#include "SamplingCounter.h"
-#include "TypeTraits.h"
+#include <wtf/TypeTraits.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/tools/CodeProfile.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/tools/CodeProfile.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/tools/CodeProfile.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -30,7 +30,7 @@
#include "CodeProfiling.h"
#include "LinkBuffer.h"
#include "ProfileTreeNode.h"
-#include "Vector.h"
+#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
#if PLATFORM(MAC)
Modified: trunk/Source/_javascript_Core/tools/TieredMMapArray.h (109836 => 109837)
--- trunk/Source/_javascript_Core/tools/TieredMMapArray.h 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/tools/TieredMMapArray.h 2012-03-06 03:37:47 UTC (rev 109837)
@@ -26,7 +26,7 @@
#ifndef TieredMMapArray_h
#define TieredMMapArray_h
-#include "OSAllocator.h"
+#include <wtf/OSAllocator.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/yarr/YarrJIT.cpp (109836 => 109837)
--- trunk/Source/_javascript_Core/yarr/YarrJIT.cpp 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Source/_javascript_Core/yarr/YarrJIT.cpp 2012-03-06 03:37:47 UTC (rev 109837)
@@ -26,7 +26,7 @@
#include "config.h"
#include "YarrJIT.h"
-#include "ASCIICType.h"
+#include <wtf/ASCIICType.h>
#include "LinkBuffer.h"
#include "Yarr.h"
Modified: trunk/Tools/ChangeLog (109836 => 109837)
--- trunk/Tools/ChangeLog 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Tools/ChangeLog 2012-03-06 03:37:47 UTC (rev 109837)
@@ -1,3 +1,14 @@
+2012-03-05 Eric Seidel <[email protected]>
+
+ Update _javascript_Core files to use fully-qualified WTF include path
+ https://bugs.webkit.org/show_bug.cgi?id=79960
+
+ Reviewed by Adam Barth.
+
+ Build WTF/WTF.xcodeproj by default on Mac.
+
+ * Scripts/build-webkit:
+
2012-03-05 Dirk Pranke <[email protected]>
There should be a way to disable optimizer in webkit-patch rebaseline-expectations
Modified: trunk/Tools/Scripts/build-webkit (109836 => 109837)
--- trunk/Tools/Scripts/build-webkit 2012-03-06 03:07:53 UTC (rev 109836)
+++ trunk/Tools/Scripts/build-webkit 2012-03-06 03:37:47 UTC (rev 109837)
@@ -491,6 +491,9 @@
# Check that all the project directories are there.
my @projects = ("Source/_javascript_Core", "Source/WebCore", "Source/WebKit");
+# Build WTF as a separate static library on ports which support it.
+splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit();
+
for my $dir (@projects) {
if (! -d $dir) {
die "Error: No $dir directory found. Please do a fresh checkout.\n";
