Changeset 226487 in webkit


Ignore:
Timestamp:
Jan 6, 2018, 8:52:30 AM (7 years ago)
Author:
mitz@apple.com
Message:

REGRESSION (r226218): iOS-only assets are installed on macOS
​https://bugs.webkit.org/show_bug.cgi?id=181362

Reviewed by Anders Carlsson.

  • Configurations/WebKit.xcconfig: Exclude everything under Resources/ios when not targeting iOS.
  • Resources/mac: Added.
  • Resources/mac/mediaIcon.pdf: Moved here…
  • Resources/mediaIcon.pdf: …from here.
  • WebKit.xcassets: Moved under Resources/ios.
  • WebKit.xcodeproj/project.pbxproj: Created an ios group under the Resources group, and cleaned up the mac group. Removed the Recovered References group.
Location:
trunk/Source/WebKit
Files:
2 added
5 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r226482 r226487  
     12018-01-05  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r226218): iOS-only assets are installed on macOS
     4        https://bugs.webkit.org/show_bug.cgi?id=181362
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Configurations/WebKit.xcconfig: Exclude everything under Resources/ios when not targeting
     9          iOS.
     10
     11        * Resources/ios: Added.
     12        * Resources/ios/iOS.xcassets: Moved from Source/WebKit/WebKit.xcassets.
     13        * Resources/ios/iOS.xcassets/LockMini.imageset/NavigationBarLockMini@2x.pdf: Set the
     14          svn:mime-type property.
     15        * Resources/ios/iOS.xcassets/LockMini.imageset/NavigationBarLockMini@3x.pdf: Ditto.
     16
     17        * Resources/mac: Added.
     18        * Resources/mac/mediaIcon.pdf: Moved here…
     19        * Resources/mediaIcon.pdf: …from here.
     20
     21        * WebKit.xcassets: Moved under Resources/ios.
     22
     23        * WebKit.xcodeproj/project.pbxproj: Created an ios group under the Resources group, and
     24          cleaned up the mac group. Removed the Recovered References group.
     25
    1262018-01-05  John Wilander  <wilander@apple.com>
    227

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

    r222357 r226487  
    7171SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
    7272
     73EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/*;
    7374EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;
    7475

  • trunk/Source/WebKit/Resources/ios/iOS.xcassets/LockMini.imageset/NavigationBarLockMini@2x.pdf

    • Property svn:mime-type set to application/pdf

  • trunk/Source/WebKit/Resources/ios/iOS.xcassets/LockMini.imageset/NavigationBarLockMini@3x.pdf

    • Property svn:mime-type set to application/pdf

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

    r226290 r226487  
    881881                3F87B9C0158940D80090FF62 /* WebColorPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F87B9BF158940D80090FF62 /* WebColorPicker.h */; };
    882882                3F915C101F564DEE00183CE9 /* WKFullScreenWindowControllerIOS.mm in Headers */ = {isa = PBXBuildFile; fileRef = 3F915C0E1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.mm */; };
    883                 3FB08E431F60B240005E5312 /* WebKit.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3FB08E421F60B240005E5312 /* WebKit.xcassets */; };
     883                3FB08E431F60B240005E5312 /* iOS.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3FB08E421F60B240005E5312 /* iOS.xcassets */; };
    884884                3FFDDB961F577F480050E593 /* WKFullScreenWindowControllerIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F915C0F1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.h */; };
    885885                3FFDDB971F5780E10050E593 /* WKFullScreenWindowControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3F915C0E1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.mm */; };
    … …  
    19561956                C574A58112E66681002DFE98 /* PasteboardTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = C574A57F12E66681002DFE98 /* PasteboardTypes.h */; };
    19571957                C574A58212E66681002DFE98 /* PasteboardTypes.mm in Sources */ = {isa = PBXBuildFile; fileRef = C574A58012E66681002DFE98 /* PasteboardTypes.mm */; };
    1958                 C58CDF2A1887548B00871536 /* InteractionInformationAtPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = C58CDF281887548B00871536 /* InteractionInformationAtPosition.h */; };
    19591958                C59C4A5818B81174007BDCB6 /* AssistedNodeInformation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C59C4A5618B81174007BDCB6 /* AssistedNodeInformation.cpp */; };
    19601959                C59C4A5918B81174007BDCB6 /* AssistedNodeInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = C59C4A5718B81174007BDCB6 /* AssistedNodeInformation.h */; };
    … …  
    32053204                3F915C0E1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.mm */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFullScreenWindowControllerIOS.mm; path = ios/WKFullScreenWindowControllerIOS.mm; sourceTree = "<group>"; };
    32063205                3F915C0F1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKFullScreenWindowControllerIOS.h; path = ios/WKFullScreenWindowControllerIOS.h; sourceTree = "<group>"; };
    3207                 3FB08E421F60B240005E5312 /* WebKit.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = WebKit.xcassets; sourceTree = "<group>"; };
     3206                3FB08E421F60B240005E5312 /* iOS.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = iOS.xcassets; sourceTree = "<group>"; };
    32083207                410482CB1DDD2FB500F006D0 /* RTCNetwork.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCNetwork.cpp; sourceTree = "<group>"; };
    32093208                410482CC1DDD2FB500F006D0 /* RTCNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCNetwork.h; sourceTree = "<group>"; };
    … …  
    38853884                93A253F21C92411200F9F68D /* WKPreviewActionItemIdentifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreviewActionItemIdentifiers.h; sourceTree = "<group>"; };
    38863885                93A253F41C92413200F9F68D /* WKPreviewActionItemIdentifiers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPreviewActionItemIdentifiers.mm; sourceTree = "<group>"; };
    3887                 93A2A3451D246125002B59D3 /* mediaIcon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = mediaIcon.pdf; path = Resources/mediaIcon.pdf; sourceTree = SOURCE_ROOT; };
     3886                93A2A3451D246125002B59D3 /* mediaIcon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = mediaIcon.pdf; sourceTree = "<group>"; };
    38883887                93A88B2E1BC6E98F00ABA5C2 /* WebHitTestResultData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHitTestResultData.mm; sourceTree = "<group>"; };
    38893888                93A88B311BC6E9C000ABA5C2 /* WebHitTestResultData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHitTestResultData.h; sourceTree = "<group>"; };
    … …  
    44164415                C574A57F12E66681002DFE98 /* PasteboardTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PasteboardTypes.h; sourceTree = "<group>"; };
    44174416                C574A58012E66681002DFE98 /* PasteboardTypes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteboardTypes.mm; sourceTree = "<group>"; };
    4418                 C58CDF281887548B00871536 /* InteractionInformationAtPosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InteractionInformationAtPosition.h; sourceTree = "<group>"; };
    44194417                C59C4A5618B81174007BDCB6 /* AssistedNodeInformation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AssistedNodeInformation.cpp; sourceTree = "<group>"; };
    44204418                C59C4A5718B81174007BDCB6 /* AssistedNodeInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssistedNodeInformation.h; sourceTree = "<group>"; };
    … …  
    47214719                                0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
    47224720                                034768DFFF38A50411DB9C8B /* Products */,
    4723                                 7AAD17581EA54AA8003B0894 /* Recovered References */,
    47244721                        );
    47254722                        name = WebKit2;
    … …  
    47404737                        isa = PBXGroup;
    47414738                        children = (
     4739                                372887982000AA3700F4EF5D /* ios */,
    47424740                                37F8C94F1AE22BD8007DAB9E /* mac */,
    47434741                                7CB16FE11724B9B5007A0A95 /* PlugInSandboxProfiles */,
    … …  
    47494747                                E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */,
    47504748                                E133FD891423DD7F00FC7BFB /* WebKit.icns */,
    4751                                 3FB08E421F60B240005E5312 /* WebKit.xcassets */,
    47524749                        );
    47534750                        name = Resources;
    … …  
    57935790                        );
    57945791                        path = foundation;
     5792                        sourceTree = "<group>";
     5793                };
     5794                372887982000AA3700F4EF5D /* ios */ = {
     5795                        isa = PBXGroup;
     5796                        children = (
     5797                                3FB08E421F60B240005E5312 /* iOS.xcassets */,
     5798                        );
     5799                        name = ios;
     5800                        path = Resources/ios;
    57955801                        sourceTree = "<group>";
    57965802                };
    … …  
    67066712                        );
    67076713                        name = mac;
    6708                         sourceTree = "<group>";
    6709                 };
    6710                 7AAD17581EA54AA8003B0894 /* Recovered References */ = {
    6711                         isa = PBXGroup;
    6712                         children = (
    6713                                 C58CDF281887548B00871536 /* InteractionInformationAtPosition.h */,
    6714                         );
    6715                         name = "Recovered References";
    67166714                        sourceTree = "<group>";
    67176715                };
    … …  
    87388736                                2DD45ADE1E5F8972006C355F /* InputViewUpdateDeferrer.h in Headers */,
    87398737                                C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */,
    8740                                 C58CDF2A1887548B00871536 /* InteractionInformationAtPosition.h in Headers */,
    87418738                                2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */,
    87428739                                1AE49A4911FFA8CE0048B464 /* JSNPMethod.h in Headers */,
    … …  
    98019798                                6BE969C11E54D452008B7483 /* corePrediction_model in Resources */,
    98029799                                8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
     9800                                3FB08E431F60B240005E5312 /* iOS.xcassets in Resources */,
    98039801                                93A2A3461D246125002B59D3 /* mediaIcon.pdf in Resources */,
    9804                                 3FB08E431F60B240005E5312 /* WebKit.xcassets in Resources */,
    98059802                        );
    98069803                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.