Changeset 173574 in webkit


Ignore:
Timestamp:
Sep 12, 2014 2:05:01 PM (10 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Message generation scripts should be installed in WebKit.framework
​https://bugs.webkit.org/show_bug.cgi?id=136771

Reviewed by Anders Carlsson.

  • DerivedSources.make: Updated for rename of Scripts/webkit2 to Scripts/webkit.
  • Scripts/generate-message-receiver.py:

(main): Updated for rename from webkit2 to webkit.

  • Scripts/generate-messages-header.py:

(main): Ditto.

  • Scripts/webkit: Renamed from Source/WebKit2/Scripts/webkit2.
  • Scripts/webkit/messages.py: Updated for rename.
  • Scripts/webkit/parser.py: Ditto.
  • WebKit2.xcodeproj/project.pbxproj: Moved the Copy Message Generation Scripts build phase

from the WebKit2 target to the WebKit target and changed its destination to
WebKit.framework/PrivateHeaders/Scripts/webkit. Removed the Remove Compiled Python Files
build phase, since compiled files no longer get copied.

Location:
trunk/Source/WebKit2
Files:
1 deleted
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r173573 r173574  
     12014-09-12  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Message generation scripts should be installed in WebKit.framework
     4        https://bugs.webkit.org/show_bug.cgi?id=136771
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * DerivedSources.make: Updated for rename of Scripts/webkit2 to Scripts/webkit.
     9        * Scripts/generate-message-receiver.py:
     10        (main): Updated for rename from webkit2 to webkit.
     11        * Scripts/generate-messages-header.py:
     12        (main): Ditto.
     13        * Scripts/webkit: Renamed from Source/WebKit2/Scripts/webkit2.
     14        * Scripts/webkit/messages.py: Updated for rename.
     15        * Scripts/webkit/parser.py: Ditto.
     16        * WebKit2.xcodeproj/project.pbxproj: Moved the Copy Message Generation Scripts build phase
     17        from the WebKit2 target to the WebKit target and changed its destination to
     18        WebKit.framework/PrivateHeaders/Scripts/webkit. Removed the Remove Compiled Python Files
     19        build phase, since compiled files no longer get copied.
     20
    1212014-09-12  Tim Horton  <timothy_horton@apple.com>
    222

  • trunk/Source/WebKit2/DerivedSources.make

    r173568 r173574  
    145145    $(WebKit2)/Scripts/generate-message-receiver.py \
    146146    $(WebKit2)/Scripts/generate-messages-header.py \
    147     $(WebKit2)/Scripts/webkit2/__init__.py \
    148     $(WebKit2)/Scripts/webkit2/messages.py \
    149     $(WebKit2)/Scripts/webkit2/model.py \
    150     $(WebKit2)/Scripts/webkit2/parser.py \
     147    $(WebKit2)/Scripts/webkit/__init__.py \
     148    $(WebKit2)/Scripts/webkit/messages.py \
     149    $(WebKit2)/Scripts/webkit/model.py \
     150    $(WebKit2)/Scripts/webkit/parser.py \
    151151#
    152152

  • trunk/Source/WebKit2/Scripts/generate-message-receiver.py

    r173568 r173574  
    2626import sys
    2727
    28 import webkit2.messages
     28import webkit.messages
    2929
    3030
    … …  
    3434    input_path = argv[1]
    3535    with open(input_path) as input_file:
    36         # Python 3, change to:  print(webkit2.messages.generate_message_handler(input_file), end='')
    37         sys.stdout.write(webkit2.messages.generate_message_handler(input_file))
     36        # Python 3, change to:  print(webkit.messages.generate_message_handler(input_file), end='')
     37        sys.stdout.write(webkit.messages.generate_message_handler(input_file))
    3838    return 0
    3939

  • trunk/Source/WebKit2/Scripts/generate-messages-header.py

    r173568 r173574  
    2626import sys
    2727
    28 import webkit2.messages
     28import webkit.messages
    2929
    3030
    … …  
    3434    input_path = argv[1]
    3535    with open(input_path) as input_file:
    36         # Python 3, change to:  print(webkit2.messages.generate_messages_header(input_file), end='')
    37         sys.stdout.write(webkit2.messages.generate_messages_header(input_file))
     36        # Python 3, change to:  print(webkit.messages.generate_messages_header(input_file), end='')
     37        sys.stdout.write(webkit.messages.generate_messages_header(input_file))
    3838    return 0
    3939

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

    r173568 r173574  
    18991899                        isa = PBXCopyFilesBuildPhase;
    19001900                        buildActionMask = 2147483647;
    1901                         dstPath = PrivateHeaders/webkit2;
     1901                        dstPath = PrivateHeaders/Scripts/webkit;
    19021902                        dstSubfolderSpec = 1;
    19031903                        files = (
    … …  
    20312031                0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScrollingTreeOverflowScrollingNodeIOS.mm; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm; sourceTree = "<group>"; };
    20322032                0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; };
    2033                 0FC0856E187CE0A900780D86 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = __init__.py; path = webkit2/__init__.py; sourceTree = "<group>"; };
    2034                 0FC0856F187CE0A900780D86 /* messages.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = messages.py; path = webkit2/messages.py; sourceTree = "<group>"; };
    2035                 0FC08570187CE0A900780D86 /* model.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = model.py; path = webkit2/model.py; sourceTree = "<group>"; };
    2036                 0FC08571187CE0A900780D86 /* parser.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = parser.py; path = webkit2/parser.py; sourceTree = "<group>"; };
     2033                0FC0856E187CE0A900780D86 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = __init__.py; path = webkit/__init__.py; sourceTree = "<group>"; };
     2034                0FC0856F187CE0A900780D86 /* messages.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = messages.py; path = webkit/messages.py; sourceTree = "<group>"; };
     2035                0FC08570187CE0A900780D86 /* model.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = model.py; path = webkit/model.py; sourceTree = "<group>"; };
     2036                0FC08571187CE0A900780D86 /* parser.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = parser.py; path = webkit/parser.py; sourceTree = "<group>"; };
    20372037                0FCB4E3618BBE044000FCFC9 /* PageClientImplIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PageClientImplIOS.h; path = ios/PageClientImplIOS.h; sourceTree = "<group>"; };
    20382038                0FCB4E3718BBE044000FCFC9 /* PageClientImplIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PageClientImplIOS.mm; path = ios/PageClientImplIOS.mm; sourceTree = "<group>"; };
    … …  
    78497849                        buildPhases = (
    78507850                                1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */,
    7851                                 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
    78527851                                1A6280CB191997BD006AD9F9 /* Sources */,
    78537852                                1A6280CC191997BD006AD9F9 /* Frameworks */,
    … …  
    79867985                                8DC2EF520486A6940098B216 /* Resources */,
    79877986                                7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
    7988                                 5D1A239215E760590023E981 /* Remove Compiled Python Files */,
     7987                                1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
    79897988                                8DC2EF540486A6940098B216 /* Sources */,
    79907989                                8DC2EF560486A6940098B216 /* Frameworks */,
    … …  
    84868485                        shellPath = /bin/sh;
    84878486                        shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n    rm ${WKBASE_H}.unifdef\n    ;;\n1)\n    mv ${WKBASE_H}{.unifdef,}\n    ;;\n*)\n    exit 1\nesac\n";
    8488                 };
    8489                 5D1A239215E760590023E981 /* Remove Compiled Python Files */ = {
    8490                         isa = PBXShellScriptBuildPhase;
    8491                         buildActionMask = 2147483647;
    8492                         files = (
    8493                         );
    8494                         inputPaths = (
    8495                         );
    8496                         name = "Remove Compiled Python Files";
    8497                         outputPaths = (
    8498                         );
    8499                         runOnlyForDeploymentPostprocessing = 0;
    8500                         shellPath = /bin/sh;
    8501                         shellScript = "find \"${BUILT_PRODUCTS_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\" -name '*.pyc' -delete";
    85028487                };
    85038488                5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = {
Note: See TracChangeset for help on using the changeset viewer.