mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

tools: distinguish complier args and tool args

Browse Source
This commit is contained in:
Contextualist
2020-01-08 11:15:05 -05:00
committed by Alexander Medvednikov
parent 38e5f0d1cf
commit 2a98cacecd
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vlib/compiler/vtools.v
View File

@ -5,11 +5,16 @@ import (
filepath
)
pub fn launch_tool(tname string) {
pub fn launch_tool(tname string, cmdname string) {
is_verbose := '-verbose' in os.args || '--verbose' in os.args
vexe := vexe_path()
vroot := filepath.dir(vexe)
set_vroot_folder( vroot ) // needed by tools to find back v
mut tname_index := os.args.index(cmdname)
if tname_index == -1 {
tname_index = os.args.len
}
mut compilation_options := os.args[1..tname_index].clone()
tool_args := os.args[1..].join(' ')
tool_exe := os.realpath('$vroot/tools/$tname')
tool_source := os.realpath('$vroot/tools/${tname}.v')
@ -41,9 +46,9 @@ pub fn launch_tool(tname string) {
}
if tool_should_be_recompiled {
mut compilation_options := ''
if tname == 'vfmt' { compilation_options = '-d vfmt' }
compilation_command := '"$vexe" $compilation_options "$tool_source"'
if tname == 'vfmt' { compilation_options << ['-d', 'vfmt'] }
compilation_args := compilation_options.join(' ')
compilation_command := '"$vexe" $compilation_args "$tool_source"'
if is_verbose {
eprintln('Compiling $tname with: "$compilation_command"')
}