vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

tools: make `v up` more informative on failure

master
Delyan Angelov 2022-04-30 10:08:31 +03:00
parent dab649ec8a
commit dcdfdf4dd8
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cmd/tools/vup.v
View File

@ -34,13 +34,19 @@ fn main() {
// println(v_hash) // println(v_hash)
// println(current_hash) // println(current_hash)
if v_hash == current_hash { if v_hash == current_hash {
println('V is already updated.')
app.show_current_v_version() app.show_current_v_version()
return return
} }
$if windows { $if windows {
app.backup('cmd/tools/vup.exe') app.backup('cmd/tools/vup.exe')
} }
app.recompile_v() if !app.recompile_v() {
app.show_current_v_version()
eprintln('Recompiling V *failed*.')
eprintln('Try running `$get_make_cmd_name()` .')
exit(1)
}
app.recompile_vup() app.recompile_vup()
app.show_current_v_version() app.show_current_v_version()
} }
@ -66,7 +72,7 @@ fn (app App) update_from_master() {
} }
} }
fn (app App) recompile_v() { fn (app App) recompile_v() bool {
// Note: app.vexe is more reliable than just v (which may be a symlink) // Note: app.vexe is more reliable than just v (which may be a symlink)
opts := if app.is_prod { '-prod' } else { '' } opts := if app.is_prod { '-prod' } else { '' }
vself := '${os.quoted_path(app.vexe)} $opts self' vself := '${os.quoted_path(app.vexe)} $opts self'
@ -74,35 +80,35 @@ fn (app App) recompile_v() {
self_result := os.execute(vself) self_result := os.execute(vself)
if self_result.exit_code == 0 { if self_result.exit_code == 0 {
println(self_result.output.trim_space()) println(self_result.output.trim_space())
return return true
} else { } else {
app.vprintln('`$vself` failed, running `make`...') app.vprintln('`$vself` failed, running `make`...')
app.vprintln(self_result.output.trim_space()) app.vprintln(self_result.output.trim_space())
} }
app.make(vself) return app.make(vself)
} }
fn (app App) recompile_vup() { fn (app App) recompile_vup() bool {
vup_result := os.execute('${os.quoted_path(app.vexe)} -g cmd/tools/vup.v') vup_result := os.execute('${os.quoted_path(app.vexe)} -g cmd/tools/vup.v')
if vup_result.exit_code != 0 { if vup_result.exit_code != 0 {
eprintln('recompiling vup.v failed:') eprintln('recompiling vup.v failed:')
eprintln(vup_result.output) eprintln(vup_result.output)
return false
} }
return true
} }
fn (app App) make(vself string) { fn (app App) make(vself string) bool {
mut make := 'make' make := get_make_cmd_name()
$if windows {
make = 'make.bat'
}
make_result := os.execute(make) make_result := os.execute(make)
if make_result.exit_code != 0 { if make_result.exit_code != 0 {
eprintln('> $make failed:') eprintln('> $make failed:')
eprintln('> make output:') eprintln('> make output:')
eprintln(make_result.output) eprintln(make_result.output)
return return false
} }
app.vprintln(make_result.output) app.vprintln(make_result.output)
return true
} }
fn (app App) show_current_v_version() { fn (app App) show_current_v_version() {
@ -116,8 +122,7 @@ fn (app App) show_current_v_version() {
vversion += ', timestamp: ' + latest_v_commit_time.output.trim_space() vversion += ', timestamp: ' + latest_v_commit_time.output.trim_space()
} }
} }
println('Current V version:') println('Current V version: $vversion')
println(vversion)
} }
} }
@ -162,3 +167,11 @@ fn (app App) get_git() {
eprintln("error: Install `git` using your system's package manager") eprintln("error: Install `git` using your system's package manager")
} }
} }
fn get_make_cmd_name() string {
$if windows {
return 'make.bat'
} $else {
return 'make'
}
}