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

Changeset 271167 in webkit


Ignore:
Timestamp:
Jan 5, 2021, 12:09:46 PM (6 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, reverting r271025.

Breaks internal builds

Reverted changeset:

"Copy Localizable.strings file into the correct directory"
​https://bugs.webkit.org/show_bug.cgi?id=220029
​https://trac.webkit.org/changeset/271025

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r271166 r271167  
     12021-01-05  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, reverting r271025.
     4
     5        Breaks internal builds
     6
     7        Reverted changeset:
     8
     9        "Copy Localizable.strings file into the correct directory"
     10        https://bugs.webkit.org/show_bug.cgi?id=220029
     11        https://trac.webkit.org/changeset/271025
     12
    1132021-01-05  Chris Fleizach  <cfleizach@apple.com>
    214

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

    r271137 r271167  
    12101210                43C092BC12D9E4EE00A989C3 /* RenderSVGForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C092BA12D9E4EE00A989C3 /* RenderSVGForeignObject.h */; };
    12111211                43EDD67F1B485DBF00640E75 /* CombinedFiltersAlphabet.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EDD67D1B485DBF00640E75 /* CombinedFiltersAlphabet.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1212                440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 446EE4E8255E0D9200454463 /* Localizable.strings */; };
    12121213                4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12131214                4425070925829A2700C09368 /* AppHighlightStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4425070725829A1400C09368 /* AppHighlightStorage.h */; };
    … …  
    80898090                445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalDefaultSystemAppearance.mm; sourceTree = "<group>"; };
    80908091                446DC64624A29D9B0061F390 /* PlaybackTargetClientContextIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaybackTargetClientContextIdentifier.h; sourceTree = "<group>"; };
    8091                 446EE4E8255E0D9200454463 /* Localizable.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = Localizable.strings; path = DerivedSources/WebCore/en.lproj/Localizable.strings; sourceTree = BUILT_PRODUCTS_DIR; };
     8092                446EE4E8255E0D9200454463 /* Localizable.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = Localizable.strings; path = DerivedSources/WebCore/Localizable.strings; sourceTree = BUILT_PRODUCTS_DIR; };
    80928093                4471710B205AF945000A116E /* MediaQueryParserContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryParserContext.cpp; sourceTree = "<group>"; };
    80938094                4471710C205AF945000A116E /* MediaQueryParserContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaQueryParserContext.h; sourceTree = "<group>"; };
    … …  
    1975419755                        sourceTree = "<group>";
    1975519756                };
    19756                 44406BC6258D492E0070B065 /* en.lproj */ = {
    19757                         isa = PBXGroup;
    19758                         children = (
    19759                         );
    19760                         name = en.lproj;
    19761                         sourceTree = "<group>";
    19762                 };
    1976319757                4497D58C0EBA854F00A10552 /* ios */ = {
    1976419758                        isa = PBXGroup;
    … …  
    2164621640                                E334825E1DC93AA0009C9544 /* DOMJITAbstractHeapRepository.h */,
    2164721641                                E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */,
    21648                                 44406BC6258D492E0070B065 /* en.lproj */,
    2164921642                                9BCCCA5320E7095D0068FB03 /* EventFactory.cpp */,
    2165021643                                970B72A5145008EB00F00A37 /* EventHeaders.h */,
    … …  
    3553935532                                1C11CCB40AA6093700DADB20 /* Copy Generated Headers */,
    3554035533                                3717D7E717ECC573003C276D /* Copy Scripts */,
    35541                                 446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */,
     35534                                446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */,
    3554235535                                93F199FD08245E59001E9ABC /* Resources */,
    3554335536                                CD0DBF001422765700280263 /* Copy Audio Resources */,
    … …  
    3565535648                                E59DD4B821098287003C8B47 /* ListButtonArrow.png in Resources */,
    3565635649                                E516699120FF9918009D2C27 /* ListButtonArrow@2x.png in Resources */,
     35650                                440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */,
    3565735651                                837A80131E1E127300026B9F /* Localizable.stringsdict in Resources */,
    3565835652                                311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */,
    … …  
    3569335687                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n    ../../Tools/Scripts/check-for-inappropriate-objc-class-names Web || exit $?\nfi\n";
    3569435688                };
    35695                 446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */ = {
     35689                446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */ = {
    3569635690                        isa = PBXShellScriptBuildPhase;
    3569735691                        buildActionMask = 2147483647;
    … …  
    3570535699                                $SRCROOT/en.lproj/Localizable.strings,
    3570635700                        );
    35707                         name = "Concatenate and Copy Localizable.strings";
     35701                        name = "Concatenate Localizable.strings";
    3570835702                        outputFileListPaths = (
    3570935703                        );
    3571035704                        outputPaths = (
    35711                                 $BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/Localizable.strings,
     35705                                $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings,
    3571235706                        );
    3571335707                        runOnlyForDeploymentPostprocessing = 0;
    3571435708                        shellPath = /bin/sh;
    35715                         shellScript = "DST_DIR=\"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/en.lproj\"\nmkdir -p \"$DST_DIR\"\n\nif [ -e $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt ] ; then\n    cat $SRCROOT/en.lproj/Localizable.strings $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt > $DST_DIR/Localizable.strings\nelif [ -e $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt ] ; then\n    cat $SRCROOT/en.lproj/Localizable.strings $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt > $DST_DIR/Localizable.strings\nelse\n    cp $SRCROOT/en.lproj/Localizable.strings $DST_DIR/Localizable.strings\nfi\n";
     35709                        shellScript = "if [ -e $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt ] ; then\n    cat $SRCROOT/en.lproj/Localizable.strings $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt > $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings\nelif [ -e $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings..txt ] ; then\n    cat $SRCROOT/en.lproj/Localizable.strings $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt > $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings\nelse\n    cp $SRCROOT/en.lproj/Localizable.strings $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings\nfi\n";
    3571635710                };
    3571735711                5325BDCC21DFF33E00A0DEE1 /* ShellScript */ = {
Note: See TracChangeset for help on using the changeset viewer.