RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Version 0.10.5: new settings. First stable version on GYP.

This commit is contained in:
John Preston 2016-09-12 15:02:52 +03:00
parent 1629793ace
commit a62a47098e
8 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -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"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -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"

2
Telegram/SourceFiles/application.cpp
View File

@ -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();

6
Telegram/SourceFiles/core/version.h
View File

@ -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;

8
Telegram/build/version
View File

@ -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

16
Telegram/gyp/telegram_win.gypi
View File

@ -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': [

2
doc/building-qtcreator.md
View File

@ -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

1
doc/building-xcode.md
View File

@ -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