Unreviewed, rolling out r109837.

http://trac.webkit.org/changeset/109837
https://bugs.webkit.org/show_bug.cgi?id=80399

breaks Mac Productions builds, too late to try and fix it
tonight (Requested by eseidel on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-03-06

Source/JavaScriptCore:

* API/tests/JSNode.c:
* API/tests/JSNodeList.c:
* Configurations/Base.xcconfig:
* JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd:
* JavaScriptCore.xcodeproj/project.pbxproj:
* 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:

Tools:

* Scripts/build-webkit:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@109888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 03a27fc2
......@@ -30,7 +30,7 @@
#include "JSValueRef.h"
#include "Node.h"
#include "NodeList.h"
#include <wtf/UnusedParam.h>
#include "UnusedParam.h"
#include <wtf/Assertions.h>
static JSValueRef JSNode_appendChild(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
......
......@@ -27,7 +27,7 @@
#include "JSNodeList.h"
#include "JSObjectRef.h"
#include "JSValueRef.h"
#include <wtf/UnusedParam.h>
#include "UnusedParam.h"
#include <wtf/Assertions.h>
static JSValueRef JSNodeList_item(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
......
2012-03-06 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r109837.
http://trac.webkit.org/changeset/109837
https://bugs.webkit.org/show_bug.cgi?id=80399
breaks Mac Productions builds, too late to try and fix it
tonight (Requested by eseidel on #webkit).
* API/tests/JSNode.c:
* API/tests/JSNodeList.c:
* Configurations/Base.xcconfig:
* JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd:
* JavaScriptCore.xcodeproj/project.pbxproj:
* 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-06 Zoltan Herczeg <zherczeg@webkit.org>
[Qt][ARM] Speculative buildfix after r109834.
......@@ -71,7 +71,7 @@ WARNING_CFLAGS_macosx_ppc = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
// FIXME: JavaScriptCore 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 "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
HEADER_SEARCH_PATHS = . icu $(HEADER_SEARCH_PATHS);
CLANG_CXX_LIBRARY = $(CLANG_CXX_LIBRARY_$(TARGET_MAC_OS_X_VERSION_MAJOR));
CLANG_CXX_LIBRARY_1060 = libstdc++;
......
......@@ -58,19 +58,6 @@ for %%d in (
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 ..\JavaScriptCore.resources\* "%ResourcesDirectory%" >NUL
......
......@@ -3502,7 +3502,6 @@
buildConfigurationList = 149C275D08902AFE008A9EFC /* Build configuration list for PBXNativeTarget "JavaScriptCore" */;
buildPhases = (
5D2F7CF90C6875BB00B5B72B /* Update Info.plist with version information */,
A8D7082715049EA2001063BC /* Copy WTF Headers */,
932F5B3F0822A1C700736975 /* Headers */,
932F5B910822A1C700736975 /* Sources */,
932F5BD20822A1C700736975 /* Frameworks */,
......@@ -3731,20 +3730,6 @@
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 */
......
......@@ -27,9 +27,9 @@
#define MacroAssemblerCodeRef_h
#include "ExecutableAllocator.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/UnusedParam.h>
#include "PassRefPtr.h"
#include "RefPtr.h"
#include "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).
......
......@@ -32,7 +32,7 @@
#define BytecodeGenerator_h
#include "CodeBlock.h"
#include <wtf/HashTraits.h>
#include "HashTraits.h"
#include "Instruction.h"
#include "Label.h"
#include "LabelScope.h"
......
......@@ -31,7 +31,7 @@
#include "DFGRepatch.h"
#include "HostCallReturnValue.h"
#include "GetterSetter.h"
#include <wtf/InlineASM.h>
#include "InlineASM.h"
#include "Interpreter.h"
#include "JSActivation.h"
#include "JSByteArray.h"
......
......@@ -26,7 +26,7 @@
#ifndef GCAssertions_h
#define GCAssertions_h
#include <wtf/Assertions.h>
#include "Assertions.h"
#if ENABLE(GC_VALIDATION)
#define ASSERT_GC_OBJECT_LOOKS_VALID(cell) do { \
......
......@@ -26,11 +26,11 @@
#ifndef HandleHeap_h
#define HandleHeap_h
#include <wtf/BlockStack.h>
#include "BlockStack.h"
#include "Handle.h"
#include <wtf/HashCountedSet.h>
#include <wtf/SentinelLinkedList.h>
#include <wtf/SinglyLinkedList.h>
#include "HashCountedSet.h"
#include "SentinelLinkedList.h"
#include "SinglyLinkedList.h"
namespace JSC {
......
......@@ -26,8 +26,8 @@
#ifndef HandleStack_h
#define HandleStack_h
#include <wtf/Assertions.h>
#include <wtf/BlockStack.h>
#include "Assertions.h"
#include "BlockStack.h"
#include "Handle.h"
#include <wtf/UnusedParam.h>
......
......@@ -26,7 +26,7 @@
#include "MarkedAllocator.h"
#include "MarkedBlock.h"
#include "MarkedBlockSet.h"
#include <wtf/PageAllocationAligned.h>
#include "PageAllocationAligned.h"
#include <wtf/Bitmap.h>
#include <wtf/DoublyLinkedList.h>
#include <wtf/FixedArray.h>
......
......@@ -26,10 +26,10 @@
#ifndef PassWeak_h
#define PassWeak_h
#include <wtf/Assertions.h>
#include "Assertions.h"
#include "Handle.h"
#include <wtf/NullPtr.h>
#include <wtf/TypeTraits.h>
#include "NullPtr.h"
#include "TypeTraits.h"
namespace JSC {
......
......@@ -26,7 +26,7 @@
#ifndef Strong_h
#define Strong_h
#include <wtf/Assertions.h>
#include "Assertions.h"
#include "Handle.h"
#include "HandleHeap.h"
......
......@@ -26,7 +26,7 @@
#ifndef Weak_h
#define Weak_h
#include <wtf/Assertions.h>
#include "Assertions.h"
#include "Handle.h"
#include "HandleHeap.h"
#include "JSGlobalData.h"
......
......@@ -27,7 +27,7 @@
#include "HostCallReturnValue.h"
#include "CallFrame.h"
#include <wtf/InlineASM.h>
#include "InlineASM.h"
#include "JSObject.h"
#include "JSValueInlineMethods.h"
#include "ScopeChain.h"
......
......@@ -35,7 +35,7 @@ JSC::MacroAssemblerX86Common::SSE2CheckState JSC::MacroAssemblerX86Common::s_sse
#endif
#include "CodeBlock.h"
#include <wtf/CryptographicallyRandomNumber.h>
#include "CryptographicallyRandomNumber.h"
#include "DFGNode.h" // for DFG_SUCCESS_STATS
#include "Interpreter.h"
#include "JITInlineMethods.h"
......
......@@ -43,7 +43,7 @@
#include "ExceptionHelpers.h"
#include "GetterSetter.h"
#include "Heap.h"
#include <wtf/InlineASM.h>
#include "InlineASM.h"
#include "JIT.h"
#include "JITExceptions.h"
#include "JSActivation.h"
......
......@@ -27,7 +27,7 @@
#include "ThunkGenerators.h"
#include "CodeBlock.h"
#include <wtf/InlineASM.h>
#include "InlineASM.h"
#include "SpecializedThunkJIT.h"
#include <wtf/text/StringImpl.h>
......
......@@ -31,7 +31,7 @@
#include "Identifier.h"
#include "NodeInfo.h"
#include "Nodes.h"
#include <wtf/dtoa.h>
#include "dtoa.h"
#include <ctype.h>
#include <limits.h>
#include <string.h>
......
......@@ -30,7 +30,7 @@
#include "Interpreter.h"
#include "Parser.h"
#include "Debugger.h"
#include <wtf/WTFThreadData.h>
#include "WTFThreadData.h"
#include <stdio.h>
namespace JSC {
......
......@@ -34,7 +34,7 @@
#include "JITDriver.h"
#include "Parser.h"
#include "UStringBuilder.h"
#include <wtf/Vector.h>
#include "Vector.h"
namespace JSC {
......
......@@ -22,7 +22,7 @@
#define Identifier_h
#include "JSGlobalData.h"
#include <wtf/ThreadSpecific.h>
#include "ThreadSpecific.h"
#include "UString.h"
#include <wtf/WTFThreadData.h>
#include <wtf/text/CString.h>
......
......@@ -37,7 +37,7 @@
#include "JSGlobalObject.h"
#include "UString.h"
#include "WriteBarrier.h"
#include <wtf/dtoa.h>
#include "dtoa.h"
#include <wtf/Threading.h>
#include <wtf/dtoa/cached-powers.h>
......
......@@ -72,6 +72,8 @@
#include "config.h"
#include "JSDateMath.h"
#include "Assertions.h"
#include "ASCIICType.h"
#include "CurrentTime.h"
#include "JSObject.h"
#include "MathExtras.h"
......@@ -84,8 +86,6 @@
#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)
......
......@@ -35,7 +35,7 @@
#include "Nodes.h"
#include "Parser.h"
#include "UStringBuilder.h"
#include <wtf/dtoa.h>
#include "dtoa.h"
#include <stdio.h>
#include <stdlib.h>
#include <wtf/ASCIICType.h>
......
......@@ -29,7 +29,7 @@
#include "ExceptionHelpers.h"
#include "JSString.h"
#include "UStringConcatenate.h"
#include <wtf/Vector.h>
#include "Vector.h"
namespace JSC {
......
......@@ -32,7 +32,7 @@
#include "JSObject.h"
#include "Register.h"
#include "SymbolTable.h"
#include <wtf/UnusedParam.h>
#include "UnusedParam.h"
#include <wtf/OwnArrayPtr.h>
#include <wtf/UnusedParam.h>
......
......@@ -29,7 +29,7 @@
#include "JSString.h"
#include "Operations.h"
#include "Uint16WithFraction.h"
#include <wtf/dtoa.h>
#include "dtoa.h"
#include <wtf/Assertions.h>
#include <wtf/MathExtras.h>
#include <wtf/Vector.h>
......
......@@ -30,7 +30,7 @@
#include "HandleTypes.h"
#include "Heap.h"
#include "SamplingCounter.h"
#include <wtf/TypeTraits.h>
#include "TypeTraits.h"
namespace JSC {
......
......@@ -30,7 +30,7 @@
#include "CodeProfiling.h"
#include "LinkBuffer.h"
#include "ProfileTreeNode.h"
#include <wtf/Vector.h>
#include "Vector.h"
#include <wtf/text/WTFString.h>
#if PLATFORM(MAC)
......
......@@ -26,7 +26,7 @@
#ifndef TieredMMapArray_h
#define TieredMMapArray_h
#include <wtf/OSAllocator.h>
#include "OSAllocator.h"
namespace JSC {
......
......@@ -26,7 +26,7 @@
#include "config.h"
#include "YarrJIT.h"
#include <wtf/ASCIICType.h>
#include "ASCIICType.h"
#include "LinkBuffer.h"
#include "Yarr.h"
......
2012-03-06 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r109837.
http://trac.webkit.org/changeset/109837
https://bugs.webkit.org/show_bug.cgi?id=80399
breaks Mac Productions builds, too late to try and fix it
tonight (Requested by eseidel on #webkit).
* Scripts/build-webkit:
2012-03-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[Qt] Use correct define names for HAVE(FOO) style optional dependencies
......@@ -491,9 +491,6 @@ sub unlinkZeroFiles()
# Check that all the project directories are there.
my @projects = ("Source/JavaScriptCore", "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";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment