diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index eabfd46fd..8e62f6314 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.5.7.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 1ec6edc21..45b954c36 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 2,5,6,0 - PRODUCTVERSION 2,5,6,0 + FILEVERSION 2,5,7,0 + PRODUCTVERSION 2,5,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.5.6.0" + VALUE "FileVersion", "2.5.7.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.5.6.0" + VALUE "ProductVersion", "2.5.7.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index f92532279..79d75ec67 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 2,5,6,0 - PRODUCTVERSION 2,5,6,0 + FILEVERSION 2,5,7,0 + PRODUCTVERSION 2,5,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.5.6.0" + VALUE "FileVersion", "2.5.7.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.5.6.0" + VALUE "ProductVersion", "2.5.7.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/_other/packer.cpp b/Telegram/SourceFiles/_other/packer.cpp index 69e73fcbd..99fae21f1 100644 --- a/Telegram/SourceFiles/_other/packer.cpp +++ b/Telegram/SourceFiles/_other/packer.cpp @@ -149,6 +149,7 @@ int main(int argc, char *argv[]) QString remove; int version = 0; bool targetosx = false; + bool targetwin64 = false; QFileInfoList files; for (int i = 0; i < argc; ++i) { if (string("-path") == argv[i] && i + 1 < argc) { @@ -158,6 +159,7 @@ int main(int argc, char *argv[]) if (remove.isEmpty()) remove = info.canonicalPath() + "/"; } else if (string("-target") == argv[i] && i + 1 < argc) { targetosx = (string("osx") == argv[i + 1]); + targetwin64 = (string("win64") == argv[i + 1]); } else if (string("-version") == argv[i] && i + 1 < argc) { version = QString(argv[i + 1]).toInt(); } else if (string("-beta") == argv[i]) { @@ -464,7 +466,7 @@ int main(int argc, char *argv[]) cout << "Signature verified!\n"; RSA_free(pbKey); #ifdef Q_OS_WIN - QString outName(QString("tupdate%1").arg(AlphaVersion ? AlphaVersion : version)); + QString outName((targetwin64 ? QString("tx64upd%1") : QString("tupdate%1")).arg(AlphaVersion ? AlphaVersion : version)); #elif defined Q_OS_MAC QString outName((targetosx ? QString("tosxupd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version)); #elif defined Q_OS_UNIX diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index a94af807e..8c4ddc021 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 2005006; -constexpr auto AppVersionStr = "2.5.6"; -constexpr auto AppBetaVersion = true; +constexpr auto AppVersion = 2005007; +constexpr auto AppVersionStr = "2.5.7"; +constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat index 1c0959e5e..3f6afd7e1 100644 --- a/Telegram/build/build.bat +++ b/Telegram/build/build.bat @@ -16,10 +16,44 @@ FOR /F "tokens=1* delims= " %%i in (%FullScriptPath%target) do set "BuildTarget= if "%BuildTarget%" equ "uwp" ( set "BuildUWP=1" +) else if "%BuildTarget%" equ "uwp64" ( + set "BuildUWP=1" ) else ( set "BuildUWP=0" ) +if "%BuildTarget%" equ "win64" ( + set "Build64=1" +) else if "%BuildTarget%" equ "uwp64" ( + set "Build64=1" +) else ( + set "Build64=0" +) + +if %Build64% neq 0 ( + if "%Platform%" neq "x64" ( + echo Bad environment. Make sure to run from 'x64 Native Tools Command Prompt for VS 2019'. + exit /b + ) else if "%VSCMD_ARG_HOST_ARCH%" neq "x64" ( + echo Bad environment. Make sure to run from 'x64 Native Tools Command Prompt for VS 2019'. + exit /b + ) else if "%VSCMD_ARG_TGT_ARCH%" neq "x64" ( + echo Bad environment. Make sure to run from 'x64 Native Tools Command Prompt for VS 2019'. + exit /b + ) +) else ( + if "%Platform%" neq "x86" ( + echo Bad environment. Make sure to run from 'x86 Native Tools Command Prompt for VS 2019'. + exit /b + ) else if "%VSCMD_ARG_HOST_ARCH%" neq "x86" ( + echo Bad environment. Make sure to run from 'x86 Native Tools Command Prompt for VS 2019'. + exit /b + ) else if "%VSCMD_ARG_TGT_ARCH%" neq "x86" ( + echo Bad environment. Make sure to run from 'x86 Native Tools Command Prompt for VS 2019'. + exit /b + ) +) + FOR /F "tokens=1,2* delims= " %%i in (%FullScriptPath%version) do set "%%i=%%j" set "VersionForPacker=%AppVersion%" @@ -40,18 +74,32 @@ if %AlphaVersion% neq 0 ( echo. if %BuildUWP% neq 0 ( - echo Building version %AppVersionStrFull% for UWP.. + if %Build64% neq 0 ( + echo Building version %AppVersionStrFull% for UWP 64 bit.. + ) else ( + echo Building version %AppVersionStrFull% for UWP.. + ) ) else ( - echo Building version %AppVersionStrFull% for Windows.. + if %Build64% neq 0 ( + echo Building version %AppVersionStrFull% for Windows 64 bit.. + ) else ( + echo Building version %AppVersionStrFull% for Windows.. + ) ) echo. set "HomePath=%FullScriptPath%.." set "ResourcesPath=%HomePath%\Resources" set "SolutionPath=%HomePath%\..\out" -set "UpdateFile=tupdate%AppVersion%" -set "SetupFile=tsetup.%AppVersionStrFull%.exe" -set "PortableFile=tportable.%AppVersionStrFull%.zip" +if %Build64% neq 0 ( + set "UpdateFile=tx64upd%AppVersion%" + set "SetupFile=tsetup-x64.%AppVersionStrFull%.exe" + set "PortableFile=tportable-x64.%AppVersionStrFull%.zip" +) else ( + set "UpdateFile=tupdate%AppVersion%" + set "SetupFile=tsetup.%AppVersionStrFull%.exe" + set "PortableFile=tportable.%AppVersionStrFull%.zip" +) set "ReleasePath=%SolutionPath%\Release" set "DeployPath=%ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStrFull%" set "SignPath=%HomePath%\..\..\DesktopPrivate\Sign.bat" @@ -116,13 +164,13 @@ echo. echo Version %AppVersionStrFull% build successfull. Preparing.. echo. -if not exist "%SolutionPath%\..\..\Libraries\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" ( +if not exist "%SolutionPath%\..\..\Libraries\win64\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" ( echo Utility dump_syms not found! exit /b 1 ) echo Dumping debug symbols.. -call "%SolutionPath%\..\..\Libraries\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" "%ReleasePath%\%BinaryName%.pdb" > "%ReleasePath%\%BinaryName%.sym" +call "%SolutionPath%\..\..\Libraries\win64\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" "%ReleasePath%\%BinaryName%.pdb" > "%ReleasePath%\%BinaryName%.sym" echo Done! set "PATH=%PATH%;C:\Program Files\7-Zip;C:\Program Files (x86)\Inno Setup 5" @@ -145,7 +193,7 @@ if %BuildUWP% equ 0 ( ) if %AlphaVersion% equ 0 ( - iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppVersionFull=%AppVersionStrFull% "/dReleasePath=%ReleasePath%" "%FullScriptPath%setup.iss" + iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppVersionFull=%AppVersionStrFull% "/dReleasePath=%ReleasePath%" "/dMyBuildTarget=%BuildTarget%" "%FullScriptPath%setup.iss" if %errorlevel% neq 0 goto error if not exist "%SetupFile%" goto error :sign3 @@ -156,7 +204,7 @@ if %BuildUWP% equ 0 ( ) ) - call Packer.exe -version %VersionForPacker% -path %BinaryName%.exe -path Updater.exe %AlphaBetaParam% + call Packer.exe -version %VersionForPacker% -path %BinaryName%.exe -path Updater.exe -target %BuildTarget% %AlphaBetaParam% if %errorlevel% neq 0 goto error if %AlphaVersion% neq 0 ( @@ -193,30 +241,24 @@ echo Done! if %BuildUWP% neq 0 ( cd "%HomePath%" - mkdir "%ReleasePath%\AppX_x86" - xcopy "Resources\uwp\AppX\*" "%ReleasePath%\AppX_x86\" /E - set "ResourcePath=%ReleasePath%\AppX_x86\AppxManifest.xml" - call :repl "Argument= (ProcessorArchitecture=)"ARCHITECTURE"/ $1"x86"" "Filename=!ResourcePath!" || goto error - - makepri new /pr Resources\uwp\AppX\ /cf Resources\uwp\priconfig.xml /mn %ReleasePath%\AppX_x86\AppxManifest.xml /of %ReleasePath%\AppX_x86\resources.pri + mkdir "%ReleasePath%\AppX" + xcopy "Resources\uwp\AppX\*" "%ReleasePath%\AppX\" /E + set "ResourcePath=%ReleasePath%\AppX\AppxManifest.xml" + if %Build64% equ 0 ( + call :repl "Argument= (ProcessorArchitecture=)"ARCHITECTURE"/ $1"x86"" "Filename=!ResourcePath!" || goto error + ) else ( + call :repl "Argument= (ProcessorArchitecture=)"ARCHITECTURE"/ $1"x64"" "Filename=!ResourcePath!" || goto error + ) + makepri new /pr Resources\uwp\AppX\ /cf Resources\uwp\priconfig.xml /mn %ReleasePath%\AppX\AppxManifest.xml /of %ReleasePath%\AppX\resources.pri if %errorlevel% neq 0 goto error - xcopy "%ReleasePath%\%BinaryName%.exe" "%ReleasePath%\AppX_x86\" + xcopy "%ReleasePath%\%BinaryName%.exe" "%ReleasePath%\AppX\" - MakeAppx.exe pack /d "%ReleasePath%\AppX_x86" /l /p ..\out\Release\%BinaryName%.x86.appx - if %errorlevel% neq 0 goto error - - mkdir "%ReleasePath%\AppX_x64" - xcopy "Resources\uwp\AppX\*" "%ReleasePath%\AppX_x64\" /E - set "ResourcePath=%ReleasePath%\AppX_x64\AppxManifest.xml" - call :repl "Argument= (ProcessorArchitecture=)"ARCHITECTURE"/ $1"x64"" "Filename=!ResourcePath!" || goto error - - makepri new /pr Resources\uwp\AppX\ /cf Resources\uwp\priconfig.xml /mn %ReleasePath%\AppX_x64\AppxManifest.xml /of %ReleasePath%\AppX_x64\resources.pri - if %errorlevel% neq 0 goto error - - xcopy "%ReleasePath%\%BinaryName%.exe" "%ReleasePath%\AppX_x64\" - - MakeAppx.exe pack /d "%ReleasePath%\AppX_x64" /l /p ..\out\Release\%BinaryName%.x64.appx + if %Build64% equ 0 ( + MakeAppx.exe pack /d "%ReleasePath%\AppX" /l /p ..\out\Release\%BinaryName%.x86.appx + ) else ( + MakeAppx.exe pack /d "%ReleasePath%\AppX" /l /p ..\out\Release\%BinaryName%.x64.appx + ) if %errorlevel% neq 0 goto error if not exist "%ReleasePath%\deploy" mkdir "%ReleasePath%\deploy" @@ -229,8 +271,7 @@ if %BuildUWP% neq 0 ( move "%ReleasePath%\%BinaryName%.exe" "%DeployPath%\" if "%AlphaBetaParam%" equ "" ( - move "%ReleasePath%\AppX_x86" "%DeployPath%\AppX_x86" - move "%ReleasePath%\AppX_x64" "%DeployPath%\AppX_x64" + move "%ReleasePath%\AppX" "%DeployPath%\AppX" ) else ( echo Leaving result in out\Release\AppX_arch for now.. ) @@ -262,7 +303,11 @@ if %BuildUWP% neq 0 ( if %errorlevel% neq 0 goto error ) -set "FinalDeployPath=%FinalReleasePath%\%AppVersionStrMajor%\%AppVersionStrFull%\tsetup" +if %Build64% equ 0 ( + set "FinalDeployPath=%FinalReleasePath%\%AppVersionStrMajor%\%AppVersionStrFull%\tsetup" +) else ( + set "FinalDeployPath=%FinalReleasePath%\%AppVersionStrMajor%\%AppVersionStrFull%\tx64" +) if %BuildUWP% equ 0 ( echo. diff --git a/Telegram/build/setup.iss b/Telegram/build/setup.iss index 819ad5618..952af4ecc 100644 --- a/Telegram/build/setup.iss +++ b/Telegram/build/setup.iss @@ -20,7 +20,6 @@ DefaultDirName={userappdata}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes OutputDir={#ReleasePath} -OutputBaseFilename=tsetup.{#MyAppVersionFull} SetupIconFile={#SourcePath}..\Resources\art\icon256.ico UninstallDisplayIcon={app}\Telegram.exe Compression=lzma @@ -32,6 +31,14 @@ CloseApplications=force DisableDirPage=no DisableProgramGroupPage=no +#if MyBuildTarget == "win64" +ArchitecturesAllowed=x64 +ArchitecturesInstallIn64BitMode=x64 +OutputBaseFilename=tsetup-x64.{#MyAppVersionFull} +#else +OutputBaseFilename=tsetup.{#MyAppVersionFull} +#endif + [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" Name: "it"; MessagesFile: "compiler:Languages\Italian.isl" diff --git a/Telegram/build/version b/Telegram/build/version index 667a3ae8e..1da20bb68 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2005006 +AppVersion 2005007 AppVersionStrMajor 2.5 -AppVersionStrSmall 2.5.6 -AppVersionStr 2.5.6 -BetaChannel 1 +AppVersionStrSmall 2.5.7 +AppVersionStr 2.5.7 +BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.5.6.beta +AppVersionOriginal 2.5.7 diff --git a/changelog.txt b/changelog.txt index 002eaba88..708152a0c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +2.5.7 (28.01.21) + +- Delete not only messages, but also groups you created and call history for all sides, without a trace. +- Adjust volume for individual participants of a voice chat. +- Report fake groups or channels impersonating famous people or organizations by opening their Profile > ... > Report. + 2.5.6 beta (22.01.21) - Press Up arrow to edit your last sent comment.