⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 292188 in webkit


Ignore:
Timestamp:
Mar 31, 2022, 5:14:57 PM (5 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, reverting r292183.
​https://bugs.webkit.org/show_bug.cgi?id=238639

Broke the Big Sur build

Reverted changeset:

"[XCBuild] WebKitLegacy's "Migrated headers" script does not
emit task information"
​https://bugs.webkit.org/show_bug.cgi?id=238409
​https://commits.webkit.org/r292183

Patch by Commit Queue <​commit-queue@webkit.org> on 2022-03-31

Location:
trunk
Files:
2 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r292185 r292188  
     12022-03-31  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r292183.
     4        https://bugs.webkit.org/show_bug.cgi?id=238639
     5
     6        Broke the Big Sur build
     7
     8        Reverted changeset:
     9
     10        "[XCBuild] WebKitLegacy's "Migrated headers" script does not
     11        emit task information"
     12        https://bugs.webkit.org/show_bug.cgi?id=238409
     13        https://commits.webkit.org/r292183
     14
    1152022-03-31  Commit Queue  <commit-queue@webkit.org>
    216

  • trunk/Source/WebKit/Configurations/WebKit.xcconfig

    r292183 r292188  
    196196INCLUDED_SOURCE_FILE_NAMES = $(INCLUDED_MIGRATED_HEADERS_$(WK_WHICH_BUILD_SYSTEM));
    197197INCLUDED_MIGRATED_HEADERS_not_legacy = $(INCLUDED_MIGRATED_HEADERS_$(USE_INTERNAL_SDK)_$(WK_COCOA_TOUCH)) $(INCLUDED_MIGRATED_HEADERS_$(ENABLE_IOS_TOUCH_EVENTS));
    198 // WebEventRegion.h is migrated when building for an iOS family target with an internal SDK...
     198// WebEventRegion.h is migrated when building for an iOS family target with an internal SDK…
    199199INCLUDED_MIGRATED_HEADERS_YES_cocoatouch = WebEventRegion.h;
    200 // ...or when --ios-touch-events was passed to build-webkit manually.
     200// …or when --ios-touch-events was passed to build-webkit manually.
    201201INCLUDED_MIGRATED_HEADERS_ENABLE_IOS_TOUCH_EVENTS = WebEventRegion.h;
    202202

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

    r292183 r292188  
    23792379                        isa = PBXBuildRule;
    23802380                        compilerSpec = com.apple.compilers.proxy.script;
    2381                         filePatterns = "*/Source/WebKitLegacy/*.h";
     2381                        filePatterns = "*/WebKitLegacy/*.h";
    23822382                        fileType = pattern.proxy;
    23832383                        inputFiles = (
    … …  
    23962396                        isa = PBXBuildRule;
    23972397                        compilerSpec = com.apple.compilers.proxy.script;
    2398                         filePatterns = "*/Source/WebCore/*.h";
     2398                        filePatterns = "*/WebCore/*.h";
    23992399                        fileType = pattern.proxy;
    24002400                        inputFiles = (

  • trunk/Source/WebKitLegacy/ChangeLog

    r292183 r292188  
     12022-03-31  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r292183.
     4        https://bugs.webkit.org/show_bug.cgi?id=238639
     5
     6        Broke the Big Sur build
     7
     8        Reverted changeset:
     9
     10        "[XCBuild] WebKitLegacy's "Migrated headers" script does not
     11        emit task information"
     12        https://bugs.webkit.org/show_bug.cgi?id=238409
     13        https://commits.webkit.org/r292183
     14
    1152022-03-31  Elliott Williams  <emw@apple.com>
    216

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

    r292183 r292188  
    647647                DD89682009AA87240097E7F0 /* WebElementDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = DD89681E09AA87240097E7F0 /* WebElementDictionary.h */; };
    648648                DD89682109AA87240097E7F0 /* WebElementDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */; };
    649                 DDF74C7E27EE3C740011F633 /* WebKitAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C7D27EE3C740011F633 /* WebKitAvailability.h */; settings = {ATTRIBUTES = (Private, ); }; };
    650                 DDF74C8027EE3CA70011F633 /* WebScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C7F27EE3CA60011F633 /* WebScriptObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
    651                 DDF74C8227EE3CAE0011F633 /* AbstractPasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C8127EE3CAE0011F633 /* AbstractPasteboard.h */; settings = {ATTRIBUTES = (Private, ); }; };
    652                 DDF74C8427EE3CBF0011F633 /* KeyEventCodesIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C8327EE3CBF0011F633 /* KeyEventCodesIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
    653                 DDF74C8627EE3CC70011F633 /* WAKAppKitStubs.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C8527EE3CC70011F633 /* WAKAppKitStubs.h */; settings = {ATTRIBUTES = (Private, ); }; };
    654                 DDF74C8827EE3CCD0011F633 /* WAKResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C8727EE3CCD0011F633 /* WAKResponder.h */; settings = {ATTRIBUTES = (Private, ); }; };
    655                 DDF74C8A27EE3CD10011F633 /* WAKView.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C8927EE3CD10011F633 /* WAKView.h */; settings = {ATTRIBUTES = (Private, ); }; };
    656                 DDF74C8C27EE3CD60011F633 /* WAKWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C8B27EE3CD60011F633 /* WAKWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
    657                 DDF74C8E27EE3CDB0011F633 /* WKContentObservation.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C8D27EE3CDB0011F633 /* WKContentObservation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    658                 DDF74C9027EE3CE10011F633 /* WKGraphics.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C8F27EE3CE10011F633 /* WKGraphics.h */; settings = {ATTRIBUTES = (Private, ); }; };
    659                 DDF74C9227EE3CE60011F633 /* WKTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C9127EE3CE60011F633 /* WKTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
    660                 DDF74C9427EE3CEE0011F633 /* WebCoreThread.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C9327EE3CEE0011F633 /* WebCoreThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
    661                 DDF74C9627EE3CF20011F633 /* WebCoreThreadMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C9527EE3CF20011F633 /* WebCoreThreadMessage.h */; settings = {ATTRIBUTES = (Private, ); }; };
    662                 DDF74C9827EE3CF90011F633 /* WebCoreThreadRun.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C9727EE3CF90011F633 /* WebCoreThreadRun.h */; settings = {ATTRIBUTES = (Private, ); }; };
    663                 DDF74C9A27EE3CFE0011F633 /* WebEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C9927EE3CFE0011F633 /* WebEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
    664                 DDF74C9C27EE3D050011F633 /* WebItemProviderPasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C9B27EE3D050011F633 /* WebItemProviderPasteboard.h */; settings = {ATTRIBUTES = (Private, ); }; };
    665                 DDF74C9E27EE3D0B0011F633 /* WebEventRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF74C9D27EE3D0B0011F633 /* WebEventRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
    666649                E13E782C1E5A7365001849D1 /* WebCreateFragmentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = E13E782B1E5A7365001849D1 /* WebCreateFragmentInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
    667650                E1531BD82187B954002E3F81 /* NSURLDownloadSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E1531BD72187B8F2002E3F81 /* NSURLDownloadSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    683666                        fileType = pattern.proxy;
    684667                        inputFiles = (
    685                                 "$(SRCROOT)/scripts/postprocess-header-rule",
    686668                        );
    687669                        isEditable = 1;
    … …  
    689671                                "$(HEADER_OUTPUT_DIR)/$(INPUT_FILE_NAME)",
    690672                        );
    691                         runOncePerArchitecture = 0;
    692                         script = "exec \"${SCRIPT_INPUT_FILE_0}\"\n";
    693                 };
    694                 DDF74C9F27EE3D6D0011F633 /* PBXBuildRule */ = {
    695                         isa = PBXBuildRule;
    696                         compilerSpec = com.apple.compilers.proxy.script;
    697                         filePatterns = "*/Source/WebCore/*.h";
    698                         fileType = pattern.proxy;
    699                         inputFiles = (
    700                                 "$(SRCROOT)/scripts/migrate-header-rule",
    701                         );
    702                         isEditable = 1;
    703                         name = "Migrate WebCore Headers";
    704                         outputFiles = (
    705                                 "$(HEADER_OUTPUT_DIR)/$(INPUT_FILE_NAME)",
    706                                 "$(DERIVED_FILE_DIR)/WebCore/$(INPUT_FILE_NAME)",
    707                                 "$(DERIVED_FILE_DIR)/WebCore/$(INPUT_FILE_BASE).exp",
    708                         );
    709                         runOncePerArchitecture = 0;
    710                         script = "\"${SCRIPT_INPUT_FILE_0}\"\n";
     673                        script = "exec \"${SRCROOT}/scripts/postprocess-header-rule\"\n";
    711674                };
    712675/* End PBXBuildRule section */
    … …  
    785748                1C68F665095B5FC100C2984E /* WebNodeHighlightView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNodeHighlightView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    786749                1C68F666095B5FC100C2984E /* WebNodeHighlightView.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = WebNodeHighlightView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     750                1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MigrateHeaders.make; path = mac/MigrateHeaders.make; sourceTree = "<group>"; };
    787751                1C7B0C650EB2464D00A28502 /* WebInspectorClientCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebInspectorClientCF.cpp; path = cf/WebCoreSupport/WebInspectorClientCF.cpp; sourceTree = SOURCE_ROOT; };
    788752                1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegatePrivate.h; sourceTree = "<group>"; };
    … …  
    15001464                DD89681E09AA87240097E7F0 /* WebElementDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebElementDictionary.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    15011465                DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebElementDictionary.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    1502                 DDF74C7D27EE3C740011F633 /* WebKitAvailability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebKitAvailability.h; path = ../WebCore/platform/cocoa/WebKitAvailability.h; sourceTree = "<group>"; };
    1503                 DDF74C7F27EE3CA60011F633 /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebScriptObject.h; path = ../WebCore/bridge/objc/WebScriptObject.h; sourceTree = "<group>"; };
    1504                 DDF74C8127EE3CAE0011F633 /* AbstractPasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AbstractPasteboard.h; path = ../WebCore/platform/ios/AbstractPasteboard.h; sourceTree = "<group>"; };
    1505                 DDF74C8327EE3CBF0011F633 /* KeyEventCodesIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyEventCodesIOS.h; path = ../WebCore/platform/ios/KeyEventCodesIOS.h; sourceTree = "<group>"; };
    1506                 DDF74C8527EE3CC70011F633 /* WAKAppKitStubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WAKAppKitStubs.h; path = ../WebCore/platform/ios/wak/WAKAppKitStubs.h; sourceTree = "<group>"; };
    1507                 DDF74C8727EE3CCD0011F633 /* WAKResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WAKResponder.h; path = ../WebCore/platform/ios/wak/WAKResponder.h; sourceTree = "<group>"; };
    1508                 DDF74C8927EE3CD10011F633 /* WAKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WAKView.h; path = ../WebCore/platform/ios/wak/WAKView.h; sourceTree = "<group>"; };
    1509                 DDF74C8B27EE3CD60011F633 /* WAKWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WAKWindow.h; path = ../WebCore/platform/ios/wak/WAKWindow.h; sourceTree = "<group>"; };
    1510                 DDF74C8D27EE3CDB0011F633 /* WKContentObservation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentObservation.h; path = ../WebCore/platform/ios/wak/WKContentObservation.h; sourceTree = "<group>"; };
    1511                 DDF74C8F27EE3CE10011F633 /* WKGraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKGraphics.h; path = ../WebCore/platform/ios/wak/WKGraphics.h; sourceTree = "<group>"; };
    1512                 DDF74C9127EE3CE60011F633 /* WKTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKTypes.h; path = ../WebCore/platform/ios/wak/WKTypes.h; sourceTree = "<group>"; };
    1513                 DDF74C9327EE3CEE0011F633 /* WebCoreThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreThread.h; path = ../WebCore/platform/ios/wak/WebCoreThread.h; sourceTree = "<group>"; };
    1514                 DDF74C9527EE3CF20011F633 /* WebCoreThreadMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreThreadMessage.h; path = ../WebCore/platform/ios/wak/WebCoreThreadMessage.h; sourceTree = "<group>"; };
    1515                 DDF74C9727EE3CF90011F633 /* WebCoreThreadRun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreThreadRun.h; path = ../WebCore/platform/ios/wak/WebCoreThreadRun.h; sourceTree = "<group>"; };
    1516                 DDF74C9927EE3CFE0011F633 /* WebEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebEvent.h; path = ../WebCore/platform/ios/WebEvent.h; sourceTree = "<group>"; };
    1517                 DDF74C9B27EE3D050011F633 /* WebItemProviderPasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebItemProviderPasteboard.h; path = ../WebCore/platform/ios/WebItemProviderPasteboard.h; sourceTree = "<group>"; };
    1518                 DDF74C9D27EE3D0B0011F633 /* WebEventRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebEventRegion.h; path = ../WebCore/page/ios/WebEventRegion.h; sourceTree = "<group>"; };
    1519                 DDF74CA627EED8500011F633 /* migrate-header-rule */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = "migrate-header-rule"; path = "scripts/migrate-header-rule"; sourceTree = "<group>"; };
    15201466                E13E782B1E5A7365001849D1 /* WebCreateFragmentInternal.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = WebCreateFragmentInternal.h; sourceTree = "<group>"; };
    15211467                E1531BD72187B8F2002E3F81 /* NSURLDownloadSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSURLDownloadSPI.h; sourceTree = "<group>"; };
    … …  
    15941540                        isa = PBXGroup;
    15951541                        children = (
     1542                                1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */,
    15961543                                5C9D925822D7E8AD008E9266 /* Sources.txt */,
    15971544                                5C9D925922D7E8AD008E9266 /* SourcesCocoa.txt */,
    … …  
    16031550                                7C671116251C2459004F4536 /* generate-unified-sources.sh */,
    16041551                                7C671117251C2459004F4536 /* generate-webkitversion.pl */,
    1605                                 DDF74CA627EED8500011F633 /* migrate-header-rule */,
    16061552                                7C671118251C2459004F4536 /* postprocess-header-rule */,
    16071553                                7C671119251C2483004F4536 /* check-xcfilelists.sh */,
    … …  
    16201566                                7C02320E251B8E3A00BA7BB6 /* Scripts */,
    16211567                                534F75362578AAE8005BE7D8 /* Modules */,
    1622                                 DDF74C7C27EE3BF40011F633 /* Migrated Headers */,
    16231568                                0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */,
    16241569                                034768DFFF38A50411DB9C8B /* Products */,
    … …  
    21712116                        );
    21722117                        name = ios;
    2173                         sourceTree = "<group>";
    2174                 };
    2175                 DDF74C7C27EE3BF40011F633 /* Migrated Headers */ = {
    2176                         isa = PBXGroup;
    2177                         children = (
    2178                                 DDF74C8127EE3CAE0011F633 /* AbstractPasteboard.h */,
    2179                                 DDF74C8327EE3CBF0011F633 /* KeyEventCodesIOS.h */,
    2180                                 DDF74C8527EE3CC70011F633 /* WAKAppKitStubs.h */,
    2181                                 DDF74C8727EE3CCD0011F633 /* WAKResponder.h */,
    2182                                 DDF74C8927EE3CD10011F633 /* WAKView.h */,
    2183                                 DDF74C8B27EE3CD60011F633 /* WAKWindow.h */,
    2184                                 DDF74C9327EE3CEE0011F633 /* WebCoreThread.h */,
    2185                                 DDF74C9527EE3CF20011F633 /* WebCoreThreadMessage.h */,
    2186                                 DDF74C9727EE3CF90011F633 /* WebCoreThreadRun.h */,
    2187                                 DDF74C9927EE3CFE0011F633 /* WebEvent.h */,
    2188                                 DDF74C9D27EE3D0B0011F633 /* WebEventRegion.h */,
    2189                                 DDF74C9B27EE3D050011F633 /* WebItemProviderPasteboard.h */,
    2190                                 DDF74C7D27EE3C740011F633 /* WebKitAvailability.h */,
    2191                                 DDF74C7F27EE3CA60011F633 /* WebScriptObject.h */,
    2192                                 DDF74C8D27EE3CDB0011F633 /* WKContentObservation.h */,
    2193                                 DDF74C8F27EE3CE10011F633 /* WKGraphics.h */,
    2194                                 DDF74C9127EE3CE60011F633 /* WKTypes.h */,
    2195                         );
    2196                         name = "Migrated Headers";
    21972118                        sourceTree = "<group>";
    21982119                };
    … …  
    26862607                        buildActionMask = 2147483647;
    26872608                        files = (
    2688                                 DDF74C8227EE3CAE0011F633 /* AbstractPasteboard.h in Headers */,
    26892609                                1A9119F71DB0470A0087D1FD /* BackForwardList.h in Headers */,
    26902610                                1A60519217502A5D00BC62F5 /* BinaryPropertyList.h in Headers */,
    … …  
    28992819                                1A60519417502A5D00BC62F5 /* HistoryPropertyList.h in Headers */,
    29002820                                9364006F23996E81001E185E /* InProcessIDBServer.h in Headers */,
    2901                                 DDF74C8427EE3CBF0011F633 /* KeyEventCodesIOS.h in Headers */,
    29022821                                5CA46E7821F1451D00CE86B4 /* NetworkStorageSessionMap.h in Headers */,
    29032822                                E1531BD82187B954002E3F81 /* NSURLDownloadSPI.h in Headers */,
    … …  
    29182837                                1A6B313D1A51F3A900422975 /* StorageTrackerClient.h in Headers */,
    29192838                                44DDD0822540F97F00836F81 /* TestingFunctions.h in Headers */,
    2920                                 DDF74C8627EE3CC70011F633 /* WAKAppKitStubs.h in Headers */,
    2921                                 DDF74C8827EE3CCD0011F633 /* WAKResponder.h in Headers */,
    2922                                 DDF74C8A27EE3CD10011F633 /* WAKView.h in Headers */,
    2923                                 DDF74C8C27EE3CD60011F633 /* WAKWindow.h in Headers */,
    29242839                                7C1FB3C21846E8E1001A03D8 /* WebAllowDenyPolicyListener.h in Headers */,
    29252840                                CEDA12DC152CBE6800D9E08D /* WebAlternativeTextClient.h in Headers */,
    … …  
    29442859                                065AD5A30B0C32C7005A2B1D /* WebContextMenuClient.h in Headers */,
    29452860                                939810160824BF01008DF038 /* WebCoreStatistics.h in Headers */,
    2946                                 DDF74C9427EE3CEE0011F633 /* WebCoreThread.h in Headers */,
    2947                                 DDF74C9627EE3CF20011F633 /* WebCoreThreadMessage.h in Headers */,
    2948                                 DDF74C9827EE3CF90011F633 /* WebCoreThreadRun.h in Headers */,
    29492861                                E13E782C1E5A7365001849D1 /* WebCreateFragmentInternal.h in Headers */,
    29502862                                93E2A1A4123B0B3C009FE12A /* WebDashboardRegion.h in Headers */,
    … …  
    29872899                                4BF99F900AE050BC00815C2B /* WebEditorClient.h in Headers */,
    29882900                                DD89682009AA87240097E7F0 /* WebElementDictionary.h in Headers */,
    2989                                 DDF74C9A27EE3CFE0011F633 /* WebEvent.h in Headers */,
    2990                                 DDF74C9E27EE3D0B0011F633 /* WebEventRegion.h in Headers */,
    29912901                                7C023214251B925C00BA7BB6 /* WebFeature.h in Headers */,
    29922902                                7C02321A251B988200BA7BB6 /* WebFeatureInternal.h in Headers */,
    … …  
    30342944                                B804176F1217A83100466BAE /* WebInspectorFrontend.h in Headers */,
    30352945                                7A8FF0D11075024A00A80A08 /* WebInspectorPrivate.h in Headers */,
    3036                                 DDF74C9C27EE3D050011F633 /* WebItemProviderPasteboard.h in Headers */,
    30372946                                939810420824BF01008DF038 /* WebJavaScriptTextInputPanel.h in Headers */,
    30382947                                37D1DCA81065928C0068F7EF /* WebJSPDFDoc.h in Headers */,
    30392948                                9398101B0824BF01008DF038 /* WebKit.h in Headers */,
    3040                                 DDF74C7E27EE3C740011F633 /* WebKitAvailability.h in Headers */,
    30412949                                9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */,
    30422950                                9398106D0824BF01008DF038 /* WebKitErrorsPrivate.h in Headers */,
    … …  
    31183026                                7E6FEF0808985A7200C44C3F /* WebScriptDebugDelegate.h in Headers */,
    31193027                                C0167BF80D7F5DD00028696E /* WebScriptDebugger.h in Headers */,
    3120                                 DDF74C8027EE3CA70011F633 /* WebScriptObject.h in Headers */,
    31213028                                C0B1F7E810AC8E3100C925D9 /* WebScriptWorld.h in Headers */,
    31223029                                C0B1F7EA10AC8E3100C925D9 /* WebScriptWorldInternal.h in Headers */,
    … …  
    31493056                                A10C1D781820300E0036883A /* WebVisiblePositionInternal.h in Headers */,
    31503057                                1AC7176F1A26568A002E3115 /* WebVisitedLinkStore.h in Headers */,
    3151                                 DDF74C8E27EE3CDB0011F633 /* WKContentObservation.h in Headers */,
    3152                                 DDF74C9027EE3CE10011F633 /* WKGraphics.h in Headers */,
    3153                                 DDF74C9227EE3CE60011F633 /* WKTypes.h in Headers */,
    31543058                        );
    31553059                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    31643068                                5D2F7DB70C687A5A00B5B72B /* Update Info.plist with version information */,
    31653069                                7C02321B251B9A8A00BA7BB6 /* Generate Preferences */,
     3070                                1C6CB0510AA63EB000D23BFD /* Migrate Headers */,
    31663071                                9398100D0824BF01008DF038 /* Headers */,
    3167                                 DDF74CA027EE3E990011F633 /* (Legacy) Install Headers */,
    31683072                                535E08CB2254637200DF00CA /* Copy Mig Files into Private Framework Headers */,
     3073                                A13EE61D185AE82700556064 /* Postprocess Headers */,
    31693074                                939810B20824BF01008DF038 /* Resources */,
    31703075                                1C395DE20C6BE8E0000D1E52 /* Generate Export Files */,
    … …  
    31803085                        );
    31813086                        buildRules = (
    3182                                 DDF74C9F27EE3D6D0011F633 /* PBXBuildRule */,
    31833087                                535E08C322545B4C00DF00CA /* PBXBuildRule */,
    31843088                        );
    … …  
    32763180                                "$(PROJECT_DIR)/mac/WebKit.mac.exp",
    32773181                                "$(PROJECT_DIR)/ios/WebKit.iOS.exp",
    3278                                 "$(DERIVED_FILE_DIR)/WebCore/",
     3182                                "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/ReexportedWebCoreSymbols.timestamp",
    32793183                        );
    32803184                        name = "Generate Export Files";
    32813185                        outputPaths = (
    3282                                 "$(EXPORTED_SYMBOLS_FILE)",
     3186                                "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp",
    32833187                        );
    32843188                        runOnlyForDeploymentPostprocessing = 0;
    32853189                        shellPath = /bin/sh;
    3286                         shellScript = "set -e\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy\"\n\nEXP_GENERATED=\"${EXPORTED_SYMBOLS_FILE}\"\n\n[[ -z \"${EXP_GENERATED}\" ]] && exit 1\n\nif [[ \"${WK_PLATFORM_NAME}\" != \"macosx\" ]]; then\n    EXP_WEBKIT_PLATFORM=\"${PROJECT_DIR}/ios/WebKit.iOS.exp\"\nelse\n    EXP_WEBKIT_PLATFORM=\"${PROJECT_DIR}/mac/WebKit.mac.exp\"\nfi\n\ncat \"${PROJECT_DIR}/mac/WebKit.exp\" > \"${EXP_GENERATED}\"\ncat \"${EXP_WEBKIT_PLATFORM}\" >> \"${EXP_GENERATED}\"\n\nif [ \"${WK_PLATFORM_NAME}\" != \"macosx\" ]; then\n    echo >> \"${EXP_GENERATED}\"\n    echo \"# Reexported from migrated WebCore headers\" >> \"${EXP_GENERATED}\"\n    cat \"${SCRIPT_INPUT_FILE_3}\"/*.exp >> \"${EXP_GENERATED}\"\nfi\n\nif [[ \"${WK_BUILD_FOR_TESTING}\" == \"YES\" ]]; then\n    cat \"${PROJECT_DIR}/mac/WebKit.Testing.exp\" >> \"${EXP_GENERATED}\"\nfi\n";
     3190                        shellScript = "set -e\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy\"\n\nEXP_GENERATED=\"${EXPORTED_SYMBOLS_FILE}\"\n\n[[ -z \"${EXP_GENERATED}\" ]] && exit 1\n\nif [[ \"${WK_PLATFORM_NAME}\" != \"macosx\" ]]; then\n    EXP_WEBKIT_PLATFORM=\"${PROJECT_DIR}/ios/WebKit.iOS.exp\"\nelse\n    EXP_WEBKIT_PLATFORM=\"${PROJECT_DIR}/mac/WebKit.mac.exp\"\nfi\n\ncat \"${PROJECT_DIR}/mac/WebKit.exp\" > \"${EXP_GENERATED}\"\ncat \"${EXP_WEBKIT_PLATFORM}\" >> \"${EXP_GENERATED}\"\n\nfor WK_CURRENT_ARCH in ${ARCHS}; do\n    EXP_REEXPORTED=\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/ReexportedWebCoreSymbols_${WK_CURRENT_ARCH}.exp\"\n    if [[ -f \"${EXP_REEXPORTED}\" ]]; then\n        cat \"${EXP_REEXPORTED}\" >> \"${EXP_GENERATED}\"\n    fi\ndone\n\nif [[ \"${WK_BUILD_FOR_TESTING}\" == \"YES\" ]]; then\n    cat \"${PROJECT_DIR}/mac/WebKit.Testing.exp\" >> \"${EXP_GENERATED}\"\nfi\n";
     3191                };
     3192                1C6CB0510AA63EB000D23BFD /* Migrate Headers */ = {
     3193                        isa = PBXShellScriptBuildPhase;
     3194                        buildActionMask = 2147483647;
     3195                        files = (
     3196                        );
     3197                        inputPaths = (
     3198                                "$(PROJECT_DIR)/mac/MigrateHeaders.make",
     3199                                "$(WEBCORE_PRIVATE_HEADERS_DIR)",
     3200                        );
     3201                        name = "Migrate Headers";
     3202                        outputPaths = (
     3203                                "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/ReexportedWebCoreSymbols.timestamp",
     3204                        );
     3205                        runOnlyForDeploymentPostprocessing = 0;
     3206                        shellPath = /bin/sh;
     3207                        shellScript = "exec \"${SRCROOT}/mac/migrate-headers.sh\"\n";
    32873208                };
    32883209                3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */ = {
    … …  
    34763397                        shellScript = "${SRCROOT}/mac/Scripts/generate-preferences.sh\n";
    34773398                };
    3478                 DDF74CA027EE3E990011F633 /* (Legacy) Install Headers */ = {
     3399                A13EE61D185AE82700556064 /* Postprocess Headers */ = {
    34793400                        isa = PBXShellScriptBuildPhase;
    34803401                        buildActionMask = 2147483647;
    34813402                        files = (
    34823403                        );
    3483                         inputFileListPaths = (
    3484                         );
    34853404                        inputPaths = (
    3486                         );
    3487                         name = "(Legacy) Install Headers";
    3488                         outputFileListPaths = (
    3489                         );
     3405                                "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)",
     3406                                "$(TARGET_BUILD_DIR)/$(HEADERS_FOLDER_PATH)",
     3407                        );
     3408                        name = "Postprocess Headers";
    34903409                        outputPaths = (
     3410                                "$(DERIVED_FILE_DIR)/postprocess-headers.timestamp",
    34913411                        );
    34923412                        runOnlyForDeploymentPostprocessing = 0;
    34933413                        shellPath = /bin/sh;
    3494                         shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\n\n# The \"Migrate WebCore Headers\" build rule invokes clang (through tapi), which means that the inferior xcodebuild we invoke here needs access to the current build products. Make an inferior build directory containing symlinks to the _real_ build products, and set the DSTROOT to the superior build directory so that headers are installed to the _real_ WebKitLegacy.framework.\nset -e\nINFERIOR_SYMROOT=\"${TARGET_TEMP_DIR}/LegacyInstallHeaders-build\"\nINFERIOR_BUILT_PRODUCTS_DIR=\"${BUILT_PRODUCTS_DIR/${SYMROOT}/${INFERIOR_SYMROOT}}\"\nmkdir -p \"${INFERIOR_BUILT_PRODUCTS_DIR}\"\nfor p in \"${BUILT_PRODUCTS_DIR}\"/*; do\n    ln -sf \"${p}\" \"${INFERIOR_BUILT_PRODUCTS_DIR}/$(basename \"${p}\")\"\ndone\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" -configuration ${CONFIGURATION} installhdrs DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SYMROOT=\"${INFERIOR_SYMROOT}\" DERIVED_FILE_DIR=\"${DERIVED_FILE_DIR}\" SDKROOT=\"${SDKROOT}\" SDK_VARIANT=\"${SDK_VARIANT}\" ARCHS=\"${ARCHS}\" INSTALLHDRS_COPY_PHASE=NO INSTALLHDRS_SCRIPT_PHASE=NO INSTALL_PATH=/ -UseNewBuildSystem=YES\n";
     3414                        shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${WK_USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n    # In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\n    exit 0\nfi\n\nexec \"${SRCROOT}/mac/postprocess-headers.sh\"\n";
    34953415                };
    34963416/* End PBXShellScriptBuildPhase section */

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r292183 r292188  
     12022-03-31  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r292183.
     4        https://bugs.webkit.org/show_bug.cgi?id=238639
     5
     6        Broke the Big Sur build
     7
     8        Reverted changeset:
     9
     10        "[XCBuild] WebKitLegacy's "Migrated headers" script does not
     11        emit task information"
     12        https://bugs.webkit.org/show_bug.cgi?id=238409
     13        https://commits.webkit.org/r292183
     14
    1152022-03-31  Elliott Williams  <emw@apple.com>
    216

  • trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig

    r292183 r292188  
    2626#include "WebKitTargetConditionals.xcconfig"
    2727
    28 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH)) $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_WHICH_BUILD_SYSTEM));
    29 // The legacy build system does not install headers.
    30 EXCLUDED_SOURCE_FILE_NAMES_legacy = *.h;
    31 EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = *.defs *.xib *.pdf *.tiff OutlookQuirksUserScript.js PopupMenuMac.* SearchPopupMenuMac.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebEventRegion.h WebIconDatabase.* WebInspectorClient.* WebJavaScriptTextInputPanel.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
    32 EXCLUDED_SOURCE_FILE_NAMES_ = *IOS.mm AbstractPasteboard.h DOMHTMLTextAreaElementPrivate.h DOMUIKitExtensions.h KeyEventCodesIOS.h LaBanquePostaleQuirks.js WAKAppKitStubs.h WAKResponder.h WAKView.h WAKWindow.h WebCaretChangeListener.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebEvent.h WebEventRegion.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebItemProviderPasteboard.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h WKContentObservation.h WKGraphics.h WKTypes.h;
    33 
    34 INCLUDED_SOURCE_FILE_NAMES = $(INCLUDED_MIGRATED_HEADERS_$(WK_WHICH_BUILD_SYSTEM));
    35 INCLUDED_MIGRATED_HEADERS_not_legacy = $(INCLUDED_MIGRATED_HEADERS_$(USE_INTERNAL_SDK)_$(WK_COCOA_TOUCH)) $(INCLUDED_MIGRATED_HEADERS_$(ENABLE_IOS_TOUCH_EVENTS));
    36 // WebEventRegion.h is migrated when building for an iOS family target with an internal SDK...
    37 INCLUDED_MIGRATED_HEADERS_YES_cocoatouch = WebEventRegion.h;
    38 // ...or when --ios-touch-events was passed to build-webkit manually.
    39 INCLUDED_MIGRATED_HEADERS_ENABLE_IOS_TOUCH_EVENTS = WebEventRegion.h;
     28EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH));
     29EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = *.defs *.xib *.pdf *.tiff OutlookQuirksUserScript.js PopupMenuMac.* SearchPopupMenuMac.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebInspectorClient.* WebJavaScriptTextInputPanel.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
     30EXCLUDED_SOURCE_FILE_NAMES_ = *IOS.mm WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h DOMHTMLTextAreaElementPrivate.h DOMUIKitExtensions.h LaBanquePostaleQuirks.js;
    4031
    4132EXPORTED_SYMBOLS_FILE = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
    42 // The "Generate Export Files" build phase needs this setting to rerun when any migrated header changes:
    43 USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES;
    4433
    4534WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));

  • trunk/Tools/ChangeLog

    r292186 r292188  
     12022-03-31  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r292183.
     4        https://bugs.webkit.org/show_bug.cgi?id=238639
     5
     6        Broke the Big Sur build
     7
     8        Reverted changeset:
     9
     10        "[XCBuild] WebKitLegacy's "Migrated headers" script does not
     11        emit task information"
     12        https://bugs.webkit.org/show_bug.cgi?id=238409
     13        https://commits.webkit.org/r292183
     14
    1152022-03-31  Commit Queue  <commit-queue@webkit.org>
    216

  • trunk/Tools/Scripts/check-for-inappropriate-files-in-framework

    r292183 r292188  
    3737  },
    3838  "WebKitLegacy" => {
    39     "PrivateHeaders" => ["*.tmp"],
     39    "Headers" => ["*.tmp"],
    4040    "Resources" => ["*.txt", "*.in", "*.idl", "*.h"],
    4141  },
Note: See TracChangeset for help on using the changeset viewer.