diff --git a/Telegram/Build.bat b/Telegram/Build.bat index ed0b4f3b2..33c14d499 100644 --- a/Telegram/Build.bat +++ b/Telegram/Build.bat @@ -146,7 +146,11 @@ if not exist %FinalDeployPath% mkdir %FinalDeployPath% xcopy %DeployPath%\%UpdateFile% %FinalDeployPath%\ xcopy %DeployPath%\%PortableFile% %FinalDeployPath%\ -xcopy %DeployPath%\%SetupFile% %FinalDeployPath%\ +if %BetaVersion% equ 0 ( + xcopy %DeployPath%\%SetupFile% %FinalDeployPath%\ +) else ( + xcopy %DeployPath%\%BetaKeyFile% %FinalDeployPath%\ +) xcopy %DeployPath%\Telegram.pdb %FinalDeployPath%\ xcopy %DeployPath%\Updater.exe %FinalDeployPath%\ xcopy %DeployPath%\Updater.pdb %FinalDeployPath%\ diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index bc7f15fcd..992b92152 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -20,10 +20,10 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 9015; -static const wchar_t *AppVersionStr = L"0.9.15"; +static const int32 AppVersion = 9014; +static const wchar_t *AppVersionStr = L"0.9.14"; static const bool DevVersion = true; -#define BETA_VERSION (9015001ULL) // just comment this line to build public version +#define BETA_VERSION (9014003ULL) // just comment this line to build public version static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 5da30bd6d..6d11dd048 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.15 + 0.9.14 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index da9e0cb32..a85db2d68 100644 Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index ec4b98a94..c93c1d170 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1687,7 +1687,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.15; + CURRENT_PROJECT_VERSION = 0.9.14; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1706,7 +1706,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.9.15; + CURRENT_PROJECT_VERSION = 0.9.14; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1733,10 +1733,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.15; + CURRENT_PROJECT_VERSION = 0.9.14; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.15; + DYLIB_CURRENT_VERSION = 0.9.14; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1867,10 +1867,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.15; + CURRENT_PROJECT_VERSION = 0.9.14; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.15; + DYLIB_CURRENT_VERSION = 0.9.14; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ""; diff --git a/Telegram/Version b/Telegram/Version index 9a82208c0..fb6f76a92 100644 --- a/Telegram/Version +++ b/Telegram/Version @@ -1,6 +1,6 @@ -AppVersion 9015 +AppVersion 9014 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.15 -AppVersionStr 0.9.15 +AppVersionStrSmall 0.9.14 +AppVersionStr 0.9.14 DevChannel 1 -BetaVersion 9015001 +BetaVersion 9014003