mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-28 04:59:04 +00:00
Code Issues Releases Wiki Activity

Slightly simplified meson usage on macOS in prepare.py.

Browse Source
This commit is contained in:
23rd 2024-04-22 17:23:06 +03:00 committed by John Preston
parent bea715b41c
commit eef65af173
1 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Telegram/build/prepare/prepare.py
View File

@ -435,7 +435,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout bc31d0a7fd git checkout ab24db42b9
""") """)
stage('msys64', """ stage('msys64', """
@ -747,28 +747,8 @@ mac:
arch=$1 arch=$1
folder=`pwd`/$2 folder=`pwd`/$2
TARGET="\'${arch}\'"
MIN="\'${MIN_VER}\'"
FILE=cross-file.txt
echo "[binaries]" > $FILE
echo "c = ['clang', '-arch', ${TARGET}]" >> $FILE
echo "cpp = ['clang++', '-arch', ${TARGET}]" >> $FILE
echo "ar = 'ar'" >> $FILE
echo "strip = 'strip'" >> $FILE
echo "[built-in options]" >> $FILE
echo "c_args = [${MIN}]" >> $FILE
echo "cpp_args = [${MIN}]" >> $FILE
echo "c_link_args = [${MIN}]" >> $FILE
echo "cpp_link_args = [${MIN}]" >> $FILE
echo "[host_machine]" >> $FILE
echo "system = 'darwin'" >> $FILE
echo "subsystem = 'macos'" >> $FILE
echo "cpu_family = ${TARGET}" >> $FILE
echo "cpu = ${TARGET}" >> $FILE
echo "endian = 'little'" >> $FILE
meson setup \\ meson setup \\
--cross-file $FILE \\ --cross-file ../patches/macos_meson_${arch}.txt \\
--prefix ${USED_PREFIX} \\ --prefix ${USED_PREFIX} \\
--default-library=static \\ --default-library=static \\
--buildtype=minsize \\ --buildtype=minsize \\
@ -1074,28 +1054,8 @@ mac:
arch=$1 arch=$1
folder=`pwd`/$2 folder=`pwd`/$2
TARGET="\'${arch}\'"
MIN="\'${MIN_VER}\'"
FILE=cross-file.txt
echo "[binaries]" > $FILE
echo "c = ['clang', '-arch', ${TARGET}]" >> $FILE
echo "cpp = ['clang++', '-arch', ${TARGET}]" >> $FILE
echo "ar = 'ar'" >> $FILE
echo "strip = 'strip'" >> $FILE
echo "[built-in options]" >> $FILE
echo "c_args = [${MIN}]" >> $FILE
echo "cpp_args = [${MIN}]" >> $FILE
echo "c_link_args = [${MIN}]" >> $FILE
echo "cpp_link_args = [${MIN}]" >> $FILE
echo "[host_machine]" >> $FILE
echo "system = 'darwin'" >> $FILE
echo "subsystem = 'macos'" >> $FILE
echo "cpu_family = ${TARGET}" >> $FILE
echo "cpu = ${TARGET}" >> $FILE
echo "endian = 'little'" >> $FILE
meson setup \\ meson setup \\
--cross-file $FILE \\ --cross-file ../patches/macos_meson_${arch}.txt \\
--prefix ${USED_PREFIX} \\ --prefix ${USED_PREFIX} \\
--default-library=static \\ --default-library=static \\
--buildtype=minsize \\ --buildtype=minsize \\