From daa934014c090eb27c3cff693cb7da268503c941 Mon Sep 17 00:00:00 2001 From: Christoph Auer Date: Sun, 19 Feb 2017 09:29:08 +0100 Subject: [PATCH] Change TELEGRAM_BUILD_DEFINES to TDESKTOP_BUILD_DEFINES --- .appveyor/install.bat | 20 ++++++++++---------- Telegram/gyp/refresh.bat | 6 +++--- doc/building-msvc.md | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.appveyor/install.bat b/.appveyor/install.bat index b5babe60d..8125dc79c 100644 --- a/.appveyor/install.bat +++ b/.appveyor/install.bat @@ -43,35 +43,35 @@ GOTO:EOF :configureBuild call:logInfo "Configuring build" call:logInfo "Build version: %BUILD_VERSION%" - set TELEGRAM_BUILD_DEFINES= + set TDESKTOP_BUILD_DEFINES= echo %BUILD_VERSION% | findstr /C:"disable_autoupdate">nul && ( - set TELEGRAM_BUILD_DEFINES=%TELEGRAM_BUILD_DEFINES%,TDESKTOP_DISABLE_AUTOUPDATE + set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_AUTOUPDATE ) echo %BUILD_VERSION% | findstr /C:"disable_register_custom_scheme">nul && ( - set TELEGRAM_BUILD_DEFINES=%TELEGRAM_BUILD_DEFINES%,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME + set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME ) echo %BUILD_VERSION% | findstr /C:"disable_crash_reports">nul && ( - set TELEGRAM_BUILD_DEFINES=%TELEGRAM_BUILD_DEFINES%,TDESKTOP_DISABLE_CRASH_REPORTS + set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_CRASH_REPORTS ) echo %BUILD_VERSION% | findstr /C:"disable_network_proxy">nul && ( - set TELEGRAM_BUILD_DEFINES=%TELEGRAM_BUILD_DEFINES%,TDESKTOP_DISABLE_NETWORK_PROXY + set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_NETWORK_PROXY ) echo %BUILD_VERSION% | findstr /C:"disable_desktop_file_generation">nul && ( - set TELEGRAM_BUILD_DEFINES=%TELEGRAM_BUILD_DEFINES%,TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION + set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION ) echo %BUILD_VERSION% | findstr /C:"disable_unity_integration">nul && ( - set TELEGRAM_BUILD_DEFINES=%TELEGRAM_BUILD_DEFINES%,TDESKTOP_DISABLE_UNITY_INTEGRATION + set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_UNITY_INTEGRATION ) - if not "%TELEGRAM_BUILD_DEFINES%" == "" ( - set "TELEGRAM_BUILD_DEFINES=%TELEGRAM_BUILD_DEFINES:~1%" + if not "%TDESKTOP_BUILD_DEFINES%" == "" ( + set "TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES:~1%" ) - call:logInfo "Build Defines: %TELEGRAM_BUILD_DEFINES%" + call:logInfo "Build Defines: %TDESKTOP_BUILD_DEFINES%" GOTO:EOF diff --git a/Telegram/gyp/refresh.bat b/Telegram/gyp/refresh.bat index a7cb0a14d..6cdf42aa3 100644 --- a/Telegram/gyp/refresh.bat +++ b/Telegram/gyp/refresh.bat @@ -13,11 +13,11 @@ if exist "%FullScriptPath%..\..\..\Libraries\openssl\tmp32\lib.pdb" ( ) ) -if "%TELEGRAM_BUILD_DEFINES%" == "" ( - set "TELEGRAM_BUILD_DEFINES= " +if "%TDESKTOP_BUILD_DEFINES%" == "" ( + set "TDESKTOP_BUILD_DEFINES= " ) -set "BUILD_DEFINES=-Dbuild_defines=%TELEGRAM_BUILD_DEFINES%" +set "BUILD_DEFINES=-Dbuild_defines=%TDESKTOP_BUILD_DEFINES%" cd "%FullScriptPath%" call gyp --depth=. --generator-output=../.. -Goutput_dir=out %BUILD_DEFINES% Telegram.gyp --format=ninja diff --git a/doc/building-msvc.md b/doc/building-msvc.md index 248efeb7d..2422b677a 100644 --- a/doc/building-msvc.md +++ b/doc/building-msvc.md @@ -275,7 +275,7 @@ run `git reset --hard HEAD` and execute `gclient` again SET PATH=%PATH%;D:\TBuild\Libraries\gyp;D:\TBuild\Libraries\ninja; cd ..\tdesktop\Telegram -If you want to pass a build define (like `TDESKTOP_DISABLE_AUTOUPDATE` or `TDESKTOP_DISABLE_NETWORK_PROXY`), call `set TELEGRAM_BUILD_DEFINES=TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_NETWORK_PROXY,...` (comma seperated string) +If you want to pass a build define (like `TDESKTOP_DISABLE_AUTOUPDATE` or `TDESKTOP_DISABLE_NETWORK_PROXY`), call `set TDESKTOP_BUILD_DEFINES=TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_NETWORK_PROXY,...` (comma seperated string) After, call `gyp\refresh.bat`