Changeset 109837 in webkit


Ignore:
Timestamp:
Mar 5, 2012, 7:37:47 PM (13 years ago)
Author:
[email protected]
Message:

Source/JavaScriptCore: Update JavaScriptCore 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 JavaScriptCore.xcodeproj to install WTF headers into $BUILD/usr/local/include (WebCore, WebKit were already setup to look there, but JavaScriptCore.xcodeproj was not installing headers there.)
  2. Makes JavaScriptCore targets include $BUILD/usr/local/include in their header search path, as that's where the WTF headers will be installed.
  3. Similarly updates JavaScriptCore.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 JavaScriptCore 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:

Tools: Update JavaScriptCore 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:
Location:
trunk
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/tests/JSNode.c

    r35900 r109837  
    3131#include "Node.h"
    3232#include "NodeList.h"
    33 #include "UnusedParam.h"
     33#include <wtf/UnusedParam.h>
    3434#include <wtf/Assertions.h>
    3535

  • trunk/Source/JavaScriptCore/API/tests/JSNodeList.c

    r35900 r109837  
    2828#include "JSObjectRef.h"
    2929#include "JSValueRef.h"
    30 #include "UnusedParam.h"
     30#include <wtf/UnusedParam.h>
    3131#include <wtf/Assertions.h>
    3232

  • trunk/Source/JavaScriptCore/ChangeLog

    r109834 r109837  
     12012-03-05  Eric Seidel  <[email protected]>
     2
     3        Update JavaScriptCore files to use fully-qualified WTF include paths
     4        https://bugs.webkit.org/show_bug.cgi?id=79960
     5
     6        Reviewed by Adam Barth.
     7
     8        This change does 5 small/related things:
     9         1. Updates JavaScriptCore.xcodeproj to install WTF headers into $BUILD/usr/local/include
     10            (WebCore, WebKit were already setup to look there, but JavaScriptCore.xcodeproj
     11            was not installing headers there.)
     12         2. Makes JavaScriptCore targets include $BUILD/usr/local/include in their
     13            header search path, as that's where the WTF headers will be installed.
     14         3. Similarly updates JavaScriptCore.vcproj/copy-files.cmd to copy WTF headers to PrivateHeaders/wtf/*
     15            in addition to the current behavior of flattening all headers to PrivateHeaders/*.h.
     16         4. Updates a bunch of JSC files to use #include <wtf/Foo.h> instead of #include "Foo.h"
     17            since soon the WTF headers will not be part of the JavaScriptCore Xcode project.
     18         5. Makes build-webkit build the WTF XCode project by default.
     19
     20        * API/tests/JSNode.c:
     21        * API/tests/JSNodeList.c:
     22        * Configurations/Base.xcconfig:
     23        * assembler/MacroAssemblerCodeRef.h:
     24        * bytecompiler/BytecodeGenerator.h:
     25        * dfg/DFGOperations.cpp:
     26        * heap/GCAssertions.h:
     27        * heap/HandleHeap.h:
     28        * heap/HandleStack.h:
     29        * heap/MarkedSpace.h:
     30        * heap/PassWeak.h:
     31        * heap/Strong.h:
     32        * heap/Weak.h:
     33        * jit/HostCallReturnValue.cpp:
     34        * jit/JIT.cpp:
     35        * jit/JITStubs.cpp:
     36        * jit/ThunkGenerators.cpp:
     37        * parser/Lexer.cpp:
     38        * runtime/Completion.cpp:
     39        * runtime/Executable.cpp:
     40        * runtime/Identifier.h:
     41        * runtime/InitializeThreading.cpp:
     42        * runtime/JSDateMath.cpp:
     43        * runtime/JSGlobalObjectFunctions.cpp:
     44        * runtime/JSStringBuilder.h:
     45        * runtime/JSVariableObject.h:
     46        * runtime/NumberPrototype.cpp:
     47        * runtime/WriteBarrier.h:
     48        * tools/CodeProfile.cpp:
     49        * tools/TieredMMapArray.h:
     50        * yarr/YarrJIT.cpp:
     51
    1522012-03-05  Oliver Hunt  <[email protected]>
    253

  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r108363 r109837  
    7272WARNING_CFLAGS_macosx_ppc64 = $(WARNING_CFLAGS_BASE);
    7373WARNING_CFLAGS_macosx_x86_64 = $(WARNING_CFLAGS_BASE);
    74 HEADER_SEARCH_PATHS = . icu $(HEADER_SEARCH_PATHS);
     74HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
    7575
    7676CLANG_CXX_LIBRARY = $(CLANG_CXX_LIBRARY_$(TARGET_MAC_OS_X_VERSION_MAJOR));

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd

    r108444 r109837  
    5959)
    6060
     61echo Copying WTF headers...
     62for %%d in (
     63    wtf
     64    wtf\dtoa
     65    wtf\text
     66    wtf\threads
     67    wtf\unicode
     68    wtf\unicode\icu
     69) do (
     70    mkdir "%PrivateHeadersDirectory%\%%d" 2>NUL
     71    xcopy /y /d ..\..\%%d\*.h "%PrivateHeadersDirectory%\%%d" >NUL
     72)
     73
    6174echo Copying resources...
    6275mkdir "%ResourcesDirectory%" 2>NUL

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r109705 r109837  
    35033503                        buildPhases = (
    35043504                                5D2F7CF90C6875BB00B5B72B /* Update Info.plist with version information */,
     3505                                A8D7082715049EA2001063BC /* Copy WTF Headers */,
    35053506                                932F5B3F0822A1C700736975 /* Headers */,
    35063507                                932F5B910822A1C700736975 /* Sources */,
    … …  
    37303731                        shellPath = /bin/sh;
    37313732                        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";
     3733                };
     3734                A8D7082715049EA2001063BC /* Copy WTF Headers */ = {
     3735                        isa = PBXShellScriptBuildPhase;
     3736                        buildActionMask = 2147483647;
     3737                        files = (
     3738                        );
     3739                        inputPaths = (
     3740                        );
     3741                        name = "Copy WTF Headers";
     3742                        outputPaths = (
     3743                        );
     3744                        runOnlyForDeploymentPostprocessing = 0;
     3745                        shellPath = /bin/sh;
     3746                        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";
    37323747                };
    37333748/* End PBXShellScriptBuildPhase section */

  • trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

    r108444 r109837  
    2828
    2929#include "ExecutableAllocator.h"
    30 #include "PassRefPtr.h"
    31 #include "RefPtr.h"
    32 #include "UnusedParam.h"
     30#include <wtf/PassRefPtr.h>
     31#include <wtf/RefPtr.h>
     32#include <wtf/UnusedParam.h>
    3333
    3434// ASSERT_VALID_CODE_POINTER checks that ptr is a non-null pointer, and that it is a valid

  • trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h

    r108943 r109837  
    3333
    3434#include "CodeBlock.h"
    35 #include "HashTraits.h"
     35#include <wtf/HashTraits.h>
    3636#include "Instruction.h"
    3737#include "Label.h"

  • trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

    r109824 r109837  
    3232#include "HostCallReturnValue.h"
    3333#include "GetterSetter.h"
    34 #include "InlineASM.h"
     34#include <wtf/InlineASM.h>
    3535#include "Interpreter.h"
    3636#include "JSActivation.h"

  • trunk/Source/JavaScriptCore/heap/GCAssertions.h

    r107595 r109837  
    2727#define GCAssertions_h
    2828
    29 #include "Assertions.h"
     29#include <wtf/Assertions.h>
    3030
    3131#if ENABLE(GC_VALIDATION)

  • trunk/Source/JavaScriptCore/heap/HandleHeap.h

    r104900 r109837  
    2727#define HandleHeap_h
    2828
    29 #include "BlockStack.h"
     29#include <wtf/BlockStack.h>
    3030#include "Handle.h"
    31 #include "HashCountedSet.h"
    32 #include "SentinelLinkedList.h"
    33 #include "SinglyLinkedList.h"
     31#include <wtf/HashCountedSet.h>
     32#include <wtf/SentinelLinkedList.h>
     33#include <wtf/SinglyLinkedList.h>
    3434
    3535namespace JSC {

  • trunk/Source/JavaScriptCore/heap/HandleStack.h

    r95901 r109837  
    2727#define HandleStack_h
    2828
    29 #include "Assertions.h"
    30 #include "BlockStack.h"
     29#include <wtf/Assertions.h>
     30#include <wtf/BlockStack.h>
    3131#include "Handle.h"
    3232

  • trunk/Source/JavaScriptCore/heap/MarkedSpace.h

    r108444 r109837  
    2727#include "MarkedBlock.h"
    2828#include "MarkedBlockSet.h"
    29 #include "PageAllocationAligned.h"
     29#include <wtf/PageAllocationAligned.h>
    3030#include <wtf/Bitmap.h>
    3131#include <wtf/DoublyLinkedList.h>

  • trunk/Source/JavaScriptCore/heap/PassWeak.h

    r108010 r109837  
    2727#define PassWeak_h
    2828
    29 #include "Assertions.h"
     29#include <wtf/Assertions.h>
    3030#include "Handle.h"
    31 #include "NullPtr.h"
    32 #include "TypeTraits.h"
     31#include <wtf/NullPtr.h>
     32#include <wtf/TypeTraits.h>
    3333
    3434namespace JSC {

  • trunk/Source/JavaScriptCore/heap/Strong.h

    r96465 r109837  
    2727#define Strong_h
    2828
    29 #include "Assertions.h"
     29#include <wtf/Assertions.h>
    3030#include "Handle.h"
    3131#include "HandleHeap.h"

  • trunk/Source/JavaScriptCore/heap/Weak.h

    r108168 r109837  
    2727#define Weak_h
    2828
    29 #include "Assertions.h"
     29#include <wtf/Assertions.h>
    3030#include "Handle.h"
    3131#include "HandleHeap.h"

  • trunk/Source/JavaScriptCore/jit/HostCallReturnValue.cpp

    r108444 r109837  
    2828
    2929#include "CallFrame.h"
    30 #include "InlineASM.h"
     30#include <wtf/InlineASM.h>
    3131#include "JSObject.h"
    3232#include "JSValueInlineMethods.h"

  • trunk/Source/JavaScriptCore/jit/JIT.cpp

    r109834 r109837  
    3636
    3737#include "CodeBlock.h"
    38 #include "CryptographicallyRandomNumber.h"
     38#include <wtf/CryptographicallyRandomNumber.h>
    3939#include "DFGNode.h" // for DFG_SUCCESS_STATS
    4040#include "Interpreter.h"

  • trunk/Source/JavaScriptCore/jit/JITStubs.cpp

    r109824 r109837  
    4444#include "GetterSetter.h"
    4545#include "Heap.h"
    46 #include "InlineASM.h"
     46#include <wtf/InlineASM.h>
    4747#include "JIT.h"
    4848#include "JITExceptions.h"

  • trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp

    r106161 r109837  
    2828
    2929#include "CodeBlock.h"
    30 #include "InlineASM.h"
     30#include <wtf/InlineASM.h>
    3131#include "SpecializedThunkJIT.h"
    3232#include <wtf/text/StringImpl.h>

  • trunk/Source/JavaScriptCore/parser/Lexer.cpp

    r109769 r109837  
    3232#include "NodeInfo.h"
    3333#include "Nodes.h"
    34 #include "dtoa.h"
     34#include <wtf/dtoa.h>
    3535#include <ctype.h>
    3636#include <limits.h>

  • trunk/Source/JavaScriptCore/runtime/Completion.cpp

    r106197 r109837  
    3131#include "Parser.h"
    3232#include "Debugger.h"
    33 #include "WTFThreadData.h"
     33#include <wtf/WTFThreadData.h>
    3434#include <stdio.h>
    3535

  • trunk/Source/JavaScriptCore/runtime/Executable.cpp

    r109307 r109837  
    3535#include "Parser.h"
    3636#include "UStringBuilder.h"
    37 #include "Vector.h"
     37#include <wtf/Vector.h>
    3838
    3939namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/Identifier.h

    r104900 r109837  
    2323
    2424#include "JSGlobalData.h"
    25 #include "ThreadSpecific.h"
     25#include <wtf/ThreadSpecific.h>
    2626#include "UString.h"
    2727#include <wtf/WTFThreadData.h>

  • trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp

    r103083 r109837  
    3838#include "UString.h"
    3939#include "WriteBarrier.h"
    40 #include "dtoa.h"
     40#include <wtf/dtoa.h>
    4141#include <wtf/Threading.h>
    4242#include <wtf/dtoa/cached-powers.h>

  • trunk/Source/JavaScriptCore/runtime/JSDateMath.cpp

    r100205 r109837  
    7373#include "JSDateMath.h"
    7474
    75 #include "Assertions.h"
    76 #include "ASCIICType.h"
    7775#include "CurrentTime.h"
    7876#include "JSObject.h"
    … …  
    8785#include <stdint.h>
    8886#include <time.h>
     87#include <wtf/ASCIICType.h>
     88#include <wtf/Assertions.h>
    8989#include <wtf/text/StringBuilder.h>
    9090

  • trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

    r108259 r109837  
    3636#include "Parser.h"
    3737#include "UStringBuilder.h"
    38 #include "dtoa.h"
     38#include <wtf/dtoa.h>
    3939#include <stdio.h>
    4040#include <stdlib.h>

  • trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h

    r102146 r109837  
    3030#include "JSString.h"
    3131#include "UStringConcatenate.h"
    32 #include "Vector.h"
     32#include <wtf/Vector.h>
    3333
    3434namespace JSC {

  • trunk/Source/JavaScriptCore/runtime/JSVariableObject.h

    r108444 r109837  
    3333#include "Register.h"
    3434#include "SymbolTable.h"
    35 #include "UnusedParam.h"
     35#include <wtf/UnusedParam.h>
    3636#include <wtf/OwnArrayPtr.h>
    3737#include <wtf/UnusedParam.h>

  • trunk/Source/JavaScriptCore/runtime/NumberPrototype.cpp

    r105698 r109837  
    3030#include "Operations.h"
    3131#include "Uint16WithFraction.h"
    32 #include "dtoa.h"
     32#include <wtf/dtoa.h>
    3333#include <wtf/Assertions.h>
    3434#include <wtf/MathExtras.h>

  • trunk/Source/JavaScriptCore/runtime/WriteBarrier.h

    r107595 r109837  
    3131#include "Heap.h"
    3232#include "SamplingCounter.h"
    33 #include "TypeTraits.h"
     33#include <wtf/TypeTraits.h>
    3434
    3535namespace JSC {

  • trunk/Source/JavaScriptCore/tools/CodeProfile.cpp

    r108037 r109837  
    3131#include "LinkBuffer.h"
    3232#include "ProfileTreeNode.h"
    33 #include "Vector.h"
     33#include <wtf/Vector.h>
    3434#include <wtf/text/WTFString.h>
    3535

  • trunk/Source/JavaScriptCore/tools/TieredMMapArray.h

    r106197 r109837  
    2727#define TieredMMapArray_h
    2828
    29 #include "OSAllocator.h"
     29#include <wtf/OSAllocator.h>
    3030
    3131namespace JSC {

  • trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp

    r109834 r109837  
    2727#include "YarrJIT.h"
    2828
    29 #include "ASCIICType.h"
     29#include <wtf/ASCIICType.h>
    3030#include "LinkBuffer.h"
    3131#include "Yarr.h"

  • trunk/Tools/ChangeLog

    r109831 r109837  
     12012-03-05  Eric Seidel  <[email protected]>
     2
     3        Update JavaScriptCore files to use fully-qualified WTF include path
     4        https://bugs.webkit.org/show_bug.cgi?id=79960
     5
     6        Reviewed by Adam Barth.
     7
     8        Build WTF/WTF.xcodeproj by default on Mac.
     9
     10        * Scripts/build-webkit:
     11
    1122012-03-05  Dirk Pranke  <[email protected]>
    213

  • trunk/Tools/Scripts/build-webkit

    r109667 r109837  
    492492my @projects = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit");
    493493
     494# Build WTF as a separate static library on ports which support it.
     495splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit();
     496
    494497for my $dir (@projects) {
    495498    if (! -d $dir) {
Note: See TracChangeset for help on using the changeset viewer.