From 9ffc7089a660308ad8a8485fd4c896571d8b76b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 14 Sep 2016 21:14:11 +0200 Subject: [PATCH 01/13] add fedora rawhide to the test matrix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5e665512..dc3c7d76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ script: env: - DETECTED_OS=fedora:24 + - DETECTED_OS=fedora:rawhide - DETECTED_OS=debian:jessie - DETECTED_OS=ubuntu:trusty - DETECTED_OS=ubuntu:xenial From d92598dc2921790ac3cd95259b534380dcb534b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 14 Sep 2016 21:20:27 +0200 Subject: [PATCH 02/13] Build vim 8 from sources on Fedora --- fedora/configure_fresh_system | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index f1ae2e4f..f1f7c3a7 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,7 +4,7 @@ set -e #software and shell sudo dnf -y upgrade --best --allowerasing -sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils +sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils ncurses-devel FEDORA_VERSION=`rpm -E %fedora` sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm @@ -25,6 +25,23 @@ if [[ -z $NO_SYSTEMCTL ]]; then sudo systemctl list-timers "*dnf-*" fi +VIM_BUILD_DIR=/tmp +cd "$VIM_BUILD_DIR" +git clone https://github.com/vim/vim.git +cd vim +./configure --with-features=huge \ + --enable-multibyte \ + --enable-rubyinterp \ + --enable-python3interp=yes \ + --enable-perlinterp \ + --enable-luainterp \ + --enable-gui=no \ + --enable-cscope \ +make -j2 +sudo make install +cd +rm -fvr "$VIM_BUILD_DIR/vim" + DIR="$DIR/../" DIR="$DIR" $DIR/common/configure_fresh_system From cab6b856b6a2a49ae85e9fc50a2c6e576057bc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 14 Sep 2016 21:22:09 +0200 Subject: [PATCH 03/13] Revert "add fedora rawhide to the test matrix" This reverts commit 39826b5d1f6db18409b7261e76c7d94c352a5024. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dc3c7d76..5e665512 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ script: env: - DETECTED_OS=fedora:24 - - DETECTED_OS=fedora:rawhide - DETECTED_OS=debian:jessie - DETECTED_OS=ubuntu:trusty - DETECTED_OS=ubuntu:xenial From 755ef8dc59abc1cc004e6dd50cc71436a13c27ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 14 Sep 2016 21:35:17 +0200 Subject: [PATCH 04/13] Fix typo in Vim8 build script --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index f1f7c3a7..80b99756 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -36,7 +36,7 @@ cd vim --enable-perlinterp \ --enable-luainterp \ --enable-gui=no \ - --enable-cscope \ + --enable-cscope make -j2 sudo make install cd From 9e4df7d139e1febde108bc0eb9658ea9d72db813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 14 Sep 2016 21:38:37 +0200 Subject: [PATCH 05/13] Use python3 to install YCM --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 51055965..fc493472 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -108,7 +108,7 @@ if [[ -z $NOVIM ]]; then echo "\n" | vim +PluginInstall +qa if [[ -z $NOYCM ]]; then cd ~/.vim/bundle/YouCompleteMe - ./install.py --clang-completer --racer-completer --tern-completer + python3 ./install.py --clang-completer --racer-completer --tern-completer fi fi From 1105224f4b2dba04a2be127c27b336eaa65fe4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 14 Sep 2016 21:54:12 +0200 Subject: [PATCH 06/13] Disable perl plugins in Vim under Fedora --- fedora/configure_fresh_system | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 80b99756..30d33149 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -33,7 +33,6 @@ cd vim --enable-multibyte \ --enable-rubyinterp \ --enable-python3interp=yes \ - --enable-perlinterp \ --enable-luainterp \ --enable-gui=no \ --enable-cscope From dfa758ac7c59ac2f31602c27b5b2a967cb21088e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 14 Sep 2016 22:06:51 +0200 Subject: [PATCH 07/13] Update full window kdiff3 state --- .kdiff3rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.kdiff3rc b/.kdiff3rc index 534772a0..771a735a 100644 --- a/.kdiff3rc +++ b/.kdiff3rc @@ -93,11 +93,12 @@ WindowStateMaximised=true WordWrap=false [MainWindow] +Height 1080=1081 Height 768=769 Height 900=901 Height 975=976 Height 985=986 -State=AAAA/wAAAAD9AAAAAAAAB4AAAANTAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA +State=AAAA/wAAAAD9AAAAAAAAB4AAAAO8AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA ToolBarsMovable=Disabled Width 1366=1367 Width 1440=1441 From 1ba42b7e5054039cb861d40a445a3d78f09830d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 15 Sep 2016 05:35:31 +0200 Subject: [PATCH 08/13] use python3 development files on ubuntu trusty to build YCM --- ubuntu/trusty/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system index 886b5f9f..becc6d1e 100755 --- a/ubuntu/trusty/configure_fresh_system +++ b/ubuntu/trusty/configure_fresh_system @@ -5,7 +5,7 @@ set -v sudo apt-get update sudo apt-get -y upgrade -install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks vim whois zsh" +install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python3-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks vim whois zsh" set +e for i in `seq 1 3`; do From 9779c2308be2585b90c0866f158e1035633d95e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 15 Sep 2016 06:43:04 +0200 Subject: [PATCH 09/13] do not use python3 under ubuntu trusty as YCM does not compile under it --- common/configure_fresh_system | 7 ++++++- ubuntu/trusty/configure_fresh_system | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 1ffbb361..26bd6104 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -109,7 +109,12 @@ if [[ -z $NOVIM ]]; then echo "\n" | vim +PluginInstall +qa if [[ -z $NOYCM ]]; then cd ~/.vim/bundle/YouCompleteMe - python3 ./install.py --clang-completer --racer-completer --tern-completer + + if [[ -z $NOPYTHON3 ]]; then + python3 ./install.py --clang-completer --racer-completer --tern-completer + else + python ./install.py --clang-completer --racer-completer --tern-completer + fi fi fi diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system index becc6d1e..087323ae 100755 --- a/ubuntu/trusty/configure_fresh_system +++ b/ubuntu/trusty/configure_fresh_system @@ -29,4 +29,5 @@ sudo apt-get -y install mono-devel mono-complete DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../../" export NO_GO=true +eport NOPYTHON3=true DIR="$DIR" $DIR/common/configure_fresh_system From 76ca2faf3202fb8248da24e346ddcdbae5ae7c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 15 Sep 2016 07:31:12 +0200 Subject: [PATCH 10/13] Fix typo in setting for no python3 under ubuntu trusty --- ubuntu/trusty/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system index 087323ae..7db42bc3 100755 --- a/ubuntu/trusty/configure_fresh_system +++ b/ubuntu/trusty/configure_fresh_system @@ -29,5 +29,5 @@ sudo apt-get -y install mono-devel mono-complete DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../../" export NO_GO=true -eport NOPYTHON3=true +export NOPYTHON3=true DIR="$DIR" $DIR/common/configure_fresh_system From 60f147cddd5000eac30653074183ff50a97a28a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 15 Sep 2016 18:56:45 +0200 Subject: [PATCH 11/13] Use python2 development files for YCM under trusty --- ubuntu/trusty/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system index 7db42bc3..ca6afdd9 100755 --- a/ubuntu/trusty/configure_fresh_system +++ b/ubuntu/trusty/configure_fresh_system @@ -5,7 +5,7 @@ set -v sudo apt-get update sudo apt-get -y upgrade -install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python3-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks vim whois zsh" +install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks vim whois zsh" set +e for i in `seq 1 3`; do From b7d487928c867e1d6840d47341346db384c57344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 16 Sep 2016 09:32:06 +0200 Subject: [PATCH 12/13] Do not perform ugprade on Jessie on CI, as it timeouts --- .travis.yml | 1 + debian/configure_fresh_system | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e665512..f54848de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ script: - ./test env: + - NOUPGRADE=true - DETECTED_OS=fedora:24 - DETECTED_OS=debian:jessie - DETECTED_OS=ubuntu:trusty diff --git a/debian/configure_fresh_system b/debian/configure_fresh_system index 23023f61..cfd6ba31 100755 --- a/debian/configure_fresh_system +++ b/debian/configure_fresh_system @@ -3,7 +3,11 @@ set -e sudo apt-get update -sudo apt-get -y upgrade + +if [[ -z $NOUPGRADE ]]; then + sudo apt-get -y upgrade +fi + install_packages="sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted wine solaar glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3" set +e From 6d86557b459ae1b16bf975a949f57e8b9660e9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 16 Sep 2016 09:33:03 +0200 Subject: [PATCH 13/13] Fix Travis env definition for Jessie --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f54848de..dd077d75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,8 @@ script: - ./test env: - - NOUPGRADE=true - DETECTED_OS=fedora:24 - - DETECTED_OS=debian:jessie + - DETECTED_OS=debian:jessie NOUPGRADE=true - DETECTED_OS=ubuntu:trusty - DETECTED_OS=ubuntu:xenial