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

Changeset 271025 in webkit


Ignore:
Timestamp:
Dec 21, 2020, 10:32:17 AM (6 years ago)
Author:
Megan Gardner
Message:

Copy Localizable.strings file into the correct directory
​https://bugs.webkit.org/show_bug.cgi?id=220029
rdar://72167601

Reviewed by Alex Christensen.

After the changes in r269865, r269873, r269915, r269932, r269937 the localizable.strings
was not showing up in the right place in the production build to allow it to be correctly
localized. This skips the step of putting it in DerivedSources and just puts the
concatenated file in the final correct directory so we do not have to relay on Xcode build
doing the correct thing for us.

  • WebCore.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r271024 r271025  
     12020-12-21  Megan Gardner  <megan_gardner@apple.com>
     2
     3        Copy Localizable.strings file into the correct directory
     4        https://bugs.webkit.org/show_bug.cgi?id=220029
     5        rdar://72167601
     6
     7        Reviewed by Alex Christensen.
     8
     9        After the changes in r269865, r269873, r269915, r269932, r269937 the localizable.strings
     10        was not showing up in the right place in the production build to allow it to be correctly
     11        localized. This skips the step of putting it in DerivedSources and just puts the
     12        concatenated file in the final correct directory so we do not have to relay on Xcode build
     13        doing the correct thing for us.
     14
     15        * WebCore.xcodeproj/project.pbxproj:
     16
    1172020-12-21  Alicia Boya García  <aboya@igalia.com>
    218

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

    r270772 r271025  
    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 */; };
    12131212                4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12141213                4425070925829A2700C09368 /* AppHighlightStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4425070725829A1400C09368 /* AppHighlightStorage.h */; };
    … …  
    80878086                445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalDefaultSystemAppearance.mm; sourceTree = "<group>"; };
    80888087                446DC64624A29D9B0061F390 /* PlaybackTargetClientContextIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaybackTargetClientContextIdentifier.h; sourceTree = "<group>"; };
    8089                 446EE4E8255E0D9200454463 /* Localizable.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = Localizable.strings; path = DerivedSources/WebCore/Localizable.strings; sourceTree = BUILT_PRODUCTS_DIR; };
     8088                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; };
    80908089                4471710B205AF945000A116E /* MediaQueryParserContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryParserContext.cpp; sourceTree = "<group>"; };
    80918090                4471710C205AF945000A116E /* MediaQueryParserContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaQueryParserContext.h; sourceTree = "<group>"; };
    … …  
    1974819747                        sourceTree = "<group>";
    1974919748                };
     19749                44406BC6258D492E0070B065 /* en.lproj */ = {
     19750                        isa = PBXGroup;
     19751                        children = (
     19752                        );
     19753                        name = en.lproj;
     19754                        sourceTree = "<group>";
     19755                };
    1975019756                4497D58C0EBA854F00A10552 /* ios */ = {
    1975119757                        isa = PBXGroup;
    … …  
    2163321639                                E334825E1DC93AA0009C9544 /* DOMJITAbstractHeapRepository.h */,
    2163421640                                E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */,
     21641                                44406BC6258D492E0070B065 /* en.lproj */,
    2163521642                                9BCCCA5320E7095D0068FB03 /* EventFactory.cpp */,
    2163621643                                970B72A5145008EB00F00A37 /* EventHeaders.h */,
    … …  
    3551835525                                1C11CCB40AA6093700DADB20 /* Copy Generated Headers */,
    3551935526                                3717D7E717ECC573003C276D /* Copy Scripts */,
    35520                                 446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */,
     35527                                446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */,
    3552135528                                93F199FD08245E59001E9ABC /* Resources */,
    3552235529                                CD0DBF001422765700280263 /* Copy Audio Resources */,
    … …  
    3563435641                                E59DD4B821098287003C8B47 /* ListButtonArrow.png in Resources */,
    3563535642                                E516699120FF9918009D2C27 /* ListButtonArrow@2x.png in Resources */,
    35636                                 440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */,
    3563735643                                837A80131E1E127300026B9F /* Localizable.stringsdict in Resources */,
    3563835644                                311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */,
    … …  
    3567335679                        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";
    3567435680                };
    35675                 446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */ = {
     35681                446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */ = {
    3567635682                        isa = PBXShellScriptBuildPhase;
    3567735683                        buildActionMask = 2147483647;
    … …  
    3568535691                                $SRCROOT/en.lproj/Localizable.strings,
    3568635692                        );
    35687                         name = "Concatenate Localizable.strings";
     35693                        name = "Concatenate and Copy Localizable.strings";
    3568835694                        outputFileListPaths = (
    3568935695                        );
    3569035696                        outputPaths = (
    35691                                 $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings,
     35697                                $BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/Localizable.strings,
    3569235698                        );
    3569335699                        runOnlyForDeploymentPostprocessing = 0;
    3569435700                        shellPath = /bin/sh;
    35695                         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";
     35701                        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";
    3569635702                };
    3569735703                5325BDCC21DFF33E00A0DEE1 /* ShellScript */ = {
Note: See TracChangeset for help on using the changeset viewer.