From 10afcc251e4a99d8cfd6abdadcb04c1f9b6e383e Mon Sep 17 00:00:00 2001 From: Jannik ZANDER Date: Thu, 21 Jul 2016 20:19:31 +0200 Subject: [PATCH] Add msbuild support --- .bashrc_local | 15 -------- .config/bash/aliases | 2 + .editorconfig | 10 ++--- .vimrc | 53 ++++++++++++++++++--------- bin/{build-wifi.sh => build-akmod.sh} | 0 bin/build.cmd | 6 +++ bin/genilog.cmd | 2 + bin/prebuild.cmd | 3 ++ 8 files changed, 54 insertions(+), 37 deletions(-) delete mode 100644 .bashrc_local rename bin/{build-wifi.sh => build-akmod.sh} (100%) create mode 100644 bin/build.cmd create mode 100644 bin/genilog.cmd create mode 100644 bin/prebuild.cmd diff --git a/.bashrc_local b/.bashrc_local deleted file mode 100644 index 49aafa7..0000000 --- a/.bashrc_local +++ /dev/null @@ -1,15 +0,0 @@ -if [ -d "${HOME}/.fzf" ] ; then - PATH="${HOME}/.fzf:${PATH}" -fi -[ -f ~/.fzf.bash ] && source ~/.fzf.bash - -PATH='/c/programs/CMake/bin':'/c/program files (x86)/msbuild/12.0/bin':${PATH} - -alias gvim='winpty "c:/programs/vim/vim74/gvim.exe"' -alias python='winpty "c:/program files (x86)/python35-32/python.exe"' -alias cmake='winpty "c:/programs/cmake/bin/cmake.exe"' -alias vcbuild='winpty "c:/program files (x86)/microsoft visual studio 9.0/vc/vcpackages/vcbuild.exe"' -alias msbuild='winpty "c:/program files (x86)/msbuild/12.0/bin/msbuild.exe"' - -eval "$(ssh-agent -s)" -ssh-add.exe ~/.ssh/github diff --git a/.config/bash/aliases b/.config/bash/aliases index 5518512..a7031de 100644 --- a/.config/bash/aliases +++ b/.config/bash/aliases @@ -89,3 +89,5 @@ alias startxwin='run /usr/bin/bash.exe -l -c "/usr/bin/startxwin -- -nolock -uni alias startvnc='vncserver -geometry 1870x980 -depth 24' alias startvnc4='vnc4server -geometry 1870x980 -depth 24' alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' +alias genilog='$HOME/repos/genilog/genilog.py' + diff --git a/.editorconfig b/.editorconfig index cb2626d..077b331 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,13 +5,13 @@ root = true [*] indent_style = space indent_size = 2 -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true -# Windows-style newlines with a newline ending every file +tab_width = 2 #end_of_line = crlf -# Unix-style newlines with a newline ending every file #end_of_line = lf +charset = utf-8 +insert_final_newline = true +trim_trailing_whitespace = true +#max_line_length = 80 [*.py] indent_size = 4 diff --git a/.vimrc b/.vimrc index ff56210..1a1efb5 100644 --- a/.vimrc +++ b/.vimrc @@ -25,21 +25,27 @@ Plug 'tpope/vim-repeat' Plug 'tpope/vim-surround' Plug 'tpope/vim-fugitive' Plug 'tpope/vim-commentary' +Plug 'tpope/vim-dispatch' +Plug 'tpope/vim-vinager' Plug 'scrooloose/syntastic' Plug 'ctrlpvim/ctrlp.vim' Plug 'brandonbloom/csearch.vim' Plug 'chazy/cscope_maps' Plug 'altercation/vim-colors-solarized' Plug 'editorconfig/editorconfig-vim' -Plug 'vim-scripts/a.vim' +Plug 'fholgado/minibufexpl.vim' +Plug 'a.vim' +"Plug 'L9' +"Plug 'FuzzyFinder' call plug#end() " section: options {{{1 " --------------------- -set autoindent +"set autoindent set autoread set autowrite " automatically save before commands like :next and :make +set background=dark set backspace=2 if exists('+breakindent') set breakindent showbreak=\ + @@ -66,15 +72,16 @@ set lazyredraw set linebreak set mouse=nvi set mousemodel=popup +set number "set pastetoggle= set printoptions=paper:letter set scrolloff=1 set shiftround -set showcmd " show (partial) command in status line. +set shortmess=aoOtI +"set showcmd " show (partial) command in status line. set showmatch " show matching brackets. set sidescrolloff=5 set smartcase " case insensitive searches become sensitive with capitals -"set smarttab " sw at the start of the line, sts everywhere else "setglobal tags=./tags; set timeoutlen=500 " leader key timeout set ttimeoutlen=50 " make esc work faster @@ -88,11 +95,12 @@ set wildmode=longest:full,full set wildignore+=tags,.*.un~,*.pyc set winaltkeys=no -if !has("gui_running") && $display == '' || !has("gui") - set mouse= -endif -set background=dark -set number +"if !has("gui_running") && $display == '' || !has("gui") +" set mouse= +"endif + +set errorformat=\ %#%f(%l):\ %m +set makeprg=msbuild.exe\ -nologo\ -v:q\ -property:GenerateFullPaths=true\ " plugin settings {{{2 let g:netrw_liststyle=3 @@ -112,6 +120,7 @@ let g:markdown_syntax_conceal = 0 let g:editorconfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] let g:editorconfig_verbose=1 +"let g:editorconfig_exec_path = 'Path to your EditorConfig Core executable' set colorcolumn=80 highlight ColorColumn ctermbg=9 @@ -175,7 +184,7 @@ vnoremap d "*d nnoremap p "*p nnoremap P "*P vnoremap p "*p -vnoremap P "*P +Hvnoremap P "*P else " nnoremap y "*y " nnoremap p "*p @@ -213,16 +222,26 @@ if has("cscope") map :cstag =expand("") endif -" split navigations -nnoremap -nnoremap -nnoremap -nnoremap -" folding -nnoremap za +" Maps leader-[h,j,k,l] to windows split navigations +nnoremap h +nnoremap j +nnoremap k +nnoremap l + +" Maps Ctrl-[h,j,k,l] to resizing a window split +nnoremap < +nnoremap - +nnoremap + +nnoremap > + "exit insert mode inoremap jj inoremap j j +" folding +noremap za +" In the quickfix window, is used to jump to the error under the +" cursor, so undefine the mapping there. +autocmd BufReadPost quickfix nnoremap " section: autocommands {{{1 " -------------------------- diff --git a/bin/build-wifi.sh b/bin/build-akmod.sh similarity index 100% rename from bin/build-wifi.sh rename to bin/build-akmod.sh diff --git a/bin/build.cmd b/bin/build.cmd new file mode 100644 index 0000000..1017e25 --- /dev/null +++ b/bin/build.cmd @@ -0,0 +1,6 @@ +rem cd _appBUILD\AllTestCases +rem @call msbuild.exe /m AllTestCasesInView.sln + + +cd _appBUILD\AllTestCases\UnitTest_IOManagerFoundation +@call msbuild.exe diff --git a/bin/genilog.cmd b/bin/genilog.cmd new file mode 100644 index 0000000..98afd21 --- /dev/null +++ b/bin/genilog.cmd @@ -0,0 +1,2 @@ +@rem @call python %~dp0\genilog.py %* +@call "c:\program files (x86)\python35-32\python.exe" c:\users\59698\repos\genilog\genilog.py %* diff --git a/bin/prebuild.cmd b/bin/prebuild.cmd new file mode 100644 index 0000000..3272439 --- /dev/null +++ b/bin/prebuild.cmd @@ -0,0 +1,3 @@ +@call "c:\program files (x86)\python35-32\python.exe" bbRTE_Release\RTE_Release\rtepreproc.py --dryrun --testsonly --o=_appBUILD +cd _appBUILD\AllTestCases +cmake -G "Visual Studio 12 2013" -- 2.43.0