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

_windows.v fix

pull/2514/head
Alexander Medvednikov 2019-10-23 12:25:00 +03:00
parent 5ef4b2064f
commit 2e28691254
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/compiler/main.v
View File

@ -533,13 +533,13 @@ pub fn (v &V) v_files_from_dir(dir string) []string {
if file.ends_with('_test.v') { if file.ends_with('_test.v') {
continue continue
} }
if file.ends_with('_win.v') && v.os != .windows { if (file.ends_with('_win.v') || file.ends_with('_windows.v')) && v.os != .windows {
continue continue
} }
if file.ends_with('_lin.v') && v.os != .linux { if (file.ends_with('_lin.v') || file.ends_with('_linux.v')) && v.os != .linux {
continue continue
} }
if file.ends_with('_mac.v') && v.os != .mac { if (file.ends_with('_mac.v') || file.ends_with('_darwin.v')) && v.os != .mac {
continue continue
} }
if file.ends_with('_nix.v') && v.os == .windows { if file.ends_with('_nix.v') && v.os == .windows {

2
vlib/compiler/module_header.v
View File

@ -37,7 +37,7 @@ fn generate_vh(mod string) {
// Consts // Consts
println(full_mod_path) println(full_mod_path)
mut vfiles := os.walk_ext(full_mod_path, '.v') mut vfiles := os.walk_ext(full_mod_path, '.v')
filtered := vfiles.filter(!it.ends_with('test.v') && !it.ends_with('_win.v')) // TODO merge once filter allows it filtered := vfiles.filter(!it.ends_with('test.v') && !it.ends_with('_windows.v')) // TODO merge once filter allows it
println(filtered) println(filtered)
mut v := new_v(['foo.v']) mut v := new_v(['foo.v'])
//v.pref.generating_vh = true //v.pref.generating_vh = true