From 9ccb40c09f1c2114218748e2bcc1473a421def90 Mon Sep 17 00:00:00 2001 From: Maksim Date: Thu, 26 May 2022 19:31:04 +0300 Subject: [PATCH] macOS: update --- .../MultiCraft.xcodeproj/project.pbxproj | 17 ++++++++++++++++- build/macOS/MultiCraft/MultiCraft/Info.plist | 4 ++-- .../MultiCraft/id.lproj/Localizable.strings | 1 + .../MultiCraft/ja.lproj/Localizable.strings | 1 + .../MultiCraft/tr.lproj/Localizable.strings | 1 + .../MultiCraft/uk.lproj/Localizable.strings | 1 + .../MultiCraft/vi.lproj/Localizable.strings | 1 + build/macOS/deps/freetype.sh | 2 +- build/macOS/deps/openal.sh | 2 +- build/macOS/locale.sh | 7 ++++++- 10 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 build/macOS/MultiCraft/MultiCraft/id.lproj/Localizable.strings create mode 100644 build/macOS/MultiCraft/MultiCraft/ja.lproj/Localizable.strings create mode 100644 build/macOS/MultiCraft/MultiCraft/tr.lproj/Localizable.strings create mode 100644 build/macOS/MultiCraft/MultiCraft/uk.lproj/Localizable.strings create mode 100644 build/macOS/MultiCraft/MultiCraft/vi.lproj/Localizable.strings diff --git a/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index bc351075c..506d445c7 100644 --- a/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -517,7 +517,10 @@ 84135C0825D526D700CA4DCF /* keycode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keycode.h; path = ../../../../src/client/keycode.h; sourceTree = ""; }; 84135C0925D526D700CA4DCF /* shader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shader.h; path = ../../../../src/client/shader.h; sourceTree = ""; }; 84135C0A25D526D700CA4DCF /* minimap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = minimap.cpp; path = ../../../../src/client/minimap.cpp; sourceTree = ""; }; + 8425D3702837D89300753F0E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = ""; }; + 8425D3712837D89600753F0E /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = ""; }; 8453A49D24DB22F00087ECF9 /* client */ = {isa = PBXFileReference; lastKnownFileType = folder; name = client; path = ../../../../client; sourceTree = ""; }; + 8457C2C52848DB7300D69304 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; 845856A924B1322C0040BA4F /* MultiCraft.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MultiCraft.app; sourceTree = BUILT_PRODUCTS_DIR; }; 845856B224B1322D0040BA4F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 845856B724B1322D0040BA4F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -550,7 +553,6 @@ 848ADEFD27BD697C001C60F3 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = ""; }; 848ADEFE27BD697F001C60F3 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; 848ADEFF27BD6983001C60F3 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; - 84A636C327C67F01005B4503 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = ""; }; 848ADF0027BD6987001C60F3 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = ""; }; 848ADF0127BD698B001C60F3 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; 848ADF0227BD6995001C60F3 /* lv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lv; path = lv.lproj/Localizable.strings; sourceTree = ""; }; @@ -583,6 +585,9 @@ 84A1F9B9252E617D00000717 /* scripting_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scripting_server.cpp; path = ../../../../src/script/scripting_server.cpp; sourceTree = ""; }; 84A1F9BA252E617D00000717 /* scripting_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scripting_server.h; path = ../../../../src/script/scripting_server.h; sourceTree = ""; }; 84A1FA4C252E635900000717 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = ../../locale; sourceTree = ""; }; + 84A636C327C67F01005B4503 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = ""; }; + 84AABAF72822C3F000A89340 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = ""; }; + 84AABAF82822C3FC00A89340 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = ""; }; 84C8E20A257804A200C1E5D0 /* libopenal.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenal.1.dylib; path = ../deps/openal/libopenal.1.dylib; sourceTree = ""; }; 84EEE5E62782728E00F61929 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libintl.a; path = ../deps/gettext/lib/libintl.a; sourceTree = ""; }; 84F20D5425D52790009562A9 /* irrUString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = irrUString.h; path = ../../../../src/irrlicht_changes/irrUString.h; sourceTree = ""; }; @@ -1752,6 +1757,11 @@ sk, es, sv, + uk, + vi, + tr, + id, + ja, ); mainGroup = 845856A024B1322C0040BA4F; productRefGroup = 845856AA24B1322C0040BA4F /* Products */; @@ -2107,6 +2117,11 @@ 848ADF0827BD69C3001C60F3 /* sk */, 848ADF0927BD69C8001C60F3 /* es */, 848ADF0A27BD69CB001C60F3 /* sv */, + 84AABAF72822C3F000A89340 /* uk */, + 84AABAF82822C3FC00A89340 /* vi */, + 8425D3702837D89300753F0E /* tr */, + 8425D3712837D89600753F0E /* id */, + 8457C2C52848DB7300D69304 /* ja */, ); name = Localizable.strings; sourceTree = ""; diff --git a/build/macOS/MultiCraft/MultiCraft/Info.plist b/build/macOS/MultiCraft/MultiCraft/Info.plist index 7ef6e9e51..ec443d299 100644 --- a/build/macOS/MultiCraft/MultiCraft/Info.plist +++ b/build/macOS/MultiCraft/MultiCraft/Info.plist @@ -20,6 +20,8 @@ $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) + ITSAppUsesNonExemptEncryption + LSApplicationCategoryType public.app-category.adventure-games LSMinimumSystemVersion @@ -34,7 +36,5 @@ NSSupportsSuddenTermination - ITSAppUsesNonExemptEncryption - diff --git a/build/macOS/MultiCraft/MultiCraft/id.lproj/Localizable.strings b/build/macOS/MultiCraft/MultiCraft/id.lproj/Localizable.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/build/macOS/MultiCraft/MultiCraft/id.lproj/Localizable.strings @@ -0,0 +1 @@ + diff --git a/build/macOS/MultiCraft/MultiCraft/ja.lproj/Localizable.strings b/build/macOS/MultiCraft/MultiCraft/ja.lproj/Localizable.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/build/macOS/MultiCraft/MultiCraft/ja.lproj/Localizable.strings @@ -0,0 +1 @@ + diff --git a/build/macOS/MultiCraft/MultiCraft/tr.lproj/Localizable.strings b/build/macOS/MultiCraft/MultiCraft/tr.lproj/Localizable.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/build/macOS/MultiCraft/MultiCraft/tr.lproj/Localizable.strings @@ -0,0 +1 @@ + diff --git a/build/macOS/MultiCraft/MultiCraft/uk.lproj/Localizable.strings b/build/macOS/MultiCraft/MultiCraft/uk.lproj/Localizable.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/build/macOS/MultiCraft/MultiCraft/uk.lproj/Localizable.strings @@ -0,0 +1 @@ + diff --git a/build/macOS/MultiCraft/MultiCraft/vi.lproj/Localizable.strings b/build/macOS/MultiCraft/MultiCraft/vi.lproj/Localizable.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/build/macOS/MultiCraft/MultiCraft/vi.lproj/Localizable.strings @@ -0,0 +1 @@ + diff --git a/build/macOS/deps/freetype.sh b/build/macOS/deps/freetype.sh index bcc448af1..5e6875a9f 100755 --- a/build/macOS/deps/freetype.sh +++ b/build/macOS/deps/freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash -e . sdk.sh -FREETYPE_VERSION=2.11.1 +FREETYPE_VERSION=2.12.1 if [ ! -d freetype-src ]; then wget http://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz diff --git a/build/macOS/deps/openal.sh b/build/macOS/deps/openal.sh index 10426c36e..755c341e3 100755 --- a/build/macOS/deps/openal.sh +++ b/build/macOS/deps/openal.sh @@ -1,7 +1,7 @@ #!/bin/bash -e . sdk.sh -OPENAL_VERSION=1.21.1 +OPENAL_VERSION=1.22.0 if [ ! -d openal-src ]; then wget https://github.com/kcat/openal-soft/archive/$OPENAL_VERSION.tar.gz diff --git a/build/macOS/locale.sh b/build/macOS/locale.sh index 411b661f3..45710cc49 100755 --- a/build/macOS/locale.sh +++ b/build/macOS/locale.sh @@ -21,5 +21,10 @@ for lang in *; do done popd -find $DEST -type d -name '.git' -print0 | xargs -0 -- rm -r +find $DEST -type d -name '.git' -print0 | xargs -0 -- rm -rf find $DEST -type f -name '.*' -delete + +# remove broken languages +for broken_lang in ar he hi ky ms_Arab th; do + find $DEST -type d -name $broken_lang -print0 | xargs -0 -- rm -rf +done