From a62a47098e143c2afa5caf74a1b907f4b8bcd3ad Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 12 Sep 2016 15:02:52 +0300 Subject: [PATCH] Version 0.10.5: new settings. First stable version on GYP. --- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/application.cpp | 2 +- Telegram/SourceFiles/core/version.h | 6 +++--- Telegram/build/version | 8 ++++---- Telegram/gyp/telegram_win.gypi | 16 +++++++++++----- doc/building-qtcreator.md | 2 ++ doc/building-xcode.md | 1 - 8 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 2a12b03b4..983ed4d62 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,4,1 - PRODUCTVERSION 0,10,4,1 + FILEVERSION 0,10,5,0 + PRODUCTVERSION 0,10,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.10.4.1" + VALUE "FileVersion", "0.10.5.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.4.1" + VALUE "ProductVersion", "0.10.5.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index b7663a39d..aec484524 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,4,1 - PRODUCTVERSION 0,10,4,1 + FILEVERSION 0,10,5,0 + PRODUCTVERSION 0,10,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.10.4.1" + VALUE "FileVersion", "0.10.5.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.4.1" + VALUE "ProductVersion", "0.10.5.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index c4274b9a3..27d75fcea 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -1067,7 +1067,7 @@ void AppClass::checkMapVersion() { QString versionFeatures; if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 10003) { versionFeatures = QString::fromUtf8("\xe2\x80\x94 New cute design for the Settings page"); - } else if (Local::oldMapVersion() < 10000) { + } else if (!(cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 10005) { versionFeatures = langNewVersionText(); } else { versionFeatures = lang(lng_new_version_minor).trimmed(); diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 5f9c309ec..a2627a7ce 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,9 +22,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/basic_types.h" -#define BETA_VERSION_MACRO (10004001ULL) +#define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 10004; -constexpr str_const AppVersionStr = "0.10.4"; +constexpr int AppVersion = 10005; +constexpr str_const AppVersionStr = "0.10.5"; constexpr bool AppAlphaVersion = false; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index 6b21284d0..2014aa445 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 10004 +AppVersion 10005 AppVersionStrMajor 0.10 -AppVersionStrSmall 0.10.4 -AppVersionStr 0.10.4 +AppVersionStrSmall 0.10.5 +AppVersionStr 0.10.5 AlphaChannel 0 -BetaVersion 10004001 +BetaVersion 0 diff --git a/Telegram/gyp/telegram_win.gypi b/Telegram/gyp/telegram_win.gypi index 1973d650c..ce23aa2e6 100644 --- a/Telegram/gyp/telegram_win.gypi +++ b/Telegram/gyp/telegram_win.gypi @@ -39,11 +39,6 @@ 'lib_exif', 'OpenAL32', 'common', - 'libavformat/libavformat.a', - 'libavcodec/libavcodec.a', - 'libavutil/libavutil.a', - 'libswresample/libswresample.a', - 'libswscale/libswscale.a', 'opus', 'celt', 'silk_common', @@ -52,6 +47,17 @@ 'lib/exception_handler', 'lib/crash_generation_client', ], + 'msvs_settings': { + 'VCLinkerTool': { + 'AdditionalOptions': [ + 'libavformat/libavformat.a', + 'libavcodec/libavcodec.a', + 'libavutil/libavutil.a', + 'libswresample/libswresample.a', + 'libswscale/libswscale.a', + ], + }, + }, 'configurations': { 'Debug': { 'include_dirs': [ diff --git a/doc/building-qtcreator.md b/doc/building-qtcreator.md index 3549dbe9d..92751c4c4 100644 --- a/doc/building-qtcreator.md +++ b/doc/building-qtcreator.md @@ -188,3 +188,5 @@ In Terminal go to **/home/user/TBuild/tdesktop** and run * Open Telegram.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediate** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediate** and build for Debug, if GeneratedFiles are not found click **Run qmake** from **Build** menu and try again * Open Updater.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateUpdater** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateUpdater** and build for Debug * Release Telegram build will require removing **CUSTOM_API_ID** definition in Telegram.pro project and may require changing paths in **/home/user/TBuild/tdesktop/Telegram/FixMake.sh** or **/home/user/TBuild/tdesktop/Telegram/FixMake32.sh** for static library linking fix, static linking applies only on second Release build (first uses old Makefile) + +[cmake]: building-cmake.md diff --git a/doc/building-xcode.md b/doc/building-xcode.md index f5c6b36eb..0a547a2b4 100644 --- a/doc/building-xcode.md +++ b/doc/building-xcode.md @@ -250,7 +250,6 @@ In Terminal go to **/Users/user/TBuild/Libraries** and run: In Terminal go to **/Users/user/TBuild/Libraries** and run - git clone https://chromium.googlesource.com/external/gyp cd gyp git apply ../../tdesktop/Telegram/Patches/gyp.diff