0.8.58.dev version, limited channels support done
This commit is contained in:
		
							parent
							
								
									79b2035b0d
								
							
						
					
					
						commit
						776688383c
					
				
					 6 changed files with 135 additions and 10 deletions
				
			
		
							
								
								
									
										125
									
								
								Telegram/BuildWin.bat
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										125
									
								
								Telegram/BuildWin.bat
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,125 @@
 | 
			
		|||
@echo OFF
 | 
			
		||||
 | 
			
		||||
set "AppVersionStrMajor=0.8"
 | 
			
		||||
set "AppVersion=8058"
 | 
			
		||||
set "AppVersionStrSmall=0.8.58"
 | 
			
		||||
set "AppVersionStr=0.8.58"
 | 
			
		||||
set "AppVersionStrFull=0.8.58.0"
 | 
			
		||||
set "DevChannel=1"
 | 
			
		||||
 | 
			
		||||
if %DevChannel% neq 0 goto preparedev
 | 
			
		||||
 | 
			
		||||
set "DevPostfix="
 | 
			
		||||
set "DevParam="
 | 
			
		||||
goto devprepared
 | 
			
		||||
 | 
			
		||||
:preparedev
 | 
			
		||||
 | 
			
		||||
set "DevPostfix=.dev"
 | 
			
		||||
set "DevParam=-dev"
 | 
			
		||||
 | 
			
		||||
:devprepared
 | 
			
		||||
 | 
			
		||||
echo.
 | 
			
		||||
echo Building version %AppVersionStr%%DevPostfix%..
 | 
			
		||||
echo.
 | 
			
		||||
 | 
			
		||||
if exist ..\Win32\Deploy\deploy\%AppVersionStrMajor%\%AppVersionStr%\ goto error_exist1
 | 
			
		||||
if exist ..\Win32\Deploy\deploy\%AppVersionStrMajor%\%AppVersionStr%.dev\ goto error_exist2
 | 
			
		||||
if exist ..\Win32\Deploy\tupdate%AppVersion% goto error_exist3
 | 
			
		||||
 | 
			
		||||
copy ./SourceFiles/telegram.qrc /B+ ,,/Y
 | 
			
		||||
if %errorlevel% neq 0 goto error
 | 
			
		||||
 | 
			
		||||
cd ..\
 | 
			
		||||
MSBuild Telegram.sln /property:Configuration=Deploy
 | 
			
		||||
if %errorlevel% neq 0 goto error
 | 
			
		||||
 | 
			
		||||
echo .
 | 
			
		||||
echo Version %AppVersionStr%%DevPostfix% build successfull! Preparing..
 | 
			
		||||
echo .
 | 
			
		||||
 | 
			
		||||
set "PATH=%PATH%;C:\Program Files\7-Zip;C:\Program Files (x86)\Inno Setup 5"
 | 
			
		||||
cd ..\Win32\Deploy
 | 
			
		||||
 | 
			
		||||
call ..\..\..\TelegramPrivate\Sign.bat Telegram.exe
 | 
			
		||||
if %errorlevel% neq 0 goto error1
 | 
			
		||||
 | 
			
		||||
call ..\..\..\TelegramPrivate\Sign.bat Updater.exe
 | 
			
		||||
if %errorlevel% neq 0 goto error1
 | 
			
		||||
 | 
			
		||||
iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppFullVersion=%AppVersionStrFull% /dMyAppVersionForExe=%AppVersionStr%%DevPostfix% ..\..\Telegram\Setup.iss
 | 
			
		||||
if %errorlevel% neq 0 goto error1
 | 
			
		||||
 | 
			
		||||
call ..\..\..\TelegramPrivate\Sign.bat tsetup.%AppVersionStr%%DevPostfix%.exe
 | 
			
		||||
if %errorlevel% neq 0 goto error1
 | 
			
		||||
 | 
			
		||||
call Packer.exe -version %AppVersion% -path Telegram.exe -path Updater.exe %DevParam%
 | 
			
		||||
if %errorlevel% neq 0 goto error1
 | 
			
		||||
 | 
			
		||||
if not exist deploy mkdir deploy
 | 
			
		||||
if not exist deploy\%AppVersionStrMajor% mkdir deploy\%AppVersionStrMajor%
 | 
			
		||||
mkdir deploy\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%
 | 
			
		||||
mkdir deploy\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\Telegram
 | 
			
		||||
if %errorlevel% neq 0 goto error1
 | 
			
		||||
 | 
			
		||||
move Telegram.exe deploy\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\Telegram\
 | 
			
		||||
move Updater.exe deploy\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
move Telegram.pdb deploy\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
move Updater.pdb deploy\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
move tsetup.%AppVersionStr%%DevPostfix%.exe deploy\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
move tupdate%AppVersion% deploy\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
if %errorlevel% neq 0 goto error1
 | 
			
		||||
 | 
			
		||||
cd deploy\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%
 | 
			
		||||
7z a -mx9 tportable.%AppVersionStr%%DevPostfix%.zip Telegram\
 | 
			
		||||
if %errorlevel% neq 0 goto error2
 | 
			
		||||
 | 
			
		||||
echo .
 | 
			
		||||
echo Version %AppVersionStr%%DevPostfix% is ready for deploy!
 | 
			
		||||
echo .
 | 
			
		||||
 | 
			
		||||
if not exist tupdate%AppVersion% goto error2
 | 
			
		||||
if not exist tportable.%AppVersionStr%%DevPostfix%.zip goto error2
 | 
			
		||||
if not exist tsetup.%AppVersionStr%%DevPostfix%.exe goto error2
 | 
			
		||||
if not exist Telegram.pdb goto error2
 | 
			
		||||
if not exist Updater.exe goto error2
 | 
			
		||||
if not exist Updater.pdb goto error2
 | 
			
		||||
if not exist Z:\TBuild\tother\tsetup\%AppVersionStrMajor% mkdir Z:\TBuild\tother\tsetup\%AppVersionStrMajor%
 | 
			
		||||
if not exist Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix% mkdir Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%
 | 
			
		||||
 | 
			
		||||
xcopy tupdate%AppVersion% Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
xcopy tportable.%AppVersionStr%%DevPostfix%.zip Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
xcopy tsetup.%AppVersionStr%%DevPostfix%.exe Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
xcopy Telegram.pdb Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
xcopy Updater.exe Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
xcopy Updater.pdb Z:\TBuild\tother\tsetup\%AppVersionStrMajor%\%AppVersionStr%%DevPostfix%\
 | 
			
		||||
 | 
			
		||||
echo Version %AppVersionStr%%DevPostfix% deployed successfully!
 | 
			
		||||
 | 
			
		||||
cd ..\..\..\..\..\Telegram
 | 
			
		||||
goto eof
 | 
			
		||||
 | 
			
		||||
:error2
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
:error1
 | 
			
		||||
cd ..\..\Telegram
 | 
			
		||||
goto error
 | 
			
		||||
 | 
			
		||||
:error_exist1
 | 
			
		||||
echo Deploy folder for version %AppVersionStr% already exists!
 | 
			
		||||
exit /b 1
 | 
			
		||||
 | 
			
		||||
:error_exist2
 | 
			
		||||
echo Deploy folder for version %AppVersionStr%.dev already exists!
 | 
			
		||||
exit /b 1
 | 
			
		||||
 | 
			
		||||
:error_exist3
 | 
			
		||||
echo Update file for version %AppVersion% already exists!
 | 
			
		||||
exit /b 1
 | 
			
		||||
 | 
			
		||||
:error
 | 
			
		||||
echo ERROR occured! 
 | 
			
		||||
exit /b %errorlevel%
 | 
			
		||||
 | 
			
		||||
:eof
 | 
			
		||||
| 
						 | 
				
			
			@ -680,8 +680,8 @@ void Application::checkMapVersion() {
 | 
			
		|||
    if (Local::oldMapVersion() < AppVersion) {
 | 
			
		||||
		if (Local::oldMapVersion()) {
 | 
			
		||||
			QString versionFeatures;
 | 
			
		||||
			if (cDevVersion() && Local::oldMapVersion() < 8054) {
 | 
			
		||||
				versionFeatures = QString::fromUtf8("\xe2\x80\x94 Preview when sending links to GIF animations and PDF files\n\xe2\x80\x94 Full date and time shown when mouse over message timestamp");// .replace('@', qsl("@") + QChar(0x200D));
 | 
			
		||||
			if (cDevVersion() && Local::oldMapVersion() < 8058) {
 | 
			
		||||
				versionFeatures = QString::fromUtf8("\xe2\x80\x94 Limited channels support added, see https://telegram.org/blog/channels\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D));
 | 
			
		||||
			} else if (Local::oldMapVersion() < 8056) {
 | 
			
		||||
				versionFeatures = lang(lng_new_version_text).trimmed();
 | 
			
		||||
			} else {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,7 +11,7 @@
 | 
			
		|||
	<key>CFBundlePackageType</key>
 | 
			
		||||
	<string>APPL</string>
 | 
			
		||||
	<key>CFBundleShortVersionString</key>
 | 
			
		||||
	<string>0.8.57</string>
 | 
			
		||||
	<string>0.8.58</string>
 | 
			
		||||
        <key>LSMinimumSystemVersion</key>
 | 
			
		||||
        <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 | 
			
		||||
	<key>CFBundleSignature</key>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -1697,7 +1697,7 @@
 | 
			
		|||
			buildSettings = {
 | 
			
		||||
				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 | 
			
		||||
				COPY_PHASE_STRIP = NO;
 | 
			
		||||
				CURRENT_PROJECT_VERSION = 0.8.57;
 | 
			
		||||
				CURRENT_PROJECT_VERSION = 0.8.58;
 | 
			
		||||
				DEBUG_INFORMATION_FORMAT = dwarf;
 | 
			
		||||
				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 | 
			
		||||
				GCC_OPTIMIZATION_LEVEL = 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -1715,7 +1715,7 @@
 | 
			
		|||
			buildSettings = {
 | 
			
		||||
				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 | 
			
		||||
				COPY_PHASE_STRIP = YES;
 | 
			
		||||
				CURRENT_PROJECT_VERSION = 0.8.57;
 | 
			
		||||
				CURRENT_PROJECT_VERSION = 0.8.58;
 | 
			
		||||
				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 | 
			
		||||
				GCC_OPTIMIZATION_LEVEL = fast;
 | 
			
		||||
				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
 | 
			
		||||
| 
						 | 
				
			
			@ -1741,10 +1741,10 @@
 | 
			
		|||
				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 | 
			
		||||
				CODE_SIGN_IDENTITY = "";
 | 
			
		||||
				COPY_PHASE_STRIP = NO;
 | 
			
		||||
				CURRENT_PROJECT_VERSION = 0.8.57;
 | 
			
		||||
				CURRENT_PROJECT_VERSION = 0.8.58;
 | 
			
		||||
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 | 
			
		||||
				DYLIB_COMPATIBILITY_VERSION = 0.8;
 | 
			
		||||
				DYLIB_CURRENT_VERSION = 0.8.57;
 | 
			
		||||
				DYLIB_CURRENT_VERSION = 0.8.58;
 | 
			
		||||
				ENABLE_STRICT_OBJC_MSGSEND = YES;
 | 
			
		||||
				FRAMEWORK_SEARCH_PATHS = "";
 | 
			
		||||
				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 | 
			
		||||
| 
						 | 
				
			
			@ -1875,10 +1875,10 @@
 | 
			
		|||
				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 | 
			
		||||
				CODE_SIGN_IDENTITY = "";
 | 
			
		||||
				COPY_PHASE_STRIP = NO;
 | 
			
		||||
				CURRENT_PROJECT_VERSION = 0.8.57;
 | 
			
		||||
				CURRENT_PROJECT_VERSION = 0.8.58;
 | 
			
		||||
				DEBUG_INFORMATION_FORMAT = dwarf;
 | 
			
		||||
				DYLIB_COMPATIBILITY_VERSION = 0.8;
 | 
			
		||||
				DYLIB_CURRENT_VERSION = 0.8.57;
 | 
			
		||||
				DYLIB_CURRENT_VERSION = 0.8.58;
 | 
			
		||||
				ENABLE_STRICT_OBJC_MSGSEND = YES;
 | 
			
		||||
				FRAMEWORK_SEARCH_PATHS = "";
 | 
			
		||||
				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,2 +1,2 @@
 | 
			
		|||
echo 0.8 8057 0.8.57 0
 | 
			
		||||
echo 0.8 8058 0.8.58 1
 | 
			
		||||
# AppVersionStrMajor AppVersion AppVersionStr DevChannel
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue