From 9931e0888b2419326ae10ebbfae532261c5c125f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 30 Jun 2016 16:11:56 +0200
Subject: Fix submodules

---
 vim/bundle/YouCompleteMe                           |  1 +
 .../ci/travis/travis_install.linux.sh              |  5 --
 .../YouCompleteMe/ci/travis/travis_install.osx.sh  | 24 ---------
 .../YouCompleteMe/ci/travis/travis_install.sh      | 61 ----------------------
 4 files changed, 1 insertion(+), 90 deletions(-)
 create mode 160000 vim/bundle/YouCompleteMe
 delete mode 100644 vim/bundle/YouCompleteMe/ci/travis/travis_install.linux.sh
 delete mode 100644 vim/bundle/YouCompleteMe/ci/travis/travis_install.osx.sh
 delete mode 100644 vim/bundle/YouCompleteMe/ci/travis/travis_install.sh

(limited to 'vim/bundle/YouCompleteMe/ci/travis')

diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe
new file mode 160000
index 0000000..0de1c0c
--- /dev/null
+++ b/vim/bundle/YouCompleteMe
@@ -0,0 +1 @@
+Subproject commit 0de1c0c9bb13ce82172b472c676035cd47cf6a6a
diff --git a/vim/bundle/YouCompleteMe/ci/travis/travis_install.linux.sh b/vim/bundle/YouCompleteMe/ci/travis/travis_install.linux.sh
deleted file mode 100644
index 52d400e..0000000
--- a/vim/bundle/YouCompleteMe/ci/travis/travis_install.linux.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Linux-specific installation
-
-# In order to work with ycmd, python *must* be built as a shared library. This
-# is set via the PYTHON_CONFIGURE_OPTS option.
-export PYTHON_CONFIGURE_OPTS="--enable-shared"
diff --git a/vim/bundle/YouCompleteMe/ci/travis/travis_install.osx.sh b/vim/bundle/YouCompleteMe/ci/travis/travis_install.osx.sh
deleted file mode 100644
index 3873f93..0000000
--- a/vim/bundle/YouCompleteMe/ci/travis/travis_install.osx.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# OS X-specific installation
-
-# There's a homebrew bug which causes brew update to fail the first time. Run
-# it twice to workaround. https://github.com/Homebrew/homebrew/issues/42553
-brew update || brew update
-
-# List of homebrew formulae to install in the order they appear.
-# These are dependencies of pyenv.
-REQUIREMENTS="ninja
-              readline
-              autoconf
-              pkg-config
-              openssl"
-
-# Install pyenv and dependencies
-for pkg in $REQUIREMENTS; do
-  # Install package, or upgrade it if it is already installed
-  brew install $pkg || brew outdated $pkg || brew upgrade $pkg
-done
-
-# In order to work with ycmd, python *must* be built as a shared library. The
-# most compatible way to do this on OS X is with --enable-framework. This is
-# set via the PYTHON_CONFIGURE_OPTS option
-export PYTHON_CONFIGURE_OPTS="--enable-framework"
diff --git a/vim/bundle/YouCompleteMe/ci/travis/travis_install.sh b/vim/bundle/YouCompleteMe/ci/travis/travis_install.sh
deleted file mode 100644
index 0060de9..0000000
--- a/vim/bundle/YouCompleteMe/ci/travis/travis_install.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-set -ev
-
-####################
-# OS-specific setup
-####################
-
-# Requirements of OS-specific install:
-#  - install any software which is not installed by Travis configuration
-#  - set up everything necessary so that pyenv can build python
-source ci/travis/travis_install.${TRAVIS_OS_NAME}.sh
-
-#############
-# pyenv setup
-#############
-
-export PYENV_ROOT="${HOME}/.pyenv"
-
-if [ ! -d "${PYENV_ROOT}/.git" ]; then
-  git clone https://github.com/yyuu/pyenv.git ${PYENV_ROOT}
-fi
-pushd ${PYENV_ROOT}
-git fetch --tags
-git checkout v20160202
-popd
-
-export PATH="${PYENV_ROOT}/bin:${PATH}"
-
-eval "$(pyenv init -)"
-
-if [ "${YCM_PYTHON_VERSION}" == "2.6" ]; then
-  PYENV_VERSION="2.6.6"
-elif [ "${YCM_PYTHON_VERSION}" == "2.7" ]; then
-  PYENV_VERSION="2.7.6"
-else
-  PYENV_VERSION="3.3.6"
-fi
-
-pyenv install --skip-existing ${PYENV_VERSION}
-pyenv rehash
-pyenv global ${PYENV_VERSION}
-
-# It is quite easy to get the above series of steps wrong. Verify that the
-# version of python actually in the path and used is the version that was
-# requested, and fail the build if we broke the travis setup
-python_version=$(python -c 'import sys; print( "{0}.{1}".format( sys.version_info[0], sys.version_info[1] ) )')
-echo "Checking python version (actual ${python_version} vs expected ${YCM_PYTHON_VERSION})"
-test ${python_version} == ${YCM_PYTHON_VERSION}
-
-############
-# pip setup
-############
-
-pip install -U pip wheel setuptools
-pip install -r python/test_requirements.txt
-
-# The build infrastructure prints a lot of spam after this script runs, so make
-# sure to disable printing, and failing on non-zero exit code after this script
-# finishes
-set +ev
-- 
cgit v1.2.3