From 6a2a13d346d47e35b3925cd61c48aa2e1e84afdc Mon Sep 17 00:00:00 2001 From: John Preston <johnprestonmail@gmail.com> Date: Mon, 28 Jan 2019 12:39:05 +0300 Subject: [PATCH] Closed alpha version 1.5.8.1. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 2 +- Telegram/build/updates.py | 7 +++++-- Telegram/build/version | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 74c2b20a2..cb95ad611 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ <Identity Name="TelegramMessengerLLP.TelegramDesktop" ProcessorArchitecture="ARCHITECTURE" Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A" - Version="1.5.8.0" /> + Version="1.5.8.1" /> <Properties> <DisplayName>Telegram Desktop</DisplayName> <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName> diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index b8d373612..d7de85537 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 1,5,8,0 - PRODUCTVERSION 1,5,8,0 + FILEVERSION 1,5,8,1 + PRODUCTVERSION 1,5,8,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.5.8.0" + VALUE "FileVersion", "1.5.8.1" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.5.8.0" + VALUE "ProductVersion", "1.5.8.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 64f9326c1..0d2b5e03d 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 1,5,8,0 - PRODUCTVERSION 1,5,8,0 + FILEVERSION 1,5,8,1 + PRODUCTVERSION 1,5,8,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.5.8.0" + VALUE "FileVersion", "1.5.8.1" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.5.8.0" + VALUE "ProductVersion", "1.5.8.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index aafae7f0d..b685cc5d4 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (1005008001ULL) #ifdef TDESKTOP_OFFICIAL_TARGET #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION diff --git a/Telegram/build/updates.py b/Telegram/build/updates.py index ee01efb85..6ec2414a4 100644 --- a/Telegram/build/updates.py +++ b/Telegram/build/updates.py @@ -107,6 +107,8 @@ if building: print('Finished.') finish(0) +commandPath = scriptPath + '/../../out/Debug/' + outputFolder + '/command.txt' + if composing: templatePath = scriptPath + '/../../../TelegramPrivate/updates_template.txt' if not os.path.exists(templatePath): @@ -147,16 +149,17 @@ if composing: changelog = '\n'.join(commits) print('\n\nReady! File: ' + archive + '\nChangelog:\n' + changelog) with open(templatePath, 'r') as template: - with open(scriptPath + '/../../out/Debug/' + outputFolder + '/command.txt', 'w') as f: + with open(commandPath, 'w') as f: for line in template: if line.startswith('//'): continue line = line.replace('{path}', scriptPath + '/../../out/Debug/' + outputFolder + '/' + archive) line = line.replace('{caption}', 'TDesktop at ' + today.replace('_', '.') + ':\n\n' + changelog) f.write(line) + print('\n\nEdit:\n') + print('vi ' + commandPath) finish(0) -commandPath = scriptPath + '/../../out/Debug/' + outputFolder + '/command.txt' if not os.path.exists(commandPath): print('[ERROR] Command file not found.') finish(1) diff --git a/Telegram/build/version b/Telegram/build/version index 9c071f6cc..c3bade3fc 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 1.5 AppVersionStrSmall 1.5.8 AppVersionStr 1.5.8 BetaChannel 0 -AlphaVersion 0 +AlphaVersion 1005008001