Skip to content

Commit

Permalink
Merge version 6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
giuseppeM99 committed Aug 21, 2022
2 parents 58168e2 + f59097a commit bcc8c6e
Show file tree
Hide file tree
Showing 15 changed files with 359 additions and 174 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if (POLICY CMP0065)
cmake_policy(SET CMP0065 NEW)
endif()

project(TelegramBotApi VERSION 6.1 LANGUAGES CXX)
project(TelegramBotApi VERSION 6.2 LANGUAGES CXX)

if (POLICY CMP0069)
option(TELEGRAM_BOT_API_ENABLE_LTO "Use \"ON\" to enable Link Time Optimization.")
Expand Down
10 changes: 7 additions & 3 deletions build.html
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@

<div class="main">
<div id="osSelectDiv" class="large">
<p>Choose an operating system, on which you want to use the Telegram Bot API server:</p>
<p>Choose an operating system on which you want to use the Telegram Bot API server:</p>
<select id="osSelect" onchange="onOsChanged(false)" autofocus class="large">
<option>Choose an operating system:</option>
<option>Windows</option>
Expand All @@ -195,7 +195,7 @@
</div>

<div id="linuxSelectDiv" class="hide">
<p>Choose a Linux distro, on which you want to use the Telegram Bot API server:</p>
<p>Choose a Linux distro on which you want to use the Telegram Bot API server:</p>
<select id="linuxSelect" onchange="onOsChanged(false)" class="large">
<option>Choose a Linux distro:</option>
<option>Alpine</option>
Expand All @@ -207,6 +207,7 @@
<option>Ubuntu 16</option>
<option>Ubuntu 18</option>
<option>Ubuntu 20</option>
<option>Ubuntu 22</option>
<option>Other</option>
</select>
<p></p>
Expand Down Expand Up @@ -493,6 +494,8 @@
return '-6.0';
case 'Ubuntu 20':
return '-10';
case 'Ubuntu 22':
return '-14';
default:
return ''; // use default version
}
Expand Down Expand Up @@ -534,6 +537,7 @@
case 'Ubuntu 16':
case 'Ubuntu 18':
case 'Ubuntu 20':
case 'Ubuntu 22':
if (linux_distro.includes('Debian') && !use_root) {
commands.push('su -');
}
Expand All @@ -550,7 +554,7 @@
}
if (use_clang) {
packages += ' clang' + getClangVersionSuffix() + ' libc++-dev';
if (linux_distro === 'Debian 10+' || linux_distro === 'Ubuntu 18' || linux_distro === 'Ubuntu 20') {
if (linux_distro === 'Debian 10+' || linux_distro === 'Ubuntu 18' || linux_distro === 'Ubuntu 20' || linux_distro === 'Ubuntu 22') {
packages += ' libc++abi-dev';
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion td
Submodule td updated 268 files
Loading

0 comments on commit bcc8c6e

Please sign in to comment.