no --new-compiler
This commit is contained in:
parent
73c51bd040
commit
7c8f4dd387
@ -1,5 +1,6 @@
|
||||
command -nargs=1 -complete=dir DlcPro call s:ProjectSet('dlcpro', '<args>')
|
||||
command -nargs=1 -complete=dir DlcProOld call s:ProjectSet('dlcpro-old', '<args>')
|
||||
command -nargs=1 -complete=dir DlcPro call s:ProjectSet('dlcpro-new', '<args>')
|
||||
command -nargs=1 -complete=dir DlcProOld call s:ProjectSet('dlcpro', '<args>')
|
||||
" command -nargs=1 -complete=dir DlcProOld call s:ProjectSet('dlcpro-old', '<args>')
|
||||
command -nargs=1 -complete=dir DlcProShg call s:ProjectSet('shg', '<args>')
|
||||
command -nargs=1 -complete=dir DlcProGui call s:ProjectSet('dlcpro-gui', '<args>')
|
||||
command -nargs=1 -complete=dir DlcProGuiOld call s:ProjectSet('dlcpro-gui-old', '<args>')
|
||||
@ -40,9 +41,9 @@ function! s:ProjectSet(project_type, project_base_dir)
|
||||
endif
|
||||
else
|
||||
" defaults
|
||||
if (g:project_type == 'dlcpro')
|
||||
if (g:project_type == 'dlcpro-new')
|
||||
let s:ProjectBaseDir = '/home/stefan/dlcpro/firmware'
|
||||
elseif (g:project_type == 'dlcpro-old')
|
||||
elseif (g:project_type == 'dlcpro')
|
||||
let s:ProjectBaseDir = '/home/stefan/dlcpro/firmware'
|
||||
elseif (g:project_type == 'dlcpro-tui')
|
||||
let s:ProjectBaseDir = '/home/stefan/dlcpro/firmware'
|
||||
@ -88,36 +89,36 @@ function! s:ProjectSet(project_type, project_base_dir)
|
||||
let s:oselas_gcc_root = '/opt/OSELAS.Toolchain-2022.10.2/'.s:oselas_gcc_lastname.'/'.
|
||||
\'gcc-12.3.1-glibc-2.33-binutils-2.39-kernel-5.4-sanitized/'
|
||||
|
||||
function! s:set_oselas_gcc4()
|
||||
if s:use_invoke
|
||||
let g:new_compiler = v:false
|
||||
else
|
||||
" let g:GccRoot = s:oselas_gcc4_root
|
||||
" let g:termdebugger = s:oselas_gcc4_root . 'bin/'.s:oselas_gcc4_lastname.'-gdb'
|
||||
let g:termdebugger = s:oselas_gcc_root . 'bin/'.s:oselas_gcc_lastname.'-gdb'
|
||||
let g:oselas_gcc_solib_paths = s:oselas_gcc4_root.'/'.s:oselas_gcc4_lastname.'/lib/'.':'.
|
||||
\ s:oselas_gcc4_root.'/sysroot-'.s:oselas_gcc4_lastname.'/lib/'.':'.
|
||||
\ s:oselas_gcc4_root.'/sysroot-'.s:oselas_gcc4_lastname.'/usr/lib/'
|
||||
" let $PATH = s:oselas_gcc4_root.'/sysroot-'.s:oselas_gcc4_lastname.'/usr/include'.':'.s:path_orig
|
||||
let g:analyser = s:oselas_gcc_root . 'bin/'.s:oselas_gcc_lastname.'-gcc'
|
||||
let g:dnew_compiler = ' -DNEW_COMPILER=OFF'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:set_oselas_gcc()
|
||||
if s:use_invoke
|
||||
let g:new_compiler = v:true
|
||||
else
|
||||
" let g:GccRoot = s:oselas_gcc_root
|
||||
let g:termdebugger = s:oselas_gcc_root . 'bin/'.s:oselas_gcc_lastname.'-gdb'
|
||||
let g:oselas_gcc_solib_paths = s:oselas_gcc_root.'/'.s:oselas_gcc_lastname.'/lib/'.':'.
|
||||
\ s:oselas_gcc_root.'/sysroot-'.s:oselas_gcc_lastname.'/lib/'.':'.
|
||||
\ s:oselas_gcc_root.'/sysroot-'.s:oselas_gcc_lastname.'/usr/lib/'
|
||||
" let $PATH = s:oselas_gcc_root.'/sysroot-'.s:oselas_gcc_lastname.'/usr/include'.':'.s:path_orig
|
||||
let g:analyser = s:oselas_gcc4_root . 'bin/'.s:oselas_gcc4_lastname.'-gcc'
|
||||
let g:dnew_compiler = ' -DNEW_COMPILER=ON'
|
||||
endif
|
||||
endfunction
|
||||
" function! s:set_oselas_gcc4()
|
||||
" if s:use_invoke
|
||||
" let g:new_compiler = v:false
|
||||
" else
|
||||
" " let g:GccRoot = s:oselas_gcc4_root
|
||||
" " let g:termdebugger = s:oselas_gcc4_root . 'bin/'.s:oselas_gcc4_lastname.'-gdb'
|
||||
" let g:termdebugger = s:oselas_gcc_root . 'bin/'.s:oselas_gcc_lastname.'-gdb'
|
||||
" let g:oselas_gcc_solib_paths = s:oselas_gcc4_root.'/'.s:oselas_gcc4_lastname.'/lib/'.':'.
|
||||
" \ s:oselas_gcc4_root.'/sysroot-'.s:oselas_gcc4_lastname.'/lib/'.':'.
|
||||
" \ s:oselas_gcc4_root.'/sysroot-'.s:oselas_gcc4_lastname.'/usr/lib/'
|
||||
" " let $PATH = s:oselas_gcc4_root.'/sysroot-'.s:oselas_gcc4_lastname.'/usr/include'.':'.s:path_orig
|
||||
" let g:analyser = s:oselas_gcc_root . 'bin/'.s:oselas_gcc_lastname.'-gcc'
|
||||
" let g:dnew_compiler = ' -DNEW_COMPILER=OFF'
|
||||
" endif
|
||||
" endfunction
|
||||
"
|
||||
" function! s:set_oselas_gcc()
|
||||
" if s:use_invoke
|
||||
" let g:new_compiler = v:true
|
||||
" else
|
||||
" " let g:GccRoot = s:oselas_gcc_root
|
||||
" let g:termdebugger = s:oselas_gcc_root . 'bin/'.s:oselas_gcc_lastname.'-gdb'
|
||||
" let g:oselas_gcc_solib_paths = s:oselas_gcc_root.'/'.s:oselas_gcc_lastname.'/lib/'.':'.
|
||||
" \ s:oselas_gcc_root.'/sysroot-'.s:oselas_gcc_lastname.'/lib/'.':'.
|
||||
" \ s:oselas_gcc_root.'/sysroot-'.s:oselas_gcc_lastname.'/usr/lib/'
|
||||
" " let $PATH = s:oselas_gcc_root.'/sysroot-'.s:oselas_gcc_lastname.'/usr/include'.':'.s:path_orig
|
||||
" let g:analyser = s:oselas_gcc4_root . 'bin/'.s:oselas_gcc4_lastname.'-gcc'
|
||||
" let g:dnew_compiler = ' -DNEW_COMPILER=ON'
|
||||
" endif
|
||||
" endfunction
|
||||
|
||||
function! g:Compiler_version()
|
||||
let cmakefile = g:ProjectBuildDir . '/CMakeCache.txt'
|
||||
@ -141,21 +142,25 @@ function! s:ProjectSet(project_type, project_base_dir)
|
||||
|
||||
let s:use_invoke = v:false
|
||||
let s:invoke_tasks = ''
|
||||
let s:gdb_connect_script = ''
|
||||
|
||||
if (g:project_type == 'dlcpro')
|
||||
if (g:project_type == 'dlcpro-new') || (g:project_type == 'dlcpro')
|
||||
let s:use_invoke = v:true
|
||||
let s:invoke_tasks = ' -c ~/tools/invoke/'.g:project_type.'/tasks'
|
||||
set wildignore-=**/firmware/src/device-control/**
|
||||
set wildignore+=**/shg-firmware/**
|
||||
set titlestring=%<%t\ (%{expand('%:p:h')})%=project:\ %{g:project_type}\ \ \ \ compiler:\ %{Compiler_version()}
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
call s:set_oselas_gcc()
|
||||
let g:termdebugger = '/opt/OSELAS.Toolchain-2022.10.2/arm-v7a-linux-gnueabihf/gcc-12.3.1-glibc-2.33-binutils-2.39-kernel-5.4-sanitized/bin/arm-v7a-linux-gnueabihf-gdb'
|
||||
let g:DebugRemote = v:true
|
||||
let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/dlcpro'
|
||||
if (g:project_type == 'dlcpro-new')
|
||||
" call s:set_oselas_gcc()
|
||||
let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/dlcpro-new'
|
||||
let g:termdebugger = '/opt/OSELAS.Toolchain-2022.10.2/arm-v7a-linux-gnueabihf/gcc-12.3.1-glibc-2.33-binutils-2.39-kernel-5.4-sanitized/bin/arm-v7a-linux-gnueabihf-gdb'
|
||||
else
|
||||
" call s:set_oselas_gcc4()
|
||||
let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/dlcpro'
|
||||
" let g:termdebugger = 'arm-v7a-linux-gnueabihf-gdb'
|
||||
endif
|
||||
let s:gdb_connect_script = g:ProjectBuildDir.'/gdb-connect.txt'
|
||||
" let s:gdb_connect_script = '~/tools/invoke/'.g:project_type.'/gdb-connect.txt'
|
||||
command! DlcproEmissionOn call s:DlcproEmission('1')
|
||||
command! DlcproEmissionOff call s:DlcproEmission('0')
|
||||
command! DlcproShutup call s:DlcproShutup()
|
||||
@ -273,7 +278,6 @@ function! s:ProjectSet(project_type, project_base_dir)
|
||||
elseif (g:project_type == 'topmode-gui')
|
||||
let s:use_invoke = v:true
|
||||
let s:invoke_tasks = ' -c ~/tools/invoke/'.g:project_type.'/tasks'
|
||||
let g:new_compiler = v:false
|
||||
let g:DebugRemote = v:false
|
||||
elseif (g:project_type == 'topmode-gui-old')
|
||||
let s:Program = '/TOPAS_Topmode'
|
||||
@ -395,10 +399,7 @@ function! s:ProjectSet(project_type, project_base_dir)
|
||||
|
||||
function! s:DeviceFirmwareUpdate()
|
||||
if s:use_invoke
|
||||
let l:options = ' --project=dlcpro'
|
||||
if g:new_compiler
|
||||
let l:options .= ' --new-compiler'
|
||||
endif
|
||||
let l:options = ' --project='.g:project_type
|
||||
execute '!invoke '.s:invoke_tasks.' -e flash-and-run --target-ip '.g:DeviceIP.l:options
|
||||
elseif (g:project_type == 'dlcpro-can')
|
||||
call s:DeviceUpdateProgramLinux()
|
||||
@ -477,11 +478,6 @@ function! GetAllMakeCompletions(ArgLead, CmdLine, CursorPos)
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" let l:options = ' --project=dlcpro'
|
||||
" if g:new_compiler
|
||||
" let l:options .= ' --new-compiler'
|
||||
" endif
|
||||
" execute '!invoke '.s:invoke_tasks.' -e flash-and-run --target-ip '.g:DeviceIP.l:options
|
||||
function! s:Make(args, async_mode)
|
||||
call asyncrun#quickfix_toggle(10, 1)
|
||||
if s:use_invoke
|
||||
@ -492,12 +488,6 @@ function! s:Make(args, async_mode)
|
||||
let l:args = 'build' " default
|
||||
endif
|
||||
" echom 'l:args2:'.l:args.':'
|
||||
if exists("g:new_compiler")
|
||||
if l:args =~ '\<build\>' && g:new_compiler && l:args !~ '--new-compiler'
|
||||
let l:args .= ' --new-compiler'
|
||||
endif
|
||||
endif
|
||||
" echom 'l:args3:'.l:args.':'
|
||||
let &makeprg = l:makeprg
|
||||
execute 'AsyncRun -mode='.a:async_mode.' -save=2 -program=make @ '.l:args
|
||||
else
|
||||
@ -532,11 +522,6 @@ endfunction
|
||||
function! s:Cmake(options, async_mode)
|
||||
if s:use_invoke
|
||||
let l:options = a:options.' --project '.g:project_type
|
||||
if g:new_compiler
|
||||
let l:options .= ' --new-compiler'
|
||||
else
|
||||
let l:options .= ' --no-new-compiler'
|
||||
endif
|
||||
execute '!echo "invoke cmake '.l:options.'"'
|
||||
execute 'AsyncRun -mode='.a:async_mode.' -save=2 @ invoke '.s:invoke_tasks.' -e cmake '.l:options
|
||||
else
|
||||
@ -755,25 +740,23 @@ function! s:DeviceDebug(attach)
|
||||
autocmd! User TermdebugStartPre
|
||||
autocmd! User TermdebugStartPost
|
||||
autocmd! User TermdebugStopPost
|
||||
let gdb_server_cmd = 'invoke -e gdb-server'
|
||||
let gdb_server_cmd = 'invoke '.s:invoke_tasks.' -e gdb-server'
|
||||
if exists('g:DeviceIP')
|
||||
let gdb_server_cmd .= ' --target_ip='.g:DeviceIP
|
||||
let gdb_server_cmd .= ' --target-ip='.g:DeviceIP
|
||||
endif
|
||||
let gdb_server_cmd .= ' --project='.g:project_type
|
||||
if g:new_compiler
|
||||
let gdb_server_cmd .= ' --new-compiler'
|
||||
endif
|
||||
" call asyncrun#quickfix_toggle(10, 1)
|
||||
execute 'AsyncRun -mode=async @ '.gdb_server_cmd
|
||||
sleep 2
|
||||
autocmd User TermdebugStopPost execute 'AsyncStop'
|
||||
if s:gdb_connect_script != ''
|
||||
if exists('s:gdb_connect_script')
|
||||
" autocmd User TermdebugStartPost call term_sendkeys('',"cd .build/dlcpro-new\nsource ".s:gdb_connect_script."\n")
|
||||
autocmd User TermdebugStartPost call term_sendkeys('',"source ".s:gdb_connect_script."\n")
|
||||
endif
|
||||
" autocmd User TermdebugStopPost call system('pkill --full gdbserver')
|
||||
Termdebug
|
||||
" Close Program window
|
||||
" execute '2hide'
|
||||
execute '2hide'
|
||||
else
|
||||
call s:StartDebugger(g:Elffile, a:attach)
|
||||
call s:SendToDebugger('file '.g:Elffile)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user