Title: [271025] trunk/Source/WebCore
Revision
271025
Author
[email protected]
Date
2020-12-21 10:32:17 -0800 (Mon, 21 Dec 2020)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (271024 => 271025)


--- trunk/Source/WebCore/ChangeLog	2020-12-21 18:14:08 UTC (rev 271024)
+++ trunk/Source/WebCore/ChangeLog	2020-12-21 18:32:17 UTC (rev 271025)
@@ -1,3 +1,19 @@
+2020-12-21  Megan Gardner  <[email protected]>
+
+        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:
+
 2020-12-21  Alicia Boya GarcĂ­a  <[email protected]>
 
         [MSE] Fix allSamplesInTrackEnqueued() handling

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (271024 => 271025)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2020-12-21 18:14:08 UTC (rev 271024)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2020-12-21 18:32:17 UTC (rev 271025)
@@ -1209,7 +1209,6 @@
 		43B85ED418CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43B85ED218CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp */; };
 		43C092BC12D9E4EE00A989C3 /* RenderSVGForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C092BA12D9E4EE00A989C3 /* RenderSVGForeignObject.h */; };
 		43EDD67F1B485DBF00640E75 /* CombinedFiltersAlphabet.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EDD67D1B485DBF00640E75 /* CombinedFiltersAlphabet.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 446EE4E8255E0D9200454463 /* Localizable.strings */; };
 		4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		4425070925829A2700C09368 /* AppHighlightStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4425070725829A1400C09368 /* AppHighlightStorage.h */; };
 		4430D00B2575A83E0046D401 /* Highlight.h in Headers */ = {isa = PBXBuildFile; fileRef = 44E88E51236A5C8D009B4847 /* Highlight.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -8086,7 +8085,7 @@
 		445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocalDefaultSystemAppearance.h; sourceTree = "<group>"; };
 		445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalDefaultSystemAppearance.mm; sourceTree = "<group>"; };
 		446DC64624A29D9B0061F390 /* PlaybackTargetClientContextIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaybackTargetClientContextIdentifier.h; sourceTree = "<group>"; };
-		446EE4E8255E0D9200454463 /* Localizable.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = Localizable.strings; path = DerivedSources/WebCore/Localizable.strings; sourceTree = BUILT_PRODUCTS_DIR; };
+		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; };
 		4471710B205AF945000A116E /* MediaQueryParserContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryParserContext.cpp; sourceTree = "<group>"; };
 		4471710C205AF945000A116E /* MediaQueryParserContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaQueryParserContext.h; sourceTree = "<group>"; };
 		447958021643B47B001E0A7F /* ParsedContentType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentType.cpp; sourceTree = "<group>"; };
@@ -19747,6 +19746,13 @@
 			path = ios;
 			sourceTree = "<group>";
 		};
+		44406BC6258D492E0070B065 /* en.lproj */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = en.lproj;
+			sourceTree = "<group>";
+		};
 		4497D58C0EBA854F00A10552 /* ios */ = {
 			isa = PBXGroup;
 			children = (
@@ -21632,6 +21638,7 @@
 				6565814809D13043000E61D7 /* CSSValueKeywords.h */,
 				E334825E1DC93AA0009C9544 /* DOMJITAbstractHeapRepository.h */,
 				E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */,
+				44406BC6258D492E0070B065 /* en.lproj */,
 				9BCCCA5320E7095D0068FB03 /* EventFactory.cpp */,
 				970B72A5145008EB00F00A37 /* EventHeaders.h */,
 				970B7289144FFAC600F00A37 /* EventInterfaces.h */,
@@ -35517,7 +35524,7 @@
 				93F198A608245E59001E9ABC /* Headers */,
 				1C11CCB40AA6093700DADB20 /* Copy Generated Headers */,
 				3717D7E717ECC573003C276D /* Copy Scripts */,
-				446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */,
+				446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */,
 				93F199FD08245E59001E9ABC /* Resources */,
 				CD0DBF001422765700280263 /* Copy Audio Resources */,
 				93F19A0C08245E59001E9ABC /* Sources */,
@@ -35633,7 +35640,6 @@
 				2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */,
 				E59DD4B821098287003C8B47 /* ListButtonArrow.png in Resources */,
 				E516699120FF9918009D2C27 /* [email protected] in Resources */,
-				440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */,
 				837A80131E1E127300026B9F /* Localizable.stringsdict in Resources */,
 				311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */,
 				311C08BE18EB7CAF00B65615 /* mediaControlsApple.js in Resources */,
@@ -35672,7 +35678,7 @@
 			shellPath = /bin/sh;
 			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";
 		};
-		446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */ = {
+		446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -35684,15 +35690,15 @@
 				$SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings,
 				$SRCROOT/en.lproj/Localizable.strings,
 			);
-			name = "Concatenate Localizable.strings";
+			name = "Concatenate and Copy Localizable.strings";
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				$BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings,
+				$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/Localizable.strings,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			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";
 		};
 		5325BDCC21DFF33E00A0DEE1 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to