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

added -user_mod_path command line option to add a module search path

pull/2916/head
prime31 2019-11-28 02:04:57 -08:00 committed by Alexander Medvednikov
parent 7545ea709a
commit 208f67132d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vlib/compiler/main.v
View File

@ -125,6 +125,7 @@ pub mut:
is_fmt bool is_fmt bool
is_bare bool is_bare bool
user_mod_path string // `v -user_mod_path /Users/user/modules` adds a new lookup path for imported modules
vlib_path string vlib_path string
vpath string vpath string
x64 bool x64 bool
@ -851,6 +852,9 @@ pub fn new_v(args[]string) &V {
os.mkdir('$v_modules_path${os.path_separator}cache') or { panic(err) } os.mkdir('$v_modules_path${os.path_separator}cache') or { panic(err) }
} }
// optional, custom modules search path
user_mod_path := get_cmdline_option(args, '-user_mod_path', '')
// Location of all vlib files // Location of all vlib files
vroot := os.dir(vexe_path()) vroot := os.dir(vexe_path())
vlib_path := get_cmdline_option(args, '-vlib-path', filepath.join(vroot, 'vlib')) vlib_path := get_cmdline_option(args, '-vlib-path', filepath.join(vroot, 'vlib'))
@ -1039,6 +1043,7 @@ pub fn new_v(args[]string) &V {
building_v: !is_repl && (rdir_name == 'compiler' || rdir_name == 'v.v' || dir.contains('vlib')) building_v: !is_repl && (rdir_name == 'compiler' || rdir_name == 'v.v' || dir.contains('vlib'))
comptime_define: comptime_define comptime_define: comptime_define
is_fmt: comptime_define == 'vfmt' is_fmt: comptime_define == 'vfmt'
user_mod_path: user_mod_path
vlib_path: vlib_path vlib_path: vlib_path
vpath: vpath vpath: vpath
} }

3
vlib/compiler/modules.v
View File

@ -165,6 +165,9 @@ fn (v &V) find_module_path(mod string) ?string {
tried_paths << filepath.join(v.compiled_dir, 'modules', mod_path) tried_paths << filepath.join(v.compiled_dir, 'modules', mod_path)
tried_paths << filepath.join(v.pref.vlib_path, mod_path) tried_paths << filepath.join(v.pref.vlib_path, mod_path)
tried_paths << filepath.join(modules_lookup_path, mod_path) tried_paths << filepath.join(modules_lookup_path, mod_path)
if v.pref.user_mod_path.len > 0 {
tried_paths << v.pref.user_mod_path
}
for try_path in tried_paths { for try_path in tried_paths {
if v.pref.is_verbose { println(' >> trying to find $mod in $try_path ...') } if v.pref.is_verbose { println(' >> trying to find $mod in $try_path ...') }
if os.dir_exists(try_path) { if os.dir_exists(try_path) {