Change TELEGRAM_BUILD_DEFINES to TDESKTOP_BUILD_DEFINES

This commit is contained in:
Christoph Auer 2017-02-19 09:29:08 +01:00
parent ef535ca026
commit daa934014c
3 changed files with 14 additions and 14 deletions

View File

@ -43,35 +43,35 @@ GOTO:EOF
:configureBuild :configureBuild
call:logInfo "Configuring build" call:logInfo "Configuring build"
call:logInfo "Build version: %BUILD_VERSION%" call:logInfo "Build version: %BUILD_VERSION%"
set TELEGRAM_BUILD_DEFINES= set TDESKTOP_BUILD_DEFINES=
echo %BUILD_VERSION% | findstr /C:"disable_autoupdate">nul && ( 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 && ( 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 && ( 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 && ( 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 && ( 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 && ( 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%" == "" ( if not "%TDESKTOP_BUILD_DEFINES%" == "" (
set "TELEGRAM_BUILD_DEFINES=%TELEGRAM_BUILD_DEFINES:~1%" set "TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES:~1%"
) )
call:logInfo "Build Defines: %TELEGRAM_BUILD_DEFINES%" call:logInfo "Build Defines: %TDESKTOP_BUILD_DEFINES%"
GOTO:EOF GOTO:EOF

View File

@ -13,11 +13,11 @@ if exist "%FullScriptPath%..\..\..\Libraries\openssl\tmp32\lib.pdb" (
) )
) )
if "%TELEGRAM_BUILD_DEFINES%" == "" ( if "%TDESKTOP_BUILD_DEFINES%" == "" (
set "TELEGRAM_BUILD_DEFINES= " set "TDESKTOP_BUILD_DEFINES= "
) )
set "BUILD_DEFINES=-Dbuild_defines=%TELEGRAM_BUILD_DEFINES%" set "BUILD_DEFINES=-Dbuild_defines=%TDESKTOP_BUILD_DEFINES%"
cd "%FullScriptPath%" cd "%FullScriptPath%"
call gyp --depth=. --generator-output=../.. -Goutput_dir=out %BUILD_DEFINES% Telegram.gyp --format=ninja call gyp --depth=. --generator-output=../.. -Goutput_dir=out %BUILD_DEFINES% Telegram.gyp --format=ninja

View File

@ -275,7 +275,7 @@ run `git reset --hard HEAD` and execute `gclient` again
SET PATH=%PATH%;D:\TBuild\Libraries\gyp;D:\TBuild\Libraries\ninja; SET PATH=%PATH%;D:\TBuild\Libraries\gyp;D:\TBuild\Libraries\ninja;
cd ..\tdesktop\Telegram 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` After, call `gyp\refresh.bat`