From 929a002229d30682b86ab72ee4c8fee4e6f445de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20D=C3=A4schle?= Date: Sun, 27 Dec 2020 13:43:23 +0100 Subject: [PATCH] vdoc: move to it's own directory cmd/tools/vdoc/ (#7606) --- .../{vdoc-resources => vdoc/resources}/arrow.svg | 0 .../{vdoc-resources => vdoc/resources}/dark-mode.js | 0 .../{vdoc-resources => vdoc/resources}/dark.svg | 0 .../{vdoc-resources => vdoc/resources}/doc.css | 0 cmd/tools/{vdoc-resources => vdoc/resources}/doc.js | 0 .../resources}/favicons/android-chrome-192x192.png | Bin .../resources}/favicons/android-chrome-512x512.png | Bin .../resources}/favicons/apple-touch-icon.png | Bin .../resources}/favicons/browserconfig.xml | 0 .../resources}/favicons/favicon-16x16.png | Bin .../resources}/favicons/favicon-32x32.png | Bin .../resources}/favicons/favicon.ico | Bin .../resources}/favicons/mstile-144x144.png | Bin .../resources}/favicons/mstile-150x150.png | Bin .../resources}/favicons/mstile-310x150.png | Bin .../resources}/favicons/mstile-310x310.png | Bin .../resources}/favicons/mstile-70x70.png | Bin .../resources}/favicons/safari-pinned-tab.svg | 0 .../resources}/favicons/site.webmanifest | 0 .../{vdoc-resources => vdoc/resources}/light.svg | 0 .../{vdoc-resources => vdoc/resources}/link.svg | 0 .../{vdoc-resources => vdoc/resources}/menu.svg | 0 .../resources}/normalize.css | 0 cmd/tools/{ => vdoc}/vdoc.v | 2 +- cmd/tools/vtest-cleancode.v | 2 +- vlib/v/util/util.v | 5 +++-- 26 files changed, 5 insertions(+), 4 deletions(-) rename cmd/tools/{vdoc-resources => vdoc/resources}/arrow.svg (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/dark-mode.js (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/dark.svg (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/doc.css (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/doc.js (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/android-chrome-192x192.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/android-chrome-512x512.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/apple-touch-icon.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/browserconfig.xml (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/favicon-16x16.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/favicon-32x32.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/favicon.ico (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/mstile-144x144.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/mstile-150x150.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/mstile-310x150.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/mstile-310x310.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/mstile-70x70.png (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/safari-pinned-tab.svg (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/favicons/site.webmanifest (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/light.svg (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/link.svg (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/menu.svg (100%) rename cmd/tools/{vdoc-resources => vdoc/resources}/normalize.css (100%) rename cmd/tools/{ => vdoc}/vdoc.v (99%) diff --git a/cmd/tools/vdoc-resources/arrow.svg b/cmd/tools/vdoc/resources/arrow.svg similarity index 100% rename from cmd/tools/vdoc-resources/arrow.svg rename to cmd/tools/vdoc/resources/arrow.svg diff --git a/cmd/tools/vdoc-resources/dark-mode.js b/cmd/tools/vdoc/resources/dark-mode.js similarity index 100% rename from cmd/tools/vdoc-resources/dark-mode.js rename to cmd/tools/vdoc/resources/dark-mode.js diff --git a/cmd/tools/vdoc-resources/dark.svg b/cmd/tools/vdoc/resources/dark.svg similarity index 100% rename from cmd/tools/vdoc-resources/dark.svg rename to cmd/tools/vdoc/resources/dark.svg diff --git a/cmd/tools/vdoc-resources/doc.css b/cmd/tools/vdoc/resources/doc.css similarity index 100% rename from cmd/tools/vdoc-resources/doc.css rename to cmd/tools/vdoc/resources/doc.css diff --git a/cmd/tools/vdoc-resources/doc.js b/cmd/tools/vdoc/resources/doc.js similarity index 100% rename from cmd/tools/vdoc-resources/doc.js rename to cmd/tools/vdoc/resources/doc.js diff --git a/cmd/tools/vdoc-resources/favicons/android-chrome-192x192.png b/cmd/tools/vdoc/resources/favicons/android-chrome-192x192.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/android-chrome-192x192.png rename to cmd/tools/vdoc/resources/favicons/android-chrome-192x192.png diff --git a/cmd/tools/vdoc-resources/favicons/android-chrome-512x512.png b/cmd/tools/vdoc/resources/favicons/android-chrome-512x512.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/android-chrome-512x512.png rename to cmd/tools/vdoc/resources/favicons/android-chrome-512x512.png diff --git a/cmd/tools/vdoc-resources/favicons/apple-touch-icon.png b/cmd/tools/vdoc/resources/favicons/apple-touch-icon.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/apple-touch-icon.png rename to cmd/tools/vdoc/resources/favicons/apple-touch-icon.png diff --git a/cmd/tools/vdoc-resources/favicons/browserconfig.xml b/cmd/tools/vdoc/resources/favicons/browserconfig.xml similarity index 100% rename from cmd/tools/vdoc-resources/favicons/browserconfig.xml rename to cmd/tools/vdoc/resources/favicons/browserconfig.xml diff --git a/cmd/tools/vdoc-resources/favicons/favicon-16x16.png b/cmd/tools/vdoc/resources/favicons/favicon-16x16.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/favicon-16x16.png rename to cmd/tools/vdoc/resources/favicons/favicon-16x16.png diff --git a/cmd/tools/vdoc-resources/favicons/favicon-32x32.png b/cmd/tools/vdoc/resources/favicons/favicon-32x32.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/favicon-32x32.png rename to cmd/tools/vdoc/resources/favicons/favicon-32x32.png diff --git a/cmd/tools/vdoc-resources/favicons/favicon.ico b/cmd/tools/vdoc/resources/favicons/favicon.ico similarity index 100% rename from cmd/tools/vdoc-resources/favicons/favicon.ico rename to cmd/tools/vdoc/resources/favicons/favicon.ico diff --git a/cmd/tools/vdoc-resources/favicons/mstile-144x144.png b/cmd/tools/vdoc/resources/favicons/mstile-144x144.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/mstile-144x144.png rename to cmd/tools/vdoc/resources/favicons/mstile-144x144.png diff --git a/cmd/tools/vdoc-resources/favicons/mstile-150x150.png b/cmd/tools/vdoc/resources/favicons/mstile-150x150.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/mstile-150x150.png rename to cmd/tools/vdoc/resources/favicons/mstile-150x150.png diff --git a/cmd/tools/vdoc-resources/favicons/mstile-310x150.png b/cmd/tools/vdoc/resources/favicons/mstile-310x150.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/mstile-310x150.png rename to cmd/tools/vdoc/resources/favicons/mstile-310x150.png diff --git a/cmd/tools/vdoc-resources/favicons/mstile-310x310.png b/cmd/tools/vdoc/resources/favicons/mstile-310x310.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/mstile-310x310.png rename to cmd/tools/vdoc/resources/favicons/mstile-310x310.png diff --git a/cmd/tools/vdoc-resources/favicons/mstile-70x70.png b/cmd/tools/vdoc/resources/favicons/mstile-70x70.png similarity index 100% rename from cmd/tools/vdoc-resources/favicons/mstile-70x70.png rename to cmd/tools/vdoc/resources/favicons/mstile-70x70.png diff --git a/cmd/tools/vdoc-resources/favicons/safari-pinned-tab.svg b/cmd/tools/vdoc/resources/favicons/safari-pinned-tab.svg similarity index 100% rename from cmd/tools/vdoc-resources/favicons/safari-pinned-tab.svg rename to cmd/tools/vdoc/resources/favicons/safari-pinned-tab.svg diff --git a/cmd/tools/vdoc-resources/favicons/site.webmanifest b/cmd/tools/vdoc/resources/favicons/site.webmanifest similarity index 100% rename from cmd/tools/vdoc-resources/favicons/site.webmanifest rename to cmd/tools/vdoc/resources/favicons/site.webmanifest diff --git a/cmd/tools/vdoc-resources/light.svg b/cmd/tools/vdoc/resources/light.svg similarity index 100% rename from cmd/tools/vdoc-resources/light.svg rename to cmd/tools/vdoc/resources/light.svg diff --git a/cmd/tools/vdoc-resources/link.svg b/cmd/tools/vdoc/resources/link.svg similarity index 100% rename from cmd/tools/vdoc-resources/link.svg rename to cmd/tools/vdoc/resources/link.svg diff --git a/cmd/tools/vdoc-resources/menu.svg b/cmd/tools/vdoc/resources/menu.svg similarity index 100% rename from cmd/tools/vdoc-resources/menu.svg rename to cmd/tools/vdoc/resources/menu.svg diff --git a/cmd/tools/vdoc-resources/normalize.css b/cmd/tools/vdoc/resources/normalize.css similarity index 100% rename from cmd/tools/vdoc-resources/normalize.css rename to cmd/tools/vdoc/resources/normalize.css diff --git a/cmd/tools/vdoc.v b/cmd/tools/vdoc/vdoc.v similarity index 99% rename from cmd/tools/vdoc.v rename to cmd/tools/vdoc/vdoc.v index 66c0a9dcec..a3cfbf3a85 100644 --- a/cmd/tools/vdoc.v +++ b/cmd/tools/vdoc/vdoc.v @@ -37,7 +37,7 @@ enum HighlightTokenTyp { const ( css_js_assets = ['doc.css', 'normalize.css', 'doc.js', 'dark-mode.js'] allowed_formats = ['md', 'markdown', 'json', 'text', 'stdout', 'html', 'htm'] - res_path = os.resource_abs_path('vdoc-resources') + res_path = os.resource_abs_path('resources') favicons_path = os.join_path(res_path, 'favicons') vexe = pref.vexe_path() vroot = os.dir(vexe) diff --git a/cmd/tools/vtest-cleancode.v b/cmd/tools/vtest-cleancode.v index 3a6266560d..77757d0258 100644 --- a/cmd/tools/vtest-cleancode.v +++ b/cmd/tools/vtest-cleancode.v @@ -18,7 +18,7 @@ const ( 'nonexistant', ] vfmt_verify_list = [ - 'cmd/tools/vdoc.v', + 'cmd/tools/vdoc/vdoc.v', 'cmd/v/v.v', 'vlib/arrays', 'vlib/builtin/array.v', diff --git a/vlib/v/util/util.v b/vlib/v/util/util.v index 234acaf364..cfce2e6607 100644 --- a/vlib/v/util/util.v +++ b/vlib/v/util/util.v @@ -125,8 +125,9 @@ pub fn launch_tool(is_verbose bool, tool_name string, args []string) { set_vroot_folder(vroot) tool_args := args_quote_paths(args) tool_basename := os.real_path(os.join_path(vroot, 'cmd', 'tools', tool_name)) - tool_exe := path_of_executable(tool_basename) - tool_source := tool_basename + '.v' + tool_exe := if os.is_dir(tool_basename) { path_of_executable(os.join_path(tool_basename, + tool_name)) } else { path_of_executable(tool_basename) } + tool_source := if os.is_dir(tool_basename) { tool_basename } else { tool_basename + '.v' } tool_command := '"$tool_exe" $tool_args' if is_verbose { println('launch_tool vexe : $vroot')