From 2e286912544fff891698b9360dae3d225455ada4 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Wed, 23 Oct 2019 12:25:00 +0300 Subject: [PATCH] _windows.v fix --- vlib/compiler/main.v | 6 +++--- vlib/compiler/module_header.v | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vlib/compiler/main.v b/vlib/compiler/main.v index 81df5444e8..35a1077701 100644 --- a/vlib/compiler/main.v +++ b/vlib/compiler/main.v @@ -533,13 +533,13 @@ pub fn (v &V) v_files_from_dir(dir string) []string { if file.ends_with('_test.v') { 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 } - if file.ends_with('_lin.v') && v.os != .linux { + if (file.ends_with('_lin.v') || file.ends_with('_linux.v')) && v.os != .linux { 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 } if file.ends_with('_nix.v') && v.os == .windows { diff --git a/vlib/compiler/module_header.v b/vlib/compiler/module_header.v index b2cc8db9b5..e16695bc48 100644 --- a/vlib/compiler/module_header.v +++ b/vlib/compiler/module_header.v @@ -37,7 +37,7 @@ fn generate_vh(mod string) { // Consts println(full_mod_path) 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) mut v := new_v(['foo.v']) //v.pref.generating_vh = true