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

compiler: use absolute paths for the c files and clean them up

pull/1722/head
Delyan Angelov 2019-08-23 20:05:02 +03:00 committed by Alexander Medvednikov
parent 0589decc43
commit 1b3a21f197
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/main.v
View File

@ -758,7 +758,7 @@ fn new_v(args[]string) *V {
println('Go to https://vlang.io to install V.') println('Go to https://vlang.io to install V.')
exit(1) exit(1)
} }
mut out_name_c := out_name.all_after('/') + '.tmp.c' mut out_name_c := os.realpath( out_name ) + '.tmp.c'
mut files := []string mut files := []string
// Add builtin files // Add builtin files
if !out_name.contains('builtin.o') { if !out_name.contains('builtin.o') {
@ -896,16 +896,20 @@ fn update_v() {
} }
fn test_v() { fn test_v() {
vexe := os.args[0] args := env_vflags_and_os_args()
vexe := args[0]
// Emily: pass args from the invocation to the test // Emily: pass args from the invocation to the test
// e.g. `v -g -os msvc test v` -> `$vexe -g -os msvc $file` // e.g. `v -g -os msvc test v` -> `$vexe -g -os msvc $file`
mut joined_args := os.args.right(1).join(' ') mut joined_args := env_vflags_and_os_args().right(1).join(' ')
joined_args = joined_args.left(joined_args.last_index('test')) joined_args = joined_args.left(joined_args.last_index('test'))
println('$joined_args') println('$joined_args')
test_files := os.walk_ext('.', '_test.v') test_files := os.walk_ext('.', '_test.v')
for file in test_files { for dot_relative_file in test_files {
print(file + ' ') relative_file := dot_relative_file.replace('./', '')
file := os.realpath( relative_file )
tmpcfilepath := file.replace('_test.v', '_test.tmp.c')
print(relative_file + ' ')
r := os.exec('$vexe $joined_args -debug $file') or { r := os.exec('$vexe $joined_args -debug $file') or {
panic('failed on $file') panic('failed on $file')
} }
@ -915,11 +919,14 @@ fn test_v() {
} else { } else {
println('OK') println('OK')
} }
os.rm( tmpcfilepath )
} }
println('\nBuilding examples...') println('\nBuilding examples...')
examples := os.walk_ext('examples', '.v') examples := os.walk_ext('examples', '.v')
for file in examples { for relative_file in examples {
print(file + ' ') file := os.realpath( relative_file )
tmpcfilepath := file.replace('.v', '.tmp.c')
print(relative_file + ' ')
r := os.exec('$vexe $joined_args -debug $file') or { r := os.exec('$vexe $joined_args -debug $file') or {
panic('failed on $file') panic('failed on $file')
} }
@ -929,6 +936,7 @@ fn test_v() {
} else { } else {
println('OK') println('OK')
} }
os.rm( tmpcfilepath )
} }
} }