procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Alpha version 0.10.3: new settings design, first OS X version by GYP.

Browse source
This commit is contained in:
John Preston 2016-09-02 12:28:18 -04:00
parent 07dffb948d
commit 73b81ac1f4
7 changed files with 20 additions and 25 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,2,2
PRODUCTVERSION 0,10,2,2
FILEVERSION 0,10,3,0
PRODUCTVERSION 0,10,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.10.2.2"
VALUE "FileVersion", "0.10.3.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.2.2"
VALUE "ProductVersion", "0.10.3.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,2,2
PRODUCTVERSION 0,10,2,2
FILEVERSION 0,10,3,0
PRODUCTVERSION 0,10,3,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.2.2"
VALUE "FileVersion", "0.10.3.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.2.2"
VALUE "ProductVersion", "0.10.3.0"
END
END
BLOCK "VarFileInfo"

4
Telegram/SourceFiles/application.cpp
View file

@ -1065,8 +1065,8 @@ void AppClass::checkMapVersion() {
if (Local::oldMapVersion() < AppVersion) {
if (Local::oldMapVersion()) {
QString versionFeatures;
if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9058) {
versionFeatures = QString::fromUtf8("\xe2\x80\x94 Alpha version of an embedded video player");
if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 10003) {
versionFeatures = QString::fromUtf8("\xe2\x80\x94 New cute design for the Settings page");
} else if (Local::oldMapVersion() < 10000) {
versionFeatures = langNewVersionText();
} else {

8
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 (10002002ULL)
#define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 10002;
constexpr str_const AppVersionStr = "0.10.2";
constexpr bool AppAlphaVersion = false;
constexpr int AppVersion = 10003;
constexpr str_const AppVersionStr = "0.10.3";
constexpr bool AppAlphaVersion = true;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

5
Telegram/build/set_version.bat
View file

@ -89,11 +89,6 @@ call :repl "Replace=(AppVersion\s+=) (\s*)\d+/$1$2 %VersionFull%" "Filename=%Ver
call :repl "Replace=(AppVersionStr\s+=) (\s*)[&hat;;]+/$1$2 &quot;%VersionStrSmall%&quot;" "Filename=%VersionHeaderPath%" || goto :error
call :repl "Replace=(AppAlphaVersion\s+=) (\s*)[a-z]+/$1$2 %VersionAlphaBool%" "Filename=%VersionHeaderPath%" || goto :error
echo Patching project.pbxproj...
set "TelegramProjectPath=%FullScriptPath%..\Telegram.xcodeproj\project.pbxproj"
call :repl "Replace=(TDESKTOP_MAJOR_VERSION\s+=) (\s*)[&hat;;]+/$1$2 %VersionMajor%.%VersionMinor%" "Filename=%TelegramProjectPath%" || goto :error
call :repl "Replace=(TDESKTOP_VERSION\s+=) (\s*)[&hat;;]+/$1$2 %VersionStrSmall%" "Filename=%TelegramProjectPath%" || goto :error
echo Patching Telegram.rc...
set "ResourcePath=%FullScriptPath%..\Resources\winrc\Telegram.rc"
call :repl "Replace=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error

10
Telegram/build/version
View file

@ -1,6 +1,6 @@
AppVersion 10002
AppVersion 10003
AppVersionStrMajor 0.10
AppVersionStrSmall 0.10.2
AppVersionStr 0.10.2
AlphaChannel 0
BetaVersion 10002002
AppVersionStrSmall 0.10.3
AppVersionStr 0.10.3
AlphaChannel 1
BetaVersion 0

2
Telegram/gyp/Telegram.gyp
View file

@ -51,7 +51,7 @@
],
},
'includes': [
'common_executable.gypi',
'common_executable.gypi',
'telegram_qrc.gypi',
'telegram_win.gypi',
'telegram_mac.gypi',