From 1731cfdc38c1a0d25e6f1c58af4e1ba43f388a3b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Sep 2015 20:49:42 +0300
Subject: [PATCH] version 0.8.59.dev prepared
---
Telegram/BuildWin.bat | 8 +-
Telegram/DeployWin.sh | 39 ---------
Telegram/PrepareWin.bat | 91 --------------------
Telegram/SourceFiles/application.cpp | 4 +-
Telegram/SourceFiles/config.h | 4 +-
Telegram/Telegram.plist | 2 +-
Telegram/Telegram.rc | Bin 5540 -> 5540 bytes
Telegram/Telegram.xcodeproj/project.pbxproj | 12 +--
Telegram/Version.sh | 2 +-
9 files changed, 16 insertions(+), 146 deletions(-)
delete mode 100644 Telegram/DeployWin.sh
delete mode 100644 Telegram/PrepareWin.bat
diff --git a/Telegram/BuildWin.bat b/Telegram/BuildWin.bat
index a5bd2ef0d9..017d7988fd 100644
--- a/Telegram/BuildWin.bat
+++ b/Telegram/BuildWin.bat
@@ -1,10 +1,10 @@
@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 "AppVersion=8059"
+set "AppVersionStrSmall=0.8.59"
+set "AppVersionStr=0.8.59"
+set "AppVersionStrFull=0.8.59.0"
set "DevChannel=1"
if %DevChannel% neq 0 goto preparedev
diff --git a/Telegram/DeployWin.sh b/Telegram/DeployWin.sh
deleted file mode 100644
index 8a667e9fe6..0000000000
--- a/Telegram/DeployWin.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-AppVersionStrMajor=`./Version.sh | awk -F " " '{print $1}'`
-AppVersion=`./Version.sh | awk -F " " '{print $2}'`
-AppVersionStr=`./Version.sh | awk -F " " '{print $3}'`
-DevChannel=`./Version.sh | awk -F " " '{print $4}'`
-DevPostfix=''
-if [ "$DevChannel" != "0" ]; then
- DevPostfix='.dev'
-fi
-
-if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStrMajor/$AppVersionStr$DevPostfix/tupdate$AppVersion" ]; then
- echo "tupdate$AppVersion not found!"
- exit 1
-fi
-
-if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStrMajor/$AppVersionStr$DevPostfix/tportable.$AppVersionStr$DevPostfix.zip" ]; then
- echo "tportable.$AppVersionStr$DevPostfix.zip not found!"
- exit 1
-fi
-
-if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStrMajor/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.exe" ]; then
- echo "tsetup.$AppVersionStr$DevPostfix.exe not found!"
- exit 1
-fi
-
-if [ ! -d "/z/TBuild/tother/tsetup/$AppVersionStrMajor" ]; then
- mkdir "/z/TBuild/tother/tsetup/$AppVersionStrMajor"
-fi
-
-if [ ! -d "/z/TBuild/tother/tsetup/$AppVersionStrMajor/$AppVersionStr$DevPostfix" ]; then
- mkdir "/z/TBuild/tother/tsetup/$AppVersionStrMajor/$AppVersionStr$DevPostfix"
-fi
-
-cp -v ./../Win32/Deploy/deploy/$AppVersionStrMajor/$AppVersionStr$DevPostfix/tupdate$AppVersion /z/TBuild/tother/tsetup/$AppVersionStrMajor/$AppVersionStr$DevPostfix/
-cp -v ./../Win32/Deploy/deploy/$AppVersionStrMajor/$AppVersionStr$DevPostfix/tportable.$AppVersionStr$DevPostfix.zip /z/TBuild/tother/tsetup/$AppVersionStrMajor/$AppVersionStr$DevPostfix/
-cp -v ./../Win32/Deploy/deploy/$AppVersionStrMajor/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.exe /z/TBuild/tother/tsetup/$AppVersionStrMajor/$AppVersionStr$DevPostfix/
-cp -v ./../Win32/Deploy/deploy/$AppVersionStrMajor/$AppVersionStr$DevPostfix/Telegram.pdb /z/TBuild/tother/tsetup/$AppVersionStrMajor/$AppVersionStr$DevPostfix/
-cp -v ./../Win32/Deploy/deploy/$AppVersionStrMajor/$AppVersionStr$DevPostfix/Updater.exe /z/TBuild/tother/tsetup/$AppVersionStrMajor/$AppVersionStr$DevPostfix/
-cp -v ./../Win32/Deploy/deploy/$AppVersionStrMajor/$AppVersionStr$DevPostfix/Updater.pdb /z/TBuild/tother/tsetup/$AppVersionStrMajor/$AppVersionStr$DevPostfix/
-
diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
deleted file mode 100644
index 7774c249d6..0000000000
--- a/Telegram/PrepareWin.bat
+++ /dev/null
@@ -1,91 +0,0 @@
-@echo OFF
-
-set "AppVersionStrMajor=0.8"
-set "AppVersion=8057"
-set "AppVersionStrSmall=0.8.57"
-set "AppVersionStr=0.8.57"
-set "AppVersionStrFull=0.8.57.0"
-set "DevChannel=0"
-
-if %DevChannel% neq 0 goto preparedev
-
-set "DevPostfix="
-set "DevParam="
-goto devprepared
-
-:preparedev
-
-set "DevPostfix=.dev"
-set "DevParam=-dev"
-
-:devprepared
-
-echo.
-echo Preparing 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
-
-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
-
-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%\
-
-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 .
-
-cd ..\..\..\..\..\Telegram
-goto eof
-
-:error2
-cd ..\..\..
-:error1
-cd ..\..\Telegram
-echo ERROR occured!
-exit /b %errorlevel%
-
-: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
-
-:eof
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index a6fdfaec55..a6da1425cb 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -680,8 +680,8 @@ void Application::checkMapVersion() {
if (Local::oldMapVersion() < AppVersion) {
if (Local::oldMapVersion()) {
QString versionFeatures;
- if (cDevVersion() && Local::oldMapVersion() < 8058) {
- versionFeatures = QString::fromUtf8("\xe2\x80\x94 Limited channels support added\n\xe2\x80\x94 Bug fixes and other minor improvements\n\nMore info about channels here:\nhttps://telegram.org/blog/channels");// .replace('@', qsl("@") + QChar(0x200D));
+ if (cDevVersion() && Local::oldMapVersion() < 8059) {
+ versionFeatures = QString::fromUtf8("\xe2\x80\x94 Channels members and admins management added\n\xe2\x80\x94 Bug fixes and other minor improvements\n\nMore info about channels here:\nhttps://telegram.org/blog/channels");// .replace('@', qsl("@") + QChar(0x200D));
} else if (Local::oldMapVersion() < 8056) {
versionFeatures = lang(lng_new_version_text).trimmed();
} else {
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 83744ff0d9..8e6ab54cef 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/
#pragma once
-static const int32 AppVersion = 8058;
-static const wchar_t *AppVersionStr = L"0.8.58";
+static const int32 AppVersion = 8059;
+static const wchar_t *AppVersionStr = L"0.8.59";
static const bool DevVersion = true;
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 6767e16d7d..a24d61cc8f 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.8.58</string>
+ <string>0.8.59</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>CFBundleSignature</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index e31e3efe5653119ecf29b99ab6a0f4f307a23459..9db6168da455cce3ce745421b5f21cae308fa573 100644
GIT binary patch
delta 53
zcmZ3Yy+nIM5ig_V<YHc9M$661c_%WlS~BP{7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d<
C+76Zg
delta 53
zcmZ3Yy+nIM5ig^~<YHc9MvKkMc_%WlS}^D_7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d<
CRSuE>
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 7ca3838922..cea7b7bdd9 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1697,7 +1697,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.8.58;
+ CURRENT_PROJECT_VERSION = 0.8.59;
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.58;
+ CURRENT_PROJECT_VERSION = 0.8.59;
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.58;
+ CURRENT_PROJECT_VERSION = 0.8.59;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.8;
- DYLIB_CURRENT_VERSION = 0.8.58;
+ DYLIB_CURRENT_VERSION = 0.8.59;
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.58;
+ CURRENT_PROJECT_VERSION = 0.8.59;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.8;
- DYLIB_CURRENT_VERSION = 0.8.58;
+ DYLIB_CURRENT_VERSION = 0.8.59;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index 9426837fab..3cde3a50ba 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 0.8 8058 0.8.58 1
+echo 0.8 8059 0.8.59 1
# AppVersionStrMajor AppVersion AppVersionStr DevChannel