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: fix panicing on a failing make in v up, or recompilation of vup.v

Browse Source
This commit is contained in:
Delyan Angelov 2021-03-08 23:51:46 +02:00
parent b893373e63
commit a9358e4948
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/tools/vup.v
View File

@ -41,7 +41,7 @@ fn main() {
app.backup('cmd/tools/vup.exe')
}
app.recompile_v()
os.execute_or_panic('"$app.vexe" cmd/tools/vup.v')
app.recompile_vup()
app.show_current_v_version()
}
@ -82,12 +82,26 @@ fn (app App) recompile_v() {
app.make(vself)
}
fn (app App) recompile_vup() {
vup_result := os.execute('"$app.vexe" -g cmd/tools/vup.v')
if vup_result.exit_code != 0 {
eprintln('recompiling vup.v failed:')
eprintln(vup_result.output)
}
}
fn (app App) make(vself string) {
mut make := 'make'
$if windows {
make = 'make.bat'
}
make_result := os.execute_or_panic(make)
make_result := os.execute(make)
if make_result.exit_code != 0 {
eprintln('> $make failed:')
eprintln('> make output:')
eprintln(make_result.output)
return
}
app.vprintln(make_result.output)
}