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

Changeset 271188 in webkit


Ignore:
Timestamp:
Jan 5, 2021, 7:11:17 PM (6 years ago)
Author:
Megan Gardner
Message:

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

Reviewed by Tim Horton.

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

    r271178 r271188  
     12021-01-05  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
     6        Reviewed by Tim Horton.
     7
     8        After the changes in r269865, r269873, r269915, r269932, r269937 the localizable.strings
     9        was not showing up in the right place in the production build to allow it to be correctly
     10        localized. This skips the step of putting it in DerivedSources and just puts the
     11        concatenated file in the final correct directory so we do not have to relay on Xcode build
     12        doing the correct thing for us.
     13
     14        * WebCore.xcodeproj/project.pbxproj:
     15
    1162021-01-05  Peng Liu  <peng.liu6@apple.com>
    217

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

    r271167 r271188  
    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 */; };
    … …  
    60496048                0F53FB81213B1BB800C40D34 /* CSSFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFilter.cpp; sourceTree = "<group>"; };
    60506049                0F53FB83213B1BB800C40D34 /* CSSFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFilter.h; sourceTree = "<group>"; };
     6050                0F53FB83213B786400C40D34 /* RenderLayerScrollableArea.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerScrollableArea.cpp; sourceTree = "<group>"; };
    60516051                0F53FB84213B786400C40D34 /* RenderLayerScrollableArea.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderLayerScrollableArea.h; sourceTree = "<group>"; };
    6052                 0F53FB83213B786400C40D34 /* RenderLayerScrollableArea.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerScrollableArea.cpp; sourceTree = "<group>"; };
    60536052                0F53FB89213B768400C40D34 /* RenderLayerFilters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderLayerFilters.h; sourceTree = "<group>"; };
    60546053                0F53FB8B213B768400C40D34 /* RenderLayerFilters.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerFilters.cpp; sourceTree = "<group>"; };
    … …  
    80908089                445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalDefaultSystemAppearance.mm; sourceTree = "<group>"; };
    80918090                446DC64624A29D9B0061F390 /* PlaybackTargetClientContextIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaybackTargetClientContextIdentifier.h; sourceTree = "<group>"; };
    8092                 446EE4E8255E0D9200454463 /* Localizable.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = Localizable.strings; path = DerivedSources/WebCore/Localizable.strings; sourceTree = BUILT_PRODUCTS_DIR; };
     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; };
    80938092                4471710B205AF945000A116E /* MediaQueryParserContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryParserContext.cpp; sourceTree = "<group>"; };
    80948093                4471710C205AF945000A116E /* MediaQueryParserContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaQueryParserContext.h; sourceTree = "<group>"; };
    … …  
    1975519754                        sourceTree = "<group>";
    1975619755                };
     19756                44406BC6258D492E0070B065 /* en.lproj */ = {
     19757                        isa = PBXGroup;
     19758                        children = (
     19759                        );
     19760                        name = en.lproj;
     19761                        sourceTree = "<group>";
     19762                };
    1975719763                4497D58C0EBA854F00A10552 /* ios */ = {
    1975819764                        isa = PBXGroup;
    … …  
    2164021646                                E334825E1DC93AA0009C9544 /* DOMJITAbstractHeapRepository.h */,
    2164121647                                E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */,
     21648                                44406BC6258D492E0070B065 /* en.lproj */,
    2164221649                                9BCCCA5320E7095D0068FB03 /* EventFactory.cpp */,
    2164321650                                970B72A5145008EB00F00A37 /* EventHeaders.h */,
    … …  
    3143431441                                7CD1E69324ABF6240089C419 /* ColorSerialization.h in Headers */,
    3143531442                                9382DF5810A8D5C900925652 /* ColorSpace.h in Headers */,
     31443                                BCAFEDB425968D0B0030E6AA /* ColorSpaceCG.h in Headers */,
    3143631444                                7C029C6E2493C8F800268204 /* ColorTypes.h in Headers */,
    3143731445                                0FEAF66B23BFC39E004030DA /* ColorUtilities.h in Headers */,
    … …  
    3481534823                                B22279F40D00BF220071B782 /* SVGFEMergeElement.h in Headers */,
    3481634824                                B22279F70D00BF220071B782 /* SVGFEMergeNodeElement.h in Headers */,
    34817                                 BCAFEDB425968D0B0030E6AA /* ColorSpaceCG.h in Headers */,
    3481834825                                84224194107E78A700766A87 /* SVGFEMorphologyElement.h in Headers */,
    3481934826                                B22279FA0D00BF220071B782 /* SVGFEOffsetElement.h in Headers */,
    … …  
    3553235539                                1C11CCB40AA6093700DADB20 /* Copy Generated Headers */,
    3553335540                                3717D7E717ECC573003C276D /* Copy Scripts */,
    35534                                 446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */,
     35541                                446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */,
    3553535542                                93F199FD08245E59001E9ABC /* Resources */,
    3553635543                                CD0DBF001422765700280263 /* Copy Audio Resources */,
    … …  
    3564835655                                E59DD4B821098287003C8B47 /* ListButtonArrow.png in Resources */,
    3564935656                                E516699120FF9918009D2C27 /* ListButtonArrow@2x.png in Resources */,
    35650                                 440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */,
    3565135657                                837A80131E1E127300026B9F /* Localizable.stringsdict in Resources */,
    3565235658                                311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */,
    … …  
    3568735693                        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";
    3568835694                };
    35689                 446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */ = {
     35695                446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */ = {
    3569035696                        isa = PBXShellScriptBuildPhase;
    3569135697                        buildActionMask = 2147483647;
    … …  
    3569935705                                $SRCROOT/en.lproj/Localizable.strings,
    3570035706                        );
    35701                         name = "Concatenate Localizable.strings";
     35707                        name = "Concatenate and Copy Localizable.strings";
    3570235708                        outputFileListPaths = (
    3570335709                        );
    3570435710                        outputPaths = (
    35705                                 $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings,
     35711                                $BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/Localizable.strings,
    3570635712                        );
    3570735713                        runOnlyForDeploymentPostprocessing = 0;
    3570835714                        shellPath = /bin/sh;
    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";
     35715                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nDST_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";
    3571035716                };
    3571135717                5325BDCC21DFF33E00A0DEE1 /* ShellScript */ = {
Note: See TracChangeset for help on using the changeset viewer.