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

build.htnl: add switch betwwen csh and Bash for FreeBSD.

Browse Source 
GitOrigin-RevId: 0c637eb83930522be768d77fc21b9fb7243ba6dc
This commit is contained in:
levlam 2018-11-07 16:25:56 +03:00
parent f005966752
commit 7801d91d14
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
build.html
View File

@ -93,10 +93,17 @@ select.large { font-size: large; }
<p></p> <p></p>
</div> </div>
<div id="buildConsoleDiv" class="hide"> <div id="buildShellDiv" class="hide">
<span>Choose which Console application you want to use for building:</span><br> <span>Choose which shell application you want to use for building:</span><br>
<label><input type="radio" id="buildConsoleRadioPowerShell" name="buildConsoleRadio" onchange="onOptionsChanged()" checked/>PowerShell</label> <label><input type="radio" id="buildShellRadioPowerShell" name="buildShellRadio" onchange="onOptionsChanged()" checked/>PowerShell</label>
<label><input type="radio" id="buildConsoleRadioBash" name="buildConsoleRadio" onchange="onOptionsChanged()"/>mintty/Bash</label> <label><input type="radio" id="buildShellRadioBash" name="buildShellRadio" onchange="onOptionsChanged()"/>mintty/Bash</label>
<p></p>
</div>
<div id="buildShellBsdDiv" class="hide">
<span>Choose which shell application you want to use for building:</span><br>
<label><input type="radio" id="buildShellBsdRadioCsh" name="buildShellRadioBsd" onchange="onOptionsChanged()" checked/>tcsh/csh</label>
<label><input type="radio" id="buildShellBsdRadioBash" name="buildShellRadioBsd" onchange="onOptionsChanged()"/>Bash</label>
<p></p> <p></p>
</div> </div>
@ -372,11 +379,18 @@ function onOptionsChanged() {
var use_powershell = false; var use_powershell = false;
var use_cmd = false; var use_cmd = false;
var use_csh = false;
if (os_windows) { if (os_windows) {
document.getElementById('buildConsoleDiv').style.display = 'block'; document.getElementById('buildShellDiv').style.display = 'block';
use_powershell = document.getElementById('buildConsoleRadioPowerShell').checked; use_powershell = document.getElementById('buildShellRadioPowerShell').checked;
} else { } else {
document.getElementById('buildConsoleDiv').style.display = 'none'; document.getElementById('buildShellDiv').style.display = 'none';
}
if (os_freebsd) {
document.getElementById('buildShellBsdDiv').style.display = 'block';
use_csh = document.getElementById('buildShellBsdRadioCsh').checked;
} else {
document.getElementById('buildShellBsdDiv').style.display = 'none';
} }
var use_msvc = os_windows; var use_msvc = os_windows;
@ -488,8 +502,8 @@ function onOptionsChanged() {
if (os_mac) { if (os_mac) {
return 'Terminal'; return 'Terminal';
} }
if (os_freebsd) { if (use_csh) {
return 'csh'; return 'tcsh/csh';
} }
return 'Bash'; return 'Bash';
})(); })();
@ -763,7 +777,7 @@ function onOptionsChanged() {
} }
var resolve_path = use_powershell ? 'Resolve-Path' : (os_mac ? 'greadlink -e' : (is_alpine || os_freebsd ? 'readlink -f' : 'readlink -e')); var resolve_path = use_powershell ? 'Resolve-Path' : (os_mac ? 'greadlink -e' : (is_alpine || os_freebsd ? 'readlink -f' : 'readlink -e'));
var resolved_path = resolve_path + ' ../td/lib/cmake/Td'; var resolved_path = resolve_path + ' ../td/lib/cmake/Td';
if (os_freebsd) { if (use_csh) {
cmake_init_options.push('-DTd_DIR:PATH=$td_dir'); cmake_init_options.push('-DTd_DIR:PATH=$td_dir');
commands.push('set td_dir=`' + resolved_path + '` ; ' + getCmakeInitCommand(cmake_init_options)); commands.push('set td_dir=`' + resolved_path + '` ; ' + getCmakeInitCommand(cmake_init_options));
} else { } else {