andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Fix trailing spaces.

Browse Source 
GitOrigin-RevId: ea9723580fb56b3511fb9451db5aedb968bd8813
This commit is contained in:
levlam 2018-10-30 21:17:42 +03:00
parent 6fbaed9997
commit edc7393c24
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.html
View File

@ -195,7 +195,7 @@ function getExampleAnchor(language) {
function onLanguageChanged(initial) { function onLanguageChanged(initial) {
var language = document.getElementById('languageSelect').value; var language = document.getElementById('languageSelect').value;
var supported_os = getSupportedOs(language); var supported_os = getSupportedOs(language);
var os_select = document.getElementById('osSelect'); var os_select = document.getElementById('osSelect');
@ -470,7 +470,7 @@ function onOptionsChanged() {
var compiler = use_clang ? 'clang++ >= 3.4' : 'g++ >= 4.9.2'; var compiler = use_clang ? 'clang++ >= 3.4' : 'g++ >= 4.9.2';
pre_text.push('Install Git, ' + compiler + ', make, CMake >= 3.0.2, OpenSSL, zlib, gperf, PHP' + jdk + ' using your package manager.'); pre_text.push('Install Git, ' + compiler + ', make, CMake >= 3.0.2, OpenSSL, zlib, gperf, PHP' + jdk + ' using your package manager.');
} }
var terminal_name = os_windows ? (use_powershell ? 'PowerShell' : 'mintty/Bash') : (os_mac ? 'Terminal' : 'Bash'); var terminal_name = os_windows ? (use_powershell ? 'PowerShell' : 'mintty/Bash') : (os_mac ? 'Terminal' : 'Bash');
if (os_windows) { if (os_windows) {
pre_text.push('Close and re-open ' + terminal_name + ' if PATH environment variable was changed.'); pre_text.push('Close and re-open ' + terminal_name + ' if PATH environment variable was changed.');
@ -642,7 +642,7 @@ function onOptionsChanged() {
commands.push('export CXXFLAGS="' + cxx_flags.join(' ') + '"'); commands.push('export CXXFLAGS="' + cxx_flags.join(' ') + '"');
} }
} }
cmake_init_options = getBacicCmakeInitOptions(); cmake_init_options = getBacicCmakeInitOptions();
if (os_mac) { if (os_mac) {
cmake_init_options.push('-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/'); cmake_init_options.push('-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/');
@ -665,7 +665,7 @@ function onOptionsChanged() {
if (use_vcpkg) { if (use_vcpkg) {
cmake_init_options.push('-DCMAKE_TOOLCHAIN_FILE:FILEPATH=../vcpkg/scripts/buildsystems/vcpkg.cmake'); cmake_init_options.push('-DCMAKE_TOOLCHAIN_FILE:FILEPATH=../vcpkg/scripts/buildsystems/vcpkg.cmake');
} }
function getCmakeInitCommand(options) { function getCmakeInitCommand(options) {
var prefix = ''; var prefix = '';
if (os_linux) { if (os_linux) {
@ -730,7 +730,7 @@ function onOptionsChanged() {
var resolve_path = use_powershell ? 'Resolve-Path' : (os_mac ? 'greadlink -e' : (is_alpine ? 'readlink -f' : 'readlink -e')); var resolve_path = use_powershell ? 'Resolve-Path' : (os_mac ? 'greadlink -e' : (is_alpine ? 'readlink -f' : 'readlink -e'));
cmake_init_options.push('-DTd_DIR:PATH=$(' + resolve_path + ' ../td/lib/cmake/Td)'); cmake_init_options.push('-DTd_DIR:PATH=$(' + resolve_path + ' ../td/lib/cmake/Td)');
commands.push(getCmakeInitCommand(cmake_init_options)); commands.push(getCmakeInitCommand(cmake_init_options));
build_command = 'cmake --build .'; build_command = 'cmake --build .';
if (jni_install_dir) { if (jni_install_dir) {
build_command += ' --target install'; build_command += ' --target install';