From dfd62c4c44954cb2a858a7e78edd0678f19a5999 Mon Sep 17 00:00:00 2001
From: micbou <contact@micbou.com>
Date: Sun, 17 Apr 2016 03:10:57 +0200
Subject: [PATCH] Update Travis configuration

---
 .travis.yml                       | 12 ++----------
 ci/appveyor/appveyor_install.bat  |  7 -------
 ci/travis/travis_install.linux.sh |  5 ++++-
 third_party/ycmd                  |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2aff6191..34df1b2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,19 +24,11 @@ addons:
      # 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++
-     - deadsnakes  # for various versions of python
-     - kalakris-cmake # for a more recent version of cmake (needed for ninja-build)
+     - george-edison55-precise-backports # for a more recent version of cmake (3.2.3)
     packages:
+     - cmake-data
      - cmake
      - ninja-build
-     # The confusing part is that on Travis Linux with YCMD_PYTHON_VERSION=3.3,
-     # we build the C++ parts against the below system python3.3, but run
-     # against the pyenv python3.3. This is because stupid cmake 2.8.11 has a
-     # bug preventing it from finding the pyenv pythons (ostensibly; I haven't
-     # checked, but online reports say the issue is gone with cmake 3.4).
-     # Everything still works though, it's just weird.
-     - python3.3
-     - python3.3-dev
      # Everything below is a Python build dep (though it depends on Python
      # version). We need them because pyenv builds Python.
      - libssl-dev
diff --git a/ci/appveyor/appveyor_install.bat b/ci/appveyor/appveyor_install.bat
index 2f20a162..33c78072 100755
--- a/ci/appveyor/appveyor_install.bat
+++ b/ci/appveyor/appveyor_install.bat
@@ -16,13 +16,6 @@ if %arch% == 32 (
 set PATH=%python_path%;%python_path%\Scripts;%PATH%
 python --version
 
-:: When using Python 3 on AppVeyor, CMake will always pick the 64 bit
-:: libraries. We specifically tell CMake the right path to the libraries
-:: according to the architecture.
-if %python% == 35 (
-  set EXTRA_CMAKE_ARGS="-DPYTHON_LIBRARY=%python_path%\libs\python%python%.lib"
-)
-
 appveyor DownloadFile https://bootstrap.pypa.io/get-pip.py
 python get-pip.py
 pip install -r python\test_requirements.txt
diff --git a/ci/travis/travis_install.linux.sh b/ci/travis/travis_install.linux.sh
index c5b6a51f..52d400e4 100644
--- a/ci/travis/travis_install.linux.sh
+++ b/ci/travis/travis_install.linux.sh
@@ -1,2 +1,5 @@
-# Linux installation
+# 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/third_party/ycmd b/third_party/ycmd
index ff72c856..b74add9c 160000
--- a/third_party/ycmd
+++ b/third_party/ycmd
@@ -1 +1 @@
-Subproject commit ff72c8567201a9f9584357b2317fa80a6704b656
+Subproject commit b74add9c32f6edd71e165a7151fac12cf8a9a32c