diff --git a/CMakeLists.txt b/CMakeLists.txt index e337defd25..ff9adc66d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,10 +11,12 @@ cmake_policy(SET CMP0091 NEW) set_property(GLOBAL PROPERTY USE_FOLDERS ON) include(cmake/variables.cmake) +include(cmake/version.cmake) +desktop_app_parse_version(Telegram/build/version) project(Telegram LANGUAGES C CXX - VERSION 1.9.0 + VERSION ${desktop_app_version_cmake} DESCRIPTION "Official Telegram Desktop messenger" HOMEPAGE_URL "https://desktop.telegram.org" ) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index ba7af8798e..d2daeeec0a 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -1064,14 +1064,13 @@ else() set(output_name "Telegram") endif() -set(current_version 1.9.1) set_target_properties(Telegram PROPERTIES OUTPUT_NAME ${output_name} MACOSX_BUNDLE_GUI_IDENTIFIER ${bundle_identifier} MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Telegram.plist XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/Telegram/${bundle_entitlements}" XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER ${bundle_identifier} - XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION ${current_version} + XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION ${desktop_app_version_string} XCODE_ATTRIBUTE_PRODUCT_NAME ${output_name} XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT $<$>:dwarf-with-dsym> XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME AppIcon diff --git a/Telegram/build/set_version.py b/Telegram/build/set_version.py index 7a1039ad66..ec503b8bca 100644 --- a/Telegram/build/set_version.py +++ b/Telegram/build/set_version.py @@ -20,6 +20,7 @@ executePath = os.getcwd() scriptPath = os.path.dirname(os.path.realpath(__file__)) inputVersion = '' +versionOriginal = '' versionMajor = '' versionMinor = '' versionPatch = '' @@ -29,6 +30,7 @@ for arg in sys.argv: match = re.match(r'^\s*(\d+)\.(\d+)(\.(\d+)(\.(\d+|beta))?)?\s*$', arg) if match: inputVersion = arg + versionOriginal = inputVersion versionMajor = match.group(1) versionMinor = match.group(2) versionPatch = match.group(4) if match.group(4) else '0' @@ -117,6 +119,7 @@ replaceInFile(scriptPath + '/version', [ [ r'(AppVersionStr\s+)\d[\d\.]*', r'\g<1>' + versionStr ], [ r'(BetaChannel\s+)\d', r'\g<1>' + ('1' if versionBeta else '0') ], [ r'(AlphaVersion\s+)\d+', r'\g<1>' + versionFullAlpha ], + [ r'(AppVersionOriginal\s+)\d[\d\.beta]*', r'\g<1>' + versionOriginal ], ]) print('Patching core/version.h...') diff --git a/Telegram/build/version b/Telegram/build/version index 6971f86bea..d59e11c239 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -4,3 +4,4 @@ AppVersionStrSmall 1.9.1 AppVersionStr 1.9.1 BetaChannel 0 AlphaVersion 1009001008 +AppVersionOriginal 1.9.1.8 diff --git a/cmake b/cmake index b1cf242c5f..8776c5c26e 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit b1cf242c5f381defffcdd92f5044c33e8346ac8a +Subproject commit 8776c5c26ea2087da67a4f47d8393727d6572967