version 0.8.22.dev prepared - new OpenAL version, new Auto-Update (no temp -> ready rename), some fixes

This commit is contained in:
John Preston 2015-06-04 16:04:34 +03:00
parent b6325ec9d4
commit 6d8f277904
9 changed files with 16 additions and 18 deletions

View File

@ -1,9 +1,9 @@
@echo OFF
set "AppVersion=8024"
set "AppVersionStrSmall=0.8.24"
set "AppVersionStr=0.8.24"
set "AppVersionStrFull=0.8.24.0"
set "AppVersion=8022"
set "AppVersionStrSmall=0.8.22"
set "AppVersionStr=0.8.22"
set "AppVersionStrFull=0.8.22.0"
set "DevChannel=1"
if %DevChannel% neq 0 goto preparedev

View File

@ -640,10 +640,8 @@ void Application::checkMapVersion() {
psRegisterCustomScheme();
if (Local::oldMapVersion()) {
QString versionFeatures;
if (DevChannel && Local::oldMapVersion() < 8020) {
if (DevChannel && Local::oldMapVersion() < 8022) {
versionFeatures = lang(lng_new_version_minor).trimmed();// QString::fromUtf8("\xe2\x80\x94 Video captions are displayed\n\xe2\x80\x94 Photo captions are displayed in photo viewer\n\xe2\x80\x94 Round corners for messages").replace('@', qsl("@") + QChar(0x200D));
} else if (!DevChannel && Local::oldMapVersion() < 8016) {
versionFeatures = lang(lng_new_version_text).trimmed();
} else if (!DevChannel && Local::oldMapVersion() < 8021) {
versionFeatures = lang(lng_new_version_text).trimmed();
}

View File

@ -441,7 +441,7 @@ UpdateDownloader::~UpdateDownloader() {
bool checkReadyUpdate() {
QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp");
if (!QFile(readyFilePath).exists()) {
if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists()) { // old dir after elevated update
if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() || QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) {
UpdateDownloader::clearAll();
}
return false;

View File

@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/
#pragma once
static const int32 AppVersion = 8024;
static const wchar_t *AppVersionStr = L"0.8.24";
static const int32 AppVersion = 8022;
static const wchar_t *AppVersionStr = L"0.8.22";
static const bool DevChannel = true;
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";

View File

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.8.24</string>
<string>0.8.22</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>CFBundleSignature</key>

Binary file not shown.

View File

@ -1703,7 +1703,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.8.24;
CURRENT_PROJECT_VERSION = 0.8.22;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@ -1721,7 +1721,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.8.24;
CURRENT_PROJECT_VERSION = 0.8.22;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1747,10 +1747,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.8.24;
CURRENT_PROJECT_VERSION = 0.8.22;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.8;
DYLIB_CURRENT_VERSION = 0.8.24;
DYLIB_CURRENT_VERSION = 0.8.22;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -1890,10 +1890,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.8.24;
CURRENT_PROJECT_VERSION = 0.8.22;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.8;
DYLIB_CURRENT_VERSION = 0.8.24;
DYLIB_CURRENT_VERSION = 0.8.22;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

Binary file not shown.

View File

@ -1,2 +1,2 @@
echo 8024 0.8.24 1
echo 8022 0.8.22 1
# AppVersion AppVersionStr DevChannel