Clean up Vim-related dependencies (#128)

* Upgrade Vundle
* Extract Vim setup function
This commit is contained in:
Cyryl Płotnicki 2017-08-08 21:26:01 +02:00 committed by GitHub
parent 5b1a9ccaaf
commit 2a13b0ef23
5 changed files with 39 additions and 53 deletions

@ -1 +1 @@
Subproject commit f6cc06238d5ac888ddfc514f80392f44cb2e21ac Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87

View file

@ -84,6 +84,8 @@ fc-cache -rv
$SUDO fc-cache -rv $SUDO fc-cache -rv
set -e set -e
source "$DIR/common/install_vim_from_sources.sh"
if [[ -z $NORUST ]]; then if [[ -z $NORUST ]]; then
#rust #rust
echo "installing rust" echo "installing rust"

View file

@ -0,0 +1,36 @@
#!/bin/bash
set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../"
# vim
if [[ -z $NO_COMPILE_VIM ]]; then
VIM_BUILD_DIR=`realpath "$DIR/../"`
echo "Vim sources location: $VIM_BUILD_DIR"
cd "$VIM_BUILD_DIR"
if [[ ! -d vim ]]; then
git clone https://github.com/vim/vim.git --recursive
else
cd vim
git pull
git submodule update --init --recursive
cd ..
fi
cd vim
set +e
sudo make uninstall
sudo make clean
./configure --with-features=huge \
--enable-multibyte \
--enable-rubyinterp \
--enable-python3interp=yes \
--enable-pythoninterp=yes \
--enable-luainterp \
--enable-gui=no \
--enable-cscope
make -j`nproc`
sudo make install
cd
fi

View file

@ -32,33 +32,6 @@ echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat m
sudo apt-get update sudo apt-get update
sudo apt-get -y install mono-devel mono-complete sudo apt-get -y install mono-devel mono-complete
# vim
if [[ -z $NO_COMPILE_VIM ]]; then
VIM_BUILD_DIR=`realpath "$DIR/../../"`
cd "$VIM_BUILD_DIR"
if [[ ! -d vim ]]; then
git clone https://github.com/vim/vim.git --recursive
else
cd vim
git pull
git submodule update --init --recursive
cd ..
fi
cd vim
./configure --with-features=huge \
--enable-multibyte \
--enable-rubyinterp \
--enable-python3interp=yes \
--enable-luainterp \
--enable-gui=no \
--enable-cscope \
--enable-pythoninterp \
--enable-python3interp
make -j`nproc`
sudo make install
cd
fi
DIR="$DIR/../" DIR="$DIR/../"
DIR="$DIR" $DIR/common/configure_fresh_system.sh DIR="$DIR" $DIR/common/configure_fresh_system.sh

View file

@ -85,31 +85,6 @@ if [ "$(id -u)" != "0" ]; then
code --install-extension webfreak.debug code --install-extension webfreak.debug
fi fi
# vim
if [[ -z $NO_COMPILE_VIM ]]; then
VIM_BUILD_DIR=`realpath "$DIR/../../"`
cd "$VIM_BUILD_DIR"
if [[ ! -d vim ]]; then
git clone https://github.com/vim/vim.git --recursive
else
cd vim
git pull
git submodule update --init --recursive
cd ..
fi
cd vim
./configure --with-features=huge \
--enable-multibyte \
--enable-rubyinterp \
--enable-python3interp=yes \
--enable-luainterp \
--enable-gui=no \
--enable-cscope
make -j`nproc`
sudo make install
cd
fi
DIR="$DIR/../" DIR="$DIR/../"
DIR="$DIR" $DIR/common/configure_fresh_system.sh DIR="$DIR" $DIR/common/configure_fresh_system.sh