From 2f698de3b6152db1ef1d697faeefede7da38d7b1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 2 Jan 2020 16:51:25 +0300 Subject: [PATCH] Update build scripts for Xcode 11 tools. --- Telegram/build/build.sh | 6 +++--- docs/building-osx.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh index da5439714..7b3ab4039 100755 --- a/Telegram/build/build.sh +++ b/Telegram/build/build.sh @@ -289,7 +289,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "osx" ] || [ "$BuildTarget fi echo "Dumping debug symbols.." - "$HomePath/../../Libraries/breakpad/src/tools/mac/dump_syms/build/Release/dump_syms" "$ReleasePath/$BinaryName.app.dSYM" > "$ReleasePath/$BinaryName.sym" 2>/dev/null + "$HomePath/../../Libraries/macos/breakpad/src/tools/mac/dump_syms/build/Release/dump_syms" "$ReleasePath/$BinaryName.app.dSYM" > "$ReleasePath/$BinaryName.sym" 2>/dev/null echo "Done!" echo "Stripping the executable.." @@ -378,7 +378,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "osx" ] || [ "$BuildTarget if [ "$BuildTarget" == "mac" ]; then echo "Beginning notarization process." set +e - xcrun altool --notarize-app --primary-bundle-id "com.tdesktop.Telegram" --username "$AC_USERNAME" --password "@keychain:AC_PASSWORD" --file "$SetupFile" 2> request_uuid.txt + xcrun altool --notarize-app --primary-bundle-id "com.tdesktop.Telegram" --username "$AC_USERNAME" --password "@keychain:AC_PASSWORD" --file "$SetupFile" > request_uuid.txt set -e while IFS='' read -r line || [[ -n "$line" ]]; do Prefix=$(echo $line | cut -d' ' -f 1) @@ -398,7 +398,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "osx" ] || [ "$BuildTarget LogFile= while [[ "$RequestStatus" == "" ]]; do sleep 5 - xcrun altool --notarization-info "$RequestUUID" --username "$AC_USERNAME" --password "@keychain:AC_PASSWORD" 2> request_result.txt + xcrun altool --notarization-info "$RequestUUID" --username "$AC_USERNAME" --password "@keychain:AC_PASSWORD" > request_result.txt while IFS='' read -r line || [[ -n "$line" ]]; do Prefix=$(echo $line | cut -d' ' -f 1) Value=$(echo $line | cut -d' ' -f 2) diff --git a/docs/building-osx.md b/docs/building-osx.md index 23f11b64b..7bfd9a9ef 100644 --- a/docs/building-osx.md +++ b/docs/building-osx.md @@ -207,7 +207,7 @@ Go to ***BuildPath*** and run cd openal-soft git checkout v1.19 cd build - CFLAGS='-Werror=unguarded-availability-new' CPPFLAGS='-Werror=unguarded-availability-new' cmake -D -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.10 .. + CFLAGS='-Werror=unguarded-availability-new' CPPFLAGS='-Werror=unguarded-availability-new' cmake -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.10 .. make $MAKE_THREADS_CNT sudo make install cd ../..