enable clang completer unconditionally

And misc changes/improvements

2 files changed, 50 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c887536f7317..2633f44f2b9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = neovim-youcompleteme-core-git
 	pkgdesc = A code-completion engine for Vim
-	pkgver = r2365.459b3e62
+	pkgver = r2393.487b8ab2
 	pkgrel = 2
 	url = https://valloric.github.io/YouCompleteMe/
 	arch = i686
@@ -12,6 +12,7 @@ pkgbase = neovim-youcompleteme-core-git
 	depends = neovim
 	depends = boost-libs
 	depends = python>=3.2
+	depends = clang>=6.0
 	depends = python-bottle
 	depends = python-waitress
 	depends = python-frozendict
@@ -19,7 +20,6 @@ pkgbase = neovim-youcompleteme-core-git
 	depends = python-future
 	depends = python-neovim
 	depends = python-regex
-	depends = clang>=6.0
 	optdepends = gocode-git: Go semantic completion
 	optdepends = godef-git: Go semantic completion
 	optdepends = nodejs-tern: JavaScript semantic completion
diff --git a/PKGBUILD b/PKGBUILD
index b0bb01be4b6e..ee452d194833 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,29 +8,26 @@
 # Contributor: Simon Gomizelj <simongmzlj@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
 
-# clang completion is builtin and cannot be provided separately (?)
-_clang_completer=y
-
 pkgname=neovim-youcompleteme-core-git
-pkgver=r2365.459b3e62
+pkgver=r2393.487b8ab2
 pkgrel=2
 pkgdesc='A code-completion engine for Vim'
 arch=(i686 x86_64)
 url='https://valloric.github.io/YouCompleteMe/'
 license=('GPL3')
-depends=('neovim' 'boost-libs' 'python>=3.2'
+depends=('neovim' 'boost-libs' 'python>=3.2' 'clang>=6.0'
          'python-bottle' 'python-waitress' 'python-frozendict'
          'python-requests-futures' 'python-future' 'python-neovim'
          'python-regex')
 makedepends=('git' 'cmake' 'boost')
 optdepends=(
-	'gocode-git: Go semantic completion'
-	'godef-git: Go semantic completion'
-	'nodejs-tern: JavaScript semantic completion'
-	'racerd-git: Rust semantic completion'
-	'typescript: Typescript semantic completion'
-	'python-jedi: Python semantic completion')
-# https://github.com/Valloric/ycmd/pull/213
+  'gocode-git: Go semantic completion'
+  'godef-git: Go semantic completion'
+  'nodejs-tern: JavaScript semantic completion'
+  'racerd-git: Rust semantic completion'
+  'typescript: Typescript semantic completion'
+  'python-jedi: Python semantic completion')
+# https://github.com/Valloric/ycmd/pull/885
 #'omnisharp-roslyn: C# semantic completion'
 
 source=('git+https://github.com/Valloric/YouCompleteMe.git'
@@ -39,56 +36,55 @@ sha256sums=('SKIP'
             'SKIP')
 
 pkgver() {
-	cd "${srcdir}/YouCompleteMe"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd YouCompleteMe
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-if [ "${_clang_completer}" == 'y' ]; then
-	depends+=('clang>=6.0')
-fi
 
 prepare() {
-	cd "${srcdir}/YouCompleteMe"
-	git submodule init
-	git config submodule.third_party/ycmd.url "${srcdir}/ycmd"
-	git submodule update
+  mkdir -p ycmd_build
+
+  cd YouCompleteMe
+
+  git submodule init
+  git config submodule.third_party/ycmd.url "$srcdir/ycmd"
+  git submodule update
 }
 
 build() {
-	mkdir -p "${srcdir}/ycmd_build"
-	cd "${srcdir}/ycmd_build"
+  cd ycmd_build
 
-	cmake_flags="-DUSE_PYTHON2=OFF -DUSE_SYSTEM_BOOST=ON"
+  cmake \
+    -DUSE_PYTHON2=OFF \
+    -DUSE_SYSTEM_BOOST=ON \
+    -DUSE_CLANG_COMPLETER=ON \
+    -DUSE_SYSTEM_LIBCLANG=ON \
+    ../YouCompleteMe/third_party/ycmd/cpp
 
-	if [ "${_clang_completer}" == 'y' ]; then
-		cmake_flags+=" -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON"
-	fi
-
-	cmake ${cmake_flags} . "$srcdir/YouCompleteMe/third_party/ycmd/cpp"
-	make ycm_core
+  make ycm_core
 }
 
 package() {
-	pkg_ycmd_dir="${pkgdir}/usr/share/nvim/runtime/third_party/ycmd"
-	src_ycmd_dir="${srcdir}/YouCompleteMe/third_party/ycmd"
-	mkdir -p "${pkg_ycmd_dir}"
-
-	cp -r "${srcdir}/YouCompleteMe/"{autoload,doc,plugin,python} "${pkgdir}/usr/share/nvim/runtime"
-	cp -r "${src_ycmd_dir}/"{ycmd,ycm_core.so,CORE_VERSION} "${pkg_ycmd_dir}"
-	if [ "${_clang_completer}" == 'y' ]; then
-		clang_version="$(clang --version|sed -n 's/clang version \([0-9.]\+\) .*/\1/p')"
-		ln -s "/usr/lib/clang/${clang_version}/include/" "${pkg_ycmd_dir}/clang_includes"
-		unset clang_version
-	fi
-
-        install -Ddm755 "${pkg_ycmd_dir}/third_party/tern_runtime/node_modules/"
-        install -Ddm755 "${pkg_ycmd_dir}/third_party/gocode/"
-        install -Ddm755 "${pkg_ycmd_dir}/third_party/godef/"
-        ln -s /usr/lib/node_modules/tern "${pkg_ycmd_dir}/third_party/tern_runtime/node_modules/"
-        ln -s /usr/bin/gocode "${pkg_ycmd_dir}/third_party/gocode/"
-        ln -s /usr/bin/godef "${pkg_ycmd_dir}/third_party/godef/"
-
-	find "${pkgdir}" \( -name .git -or -name 'test*' -or -name 'run_tests.py' -or -name 'CMakeFiles' \) -exec rm -fr {} +
-
-	python -m compileall "$pkgdir"
+  pkg_ycmd_dir="$pkgdir/usr/share/nvim/runtime/third_party/ycmd"
+
+  cd YouCompleteMe
+  install -Ddm755 "$pkg_ycmd_dir"
+
+  cp -r autoload doc plugin python "$pkgdir/usr/share/nvim/runtime"
+  cp -r third_party/ycmd/{ycmd,ycm_core.so,CORE_VERSION} "$pkg_ycmd_dir"
+  clang_version="$(clang --version|sed -n 's/clang version \([0-9.]\+\) .*/\1/p')"
+  ln -s "/usr/lib/clang/$clang_version/include/" "$pkg_ycmd_dir/clang_includes"
+  unset clang_version
+
+  install -Ddm755 "$pkg_ycmd_dir/third_party/tern_runtime/node_modules/"
+  install -Ddm755 "$pkg_ycmd_dir/third_party/gocode/"
+  install -Ddm755 "$pkg_ycmd_dir/third_party/godef/"
+  ln -s /usr/lib/node_modules/tern "$pkg_ycmd_dir/third_party/tern_runtime/node_modules/"
+  ln -s /usr/bin/gocode "$pkg_ycmd_dir/third_party/gocode/"
+  ln -s /usr/bin/godef "$pkg_ycmd_dir/third_party/godef/"
+
+  find "$pkgdir" \( -name .git -or -name 'test*' -or -name 'run_tests.py' -or -name 'CMakeFiles' \) -exec rm -fr {} +
+
+  python -m compileall -d /usr/share/nvim/runtime "$pkgdir/usr/share/nvim/runtime"
+  python -O -m compileall -d /usr/share/nvim/runtime "$pkgdir/usr/share/nvim/runtime"
 }