From 9c511e03f6c0e723ebbe00f944b9d9459c19ca92 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Sun, 26 Feb 2023 07:56:14 +0200 Subject: [PATCH] tools: remove `import v.pref`, just for `pref.vexe_path()`, to compile tools faster (#17411) --- cmd/tools/check_os_api_parity.v | 2 +- cmd/tools/vdoc/vdoc.v | 3 +-- cmd/tools/vsetup-freetype.v | 3 +-- cmd/tools/vsymlink.v | 7 ++----- cmd/tools/vtest-parser.v | 2 +- cmd/tools/vtest-self.v | 3 +-- cmd/tools/vtracev.v | 3 +-- cmd/tools/vup.v | 7 ++++--- cmd/tools/vwhere/finder_utils.v | 3 +-- 9 files changed, 13 insertions(+), 20 deletions(-) diff --git a/cmd/tools/check_os_api_parity.v b/cmd/tools/check_os_api_parity.v index 9565c6ef22..32e597e2a0 100644 --- a/cmd/tools/check_os_api_parity.v +++ b/cmd/tools/check_os_api_parity.v @@ -40,7 +40,7 @@ mut: } fn main() { - vexe := pref.vexe_path() + vexe := os.real_path(os.getenv_opt('VEXE') or { @VEXE }) vroot := os.dir(vexe) util.set_vroot_folder(vroot) os.chdir(vroot)! diff --git a/cmd/tools/vdoc/vdoc.v b/cmd/tools/vdoc/vdoc.v index 1226e430af..bb83dad8ba 100644 --- a/cmd/tools/vdoc/vdoc.v +++ b/cmd/tools/vdoc/vdoc.v @@ -8,14 +8,13 @@ import strings import sync import runtime import v.doc -import v.pref import v.vmod import json import term const ( allowed_formats = ['md', 'markdown', 'json', 'text', 'stdout', 'html', 'htm'] - vexe = pref.vexe_path() + vexe = os.getenv_opt('VEXE') or { @VEXE } vroot = os.dir(vexe) tabs = ['\t\t', '\t\t\t\t\t\t', '\t\t\t\t\t\t\t'] ) diff --git a/cmd/tools/vsetup-freetype.v b/cmd/tools/vsetup-freetype.v index c5e1f870b9..e637498cd3 100644 --- a/cmd/tools/vsetup-freetype.v +++ b/cmd/tools/vsetup-freetype.v @@ -1,7 +1,6 @@ module main import os -import v.pref const freetype_repo_url = 'https://github.com/ubawurinna/freetype-windows-binaries' @@ -10,7 +9,7 @@ const freetype_folder = os.join_path('thirdparty', 'freetype') fn main() { $if windows { println('Setup freetype...') - vroot := os.dir(pref.vexe_path()) + vroot := os.dir(os.real_path(os.getenv_opt('VEXE') or { @VEXE })) os.chdir(vroot)! if os.is_dir(freetype_folder) { println('Thirdparty "freetype" is already installed.') diff --git a/cmd/tools/vsymlink.v b/cmd/tools/vsymlink.v index e8d22e62c4..e41bbd7c84 100644 --- a/cmd/tools/vsymlink.v +++ b/cmd/tools/vsymlink.v @@ -1,5 +1,4 @@ import os -import v.pref $if windows { $if tinyc { @@ -15,11 +14,9 @@ fn main() { print('usage: v symlink [OPTIONS]') exit(1) } + vexe := os.real_path(os.getenv_opt('VEXE') or { @VEXE }) - ci_mode := '-githubci' in os.args - - vexe := os.real_path(pref.vexe_path()) - if ci_mode { + if '-githubci' in os.args { setup_symlink_github() } else { $if windows { diff --git a/cmd/tools/vtest-parser.v b/cmd/tools/vtest-parser.v index 3c8a34aaf8..dda8c618a8 100644 --- a/cmd/tools/vtest-parser.v +++ b/cmd/tools/vtest-parser.v @@ -7,7 +7,7 @@ import v.ast import v.pref const ( - vexe = pref.vexe_path() + vexe = os.real_path(os.getenv_opt('VEXE') or { @VEXE }) vroot = os.dir(vexe) support_color = term.can_show_color_on_stderr() && term.can_show_color_on_stdout() ecode_timeout = 101 diff --git a/cmd/tools/vtest-self.v b/cmd/tools/vtest-self.v index a3bad72732..b0971ff615 100644 --- a/cmd/tools/vtest-self.v +++ b/cmd/tools/vtest-self.v @@ -2,7 +2,6 @@ module main import os import testing -import v.pref const github_job = os.getenv('GITHUB_JOB') @@ -292,7 +291,7 @@ const ( // Note: musl misses openssl, thus the http tests can not be done there // Note: http_httpbin_test.v: fails with 'cgen error: json: map_string_string is not struct' fn main() { - vexe := pref.vexe_path() + vexe := os.real_path(os.getenv_opt('VEXE') or { @VEXE }) vroot := os.dir(vexe) os.chdir(vroot) or { panic(err) } args := os.args.clone() diff --git a/cmd/tools/vtracev.v b/cmd/tools/vtracev.v index fcd0d68dd1..031ee2b6b1 100644 --- a/cmd/tools/vtracev.v +++ b/cmd/tools/vtracev.v @@ -1,10 +1,9 @@ module main import os -import v.pref fn main() { - vexe := pref.vexe_path() + vexe := os.real_path(os.getenv_opt('VEXE') or { @VEXE }) vroot := os.dir(vexe) os.chdir(vroot)! os.setenv('VCOLORS', 'always', true) diff --git a/cmd/tools/vup.v b/cmd/tools/vup.v index e373b57974..894302e09b 100644 --- a/cmd/tools/vup.v +++ b/cmd/tools/vup.v @@ -1,10 +1,13 @@ module main import os -import v.pref import v.util.version import v.util.recompilation +const vexe = os.real_path(os.getenv_opt('VEXE') or { @VEXE }) + +const vroot = os.dir(vexe) + struct App { is_verbose bool is_prod bool @@ -13,8 +16,6 @@ struct App { } fn new_app() App { - vexe := os.real_path(pref.vexe_path()) - vroot := os.dir(vexe) return App{ is_verbose: '-v' in os.args is_prod: '-prod' in os.args diff --git a/cmd/tools/vwhere/finder_utils.v b/cmd/tools/vwhere/finder_utils.v index 312ca7a3de..83ecc77644 100755 --- a/cmd/tools/vwhere/finder_utils.v +++ b/cmd/tools/vwhere/finder_utils.v @@ -2,7 +2,6 @@ module main import os import term -import v.pref import os.cmdline // Symbol type to search @@ -56,7 +55,7 @@ const ( 'yes': .yes 'not': .not } - vexe = pref.vexe_path() + vexe = os.real_path(os.getenv_opt('VEXE') or { @VEXE }) vlib_dir = os.join_path(os.dir(vexe), 'vlib') vmod_dir = os.vmodules_dir() vmod_paths = os.vmodules_paths()[1..]