diff --git a/.travis.yml b/.travis.yml index 0970df9..b1b654b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,35 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y cmake gcc-4.8 g++-4.8 clang golang; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="g++-4.8" CC="gcc-4.8" GOROOT="/usr/lib/go" GOPATH=$HOME/gocode PATH=$PATH:$GOPATH/bin; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y clang golang; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="g++-4.9" CC="gcc-4.9" GOROOT="/usr/lib/go" GOPATH=$HOME/gocode PATH=$PATH:$GOPATH/bin; fi +addons: + apt: + sources: + # The Travis apt source whitelist can be found here: + # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json + - ubuntu-toolchain-r-test # for new libstdc++ + - george-edison55-precise-backports # for a more recent version of cmake (3.2.3) + packages: + - cmake-data + - cmake + # 4.9 is the first version of GCC with good enough C++11 support to build + # ycmd. + - g++-4.9 + - ninja-build + # Everything below is a Python build dep (though it depends on Python + # version). We need them because pyenv builds Python. + - libssl-dev + - zlib1g-dev + - libbz2-dev + - libreadline-dev + - libsqlite3-dev + - wget + - curl + - llvm + - libncurses5-dev + - libncursesw5-dev compiler: - gcc diff --git a/install.sh b/install.sh index 4c21fc9..72114ba 100755 --- a/install.sh +++ b/install.sh @@ -48,6 +48,10 @@ case $platform in echoo ">>> Install fonts for powerline ..." bash fonts/install-fonts.sh ;; + *) + echoo "暂不支持此系统,欲使用此配置,需要先解决依赖安装的问题,欢迎提pr。" + exit 1 + ;; esac sudo bash install-plugins.sh init diff --git a/vimrc b/vimrc index ff0f191..d517b56 100644 --- a/vimrc +++ b/vimrc @@ -18,16 +18,13 @@ Plugin 'VundleVim/Vundle.vim' " async syntax checking plugin for Vim Plugin 'w0rp/ale' -" auto check python use pep8 -Plugin 'nvie/vim-flake8' - " Highlights trailing whitespace in red and provides Plugin 'bronson/vim-trailing-whitespace' " multiple selections Plugin 'terryma/vim-multiple-cursors' -"" Colorthemes +" Colorthemes Plugin 'altercation/vim-colors-solarized' Plugin 'jnurmine/Zenburn' Plugin 'flazz/vim-colorschemes' @@ -63,7 +60,7 @@ Plugin 'elzr/vim-json' Plugin 'dyng/ctrlsf.vim' Plugin 'kylef/apiblueprint.vim' -" a Git wrapper so awesome +" A Git wrapper so awesome Plugin 'tpope/vim-fugitive' " A Vim plugin which shows a git diff in the gutter (sign column) and stages/undoes hunks. Plugin 'airblade/vim-gitgutter' @@ -128,7 +125,7 @@ let g:ale_sign_column_always = 0 " 一般需要实时检查,默认关闭 let g:ale_lint_on_save = 1 " save file auto check let g:ale_lint_on_text_changed = 0 " for ale_lint_on_save = 1 let g:ale_lint_on_enter = 0 " for ale_lint_on_save = 1 -map :ALEToggle +map :ALEToggle \| echo 'g:ale_enabled =' g:ale_enabled " YouCompleteMe settings let g:ycm_collect_identifiers_from_comments_and_strings = 0 @@ -188,7 +185,7 @@ EOF " Ctrl-j 切换到下方的分割窗口 - Ctrl-k 切换到上方的分割窗口 - Ctrl-l " 切换到右侧的分割窗口 - Ctrl-h 切换到左侧的分割窗口 -"split navigations +" split navigations set splitbelow set splitright nnoremap @@ -209,7 +206,7 @@ map :NERDTreeToggle " NERDTree settings " 是否显示隐藏文件 let NERDTreeShowHidden=0 -" 忽略一下文件的显示 +" 忽略以下文件的显示 let NERDTreeIgnore=['\.pyc','\~$','\.swp','__pycache__','\.git$','\.DS_Store'] " NERDTree git 扩展 let g:NERDTreeIndicatorMapCustom = {