From 9db4ab78a57f028ce82e60824ff028242a2e94eb Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 6 Nov 2019 16:03:13 +0300 Subject: [PATCH] Fix appveyor build. --- .appveyor/install.bat | 4 ++-- Telegram/ThirdParty/libtgvoip | 2 +- Telegram/gyp/generate.py | 6 ++++++ Telegram/gyp/helpers | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.appveyor/install.bat b/.appveyor/install.bat index 590d1e0f5..cf2e8e021 100644 --- a/.appveyor/install.bat +++ b/.appveyor/install.bat @@ -50,8 +50,8 @@ GOTO:EOF git submodule init git submodule update cd %SRC_DIR%\Telegram - call gyp\refresh.bat --api-id 17349 --api-hash 344583e45741c457fe1862106095a5eb -GOTO:EOF + call gyp\refresh.bat --api-id 17349 --api-hash 344583e45741c457fe1862106095a5eb --ci-build + GOTO:EOF :configureBuild call:logInfo "Configuring build" diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip index 6151c1878..302d42fc2 160000 --- a/Telegram/ThirdParty/libtgvoip +++ b/Telegram/ThirdParty/libtgvoip @@ -1 +1 @@ -Subproject commit 6151c18784cdd7fb152588a66939296b7bc87c25 +Subproject commit 302d42fc201f9a8b973ba152e04cf804b0d9d521 diff --git a/Telegram/gyp/generate.py b/Telegram/gyp/generate.py index 083b1325c..5b8ef8688 100644 --- a/Telegram/gyp/generate.py +++ b/Telegram/gyp/generate.py @@ -23,6 +23,7 @@ apiId = '' apiHash = '' nextApiId = False nextApiHash = False +ciBuild = False for arg in sys.argv: if nextApiId: apiId = re.sub(r'[^\d]', '', arg) @@ -33,6 +34,8 @@ for arg in sys.argv: else: nextApiId = (arg == '--api-id') nextApiHash = (arg == '--api-hash') + if arg == '--ci-build': + ciBuild = True officialTarget = '' officialTargetFile = scriptPath + '/../build/target' @@ -86,6 +89,9 @@ gypArguments.append('-Dapi_id=' + apiId) gypArguments.append('-Dapi_hash=' + apiHash) gypArguments.append('-Dlottie_use_cache=1') gypArguments.append('-Dspecial_build_target=' + officialTarget) +if ciBuild: + gypArguments.append('-Dci_build=1') + if 'TDESKTOP_BUILD_DEFINES' in os.environ: buildDefines = os.environ['TDESKTOP_BUILD_DEFINES'] gypArguments.append('-Dbuild_defines=' + buildDefines) diff --git a/Telegram/gyp/helpers b/Telegram/gyp/helpers index f45030141..89c9e8148 160000 --- a/Telegram/gyp/helpers +++ b/Telegram/gyp/helpers @@ -1 +1 @@ -Subproject commit f450301417d8b7bd7fed660cf7520ae7ead10c60 +Subproject commit 89c9e81482f655321b684aebb434b22e004e8995