diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 475e3ee7e..e9ff08323 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -10,7 +10,7 @@ + Version="4.8.4.1" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 6f39c1168..c90e04576 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,8,4,0 - PRODUCTVERSION 4,8,4,0 + FILEVERSION 4,8,4,1 + PRODUCTVERSION 4,8,4,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "4.8.4.0" + VALUE "FileVersion", "4.8.4.1" VALUE "LegalCopyright", "Copyright (C) 2014-2023" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.8.4.0" + VALUE "ProductVersion", "4.8.4.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 732642486..1292b3215 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,8,4,0 - PRODUCTVERSION 4,8,4,0 + FILEVERSION 4,8,4,1 + PRODUCTVERSION 4,8,4,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "4.8.4.0" + VALUE "FileVersion", "4.8.4.1" VALUE "LegalCopyright", "Copyright (C) 2014-2023" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.8.4.0" + VALUE "ProductVersion", "4.8.4.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 0058d08cf..9e9f695db 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/const_string.h" -#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004001ULL) #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION diff --git a/Telegram/build/updates.py b/Telegram/build/updates.py index 3f5cd81a5..85dbda59a 100644 --- a/Telegram/build/updates.py +++ b/Telegram/build/updates.py @@ -53,9 +53,9 @@ outputFolder = 'updates/' + today archive = 'tdesktop_macOS_' + today + '.zip' if building: - print('Building debug version for OS X 10.12+..') + print('Building Release version for OS X 10.12+..') - if os.path.exists('../out/Debug/' + outputFolder): + if os.path.exists('../out/Release/' + outputFolder): finish(1, 'Todays updates version exists.') if uuid == '': @@ -65,11 +65,11 @@ if building: os.chdir('../out') if uuid == '': - result = subprocess.call('cmake --build . --config Debug --target Telegram', shell=True) + result = subprocess.call('cmake --build . --config Release --target Telegram', shell=True) if result != 0: finish(1, 'While building Telegram.') - os.chdir('Debug') + os.chdir('Release') if uuid == '': if not os.path.exists('Telegram.app'): finish(1, 'Telegram.app not found.') @@ -106,7 +106,7 @@ if building: finish(1, 'Adding tdesktop to archive.') print('Beginning notarization process.') - lines = subprocess.check_output('xcrun altool --notarize-app --primary-bundle-id "com.tdesktop.TelegramDebug" --username "' + username + '" --password "@keychain:AC_PASSWORD" --file "' + archive + '"', stderr=subprocess.STDOUT, shell=True).decode('utf-8') + lines = subprocess.check_output('xcrun altool --notarize-app --primary-bundle-id "com.tdesktop.Telegram" --username "' + username + '" --password "@keychain:AC_PASSWORD" --file "' + archive + '"', stderr=subprocess.STDOUT, shell=True).decode('utf-8') print('Response received.') uuid = '' for line in lines.split('\n'): @@ -193,7 +193,7 @@ if building: print('NB! Notarization log not found.') finish(0) -commandPath = scriptPath + '/../../out/Debug/' + outputFolder + '/command.txt' +commandPath = scriptPath + '/../../out/Release/' + outputFolder + '/command.txt' if composing: templatePath = scriptPath + '/../../../DesktopPrivate/updates_template.txt' @@ -235,7 +235,7 @@ if composing: for line in template: if line.startswith('//'): continue - line = line.replace('{path}', scriptPath + '/../../out/Debug/' + outputFolder + '/' + archive) + line = line.replace('{path}', scriptPath + '/../../out/Release/' + outputFolder + '/' + archive) line = line.replace('{caption}', 'TDesktop at ' + today.replace('_', '.') + ':\n\n' + changelog) f.write(line) print('\n\nEdit:\n') @@ -262,9 +262,9 @@ if len(caption) > 1024: print('vi ' + commandPath) finish(1, 'Too large.') -if not os.path.exists('../out/Debug/' + outputFolder + '/' + archive): +if not os.path.exists('../out/Release/' + outputFolder + '/' + archive): finish(1, 'Not built yet.') -subprocess.call(scriptPath + '/../../out/Debug/Telegram.app/Contents/MacOS/Telegram -sendpath interpret://' + scriptPath + '/../../out/Debug/' + outputFolder + '/command.txt', shell=True) +subprocess.call(scriptPath + '/../../out/Release/Telegram.app/Contents/MacOS/Telegram -sendpath interpret://' + scriptPath + '/../../out/Release/' + outputFolder + '/command.txt', shell=True) finish(0) diff --git a/Telegram/build/version b/Telegram/build/version index e74e8988d..ac52ec62e 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,5 +3,5 @@ AppVersionStrMajor 4.8 AppVersionStrSmall 4.8.4 AppVersionStr 4.8.4 BetaChannel 0 -AlphaVersion 0 -AppVersionOriginal 4.8.4 +AlphaVersion 4008004001 +AppVersionOriginal 4.8.4.1