From 57f0a211251a9378fa004ee22b2c6f4d21e2bd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sun, 24 Apr 2016 20:57:13 -0700 Subject: [ios] Only convert encoding of files generated by genstrings Followup to #4783: fixed an issue causing make genstrings to reconvert a UTF-8-encoded file from UTF-16 to UTF-8, garbling it. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2e09e99d9e..5decd2319e 100644 --- a/Makefile +++ b/Makefile @@ -64,9 +64,9 @@ genstrings: genstrings -u -o platform/osx/sdk/Base.lproj platform/darwin/src/*.{m,mm} genstrings -u -o platform/osx/sdk/Base.lproj platform/osx/src/*.{m,mm} genstrings -u -o platform/ios/resources/Base.lproj platform/ios/src/*.{m,mm} - mv platform/osx/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/ - -find platform/{darwin,ios,osx}/ -path '*/Base.lproj/*.strings' -exec \ + -find platform/ios/resources platform/osx/sdk -path '*/Base.lproj/*.strings' -exec \ textutil -convert txt -extension strings -inputencoding UTF-16 -encoding UTF-8 {} \; + mv platform/osx/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/ #### iOS targets ############################################################## -- cgit v1.2.1