michael/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve jai build code in vimrc

Browse Source
This commit is contained in:
Michael Campagnaro 2023-05-06 22:01:03 -04:00
parent 40eb9aa808
commit 6800f7ccc4
1 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
vimrc
View File

@ -1164,56 +1164,31 @@ function! Build(optimized=0, silent=0)
endif endif
let l:is_jai = 0 let l:is_jai = 0
let l:cmd = "" let l:has_jai_build_file = 0
let l:ext = tolower(expand('%:e')) let l:ext = tolower(expand('%:e'))
let l:current_dir = expand('%:h') let l:current_dir = expand('%:p:h')
let l:parent_dir = expand('%:p:h')
" Check if this is a jai module with a build.jai one directory back. This let l:cmd = ""
" only works when the file is directly inside the modules folder.
let l:jai_module_with_build = (tolower(l:current_dir) == "modules") && filereadable(l:current_dir . "/../build.jai")
if (l:jai_module_with_build == 1) || filereadable(l:parent_dir . "/build.jai") if l:ext == "jai"
" Jai build file
let l:is_jai = 1 let l:is_jai = 1
let l:cmd = "jai " . l:parent_dir . "/"
if l:jai_module_with_build == 1 " Check for a build file in the current directory or one directory back
let l:cmd .= "../build.jai" " (e.g. we're in modules/ or src/, code/, etc)
if filereadable(l:current_dir . "/build.jai") || filereadable(l:current_dir . "/../build.jai")
let l:has_jai_build_file = 1
let l:cmd = "jai " . l:current_dir . "/"
if filereadable(l:current_dir . "/build.jai") == 1
let l:cmd .= "build.jai"
else
let l:cmd .= "../build.jai"
endif
else else
let l:cmd .= "build.jai" let l:cmd = "jai % "
endif endif
if a:optimized == 1
echo "Compiling release build.jai"
" @note We pass 'release' as a user command arg for the build file
" to parse. -release is a compiler arg and we don't want to use
" that. Ideally the build script would ignore that completely.
let l:cmd .= " - release"
else
echo "Compiling debug build.jai"
endif
" @note We aren't importing the local modules because the build file
" should manage that sort of thing for us.
elseif l:ext == "jai"
let l:is_jai = 1
let l:cmd = "jai % "
if a:optimized == 1
echo "Compiling release " . expand('%:t')
let l:cmd .= " -release"
else
echo "Compiling debug " . expand('%:t')
endif
" If there's a local modules/ directory then we'll import it.
if isdirectory(l:parent_dir . "/modules")
let l:cmd .= " -import_dir modules"
endif
else else
let l:cmd .= './build* ' let l:cmd .= './build* '
if a:optimized == 1 if a:optimized == 1
@ -1223,6 +1198,33 @@ function! Build(optimized=0, silent=0)
if l:is_jai if l:is_jai
let l:cmd .= ' '.g:campo_jai_build_args let l:cmd .= ' '.g:campo_jai_build_args
if l:has_jai_build_file
if a:optimized == 1
echo "Compiling release build.jai"
" @note We pass 'release' as a user metaprogram arg for the
" build file to parse. -release is a compiler arg and we don't
" want to use that. Ideally the build script would ignore that
" completely. Also we don't bother adding an import directory
" for local modules because the build file should manage that
" sort of thing for us.
let l:cmd .= " - release"
else
echo "Compiling debug build.jai"
endif
else
if a:optimized == 1
echo "Compiling release " . expand('%:t')
let l:cmd .= " -release"
else
echo "Compiling debug " . expand('%:t')
endif
" If there's a local modules/ directory then we'll import it.
if isdirectory(l:current_dir . "/modules")
let l:cmd .= " -import_dir modules"
endif
endif
endif endif
" I was originally passing -save=2 to AsyncRun! in order to save all " I was originally passing -save=2 to AsyncRun! in order to save all