Refactor package build and update to new version.

1 files changed, 23 insertions, 48 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 13c7e200e3fb..a0123a35d701 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,39 @@
-# Maintainer: karel
+# Maintainer: Manuel Schmitzberger <ms@ms-sw.at>
 
-pkgname=ycmd-git
+pkgname=ycmd
 _gitname=ycmd
-pkgver=r2548.d3378ca3
+pkgver=r2844.06228007
 pkgrel=1
-pkgdesc="A code-completion & code-comprehension server"
-arch=('i686' 'x86_64')
-url="https://github.com/Valloric/ycmd"
+pkgdesc="A code-completion & code-comprehension server."
+arch=('any')
+url="https://github.com/ycm-core/ycmd"
 license=('GPLv3')
-depends=('boost-libs' 'clang' 'python' 'python-certifi')
-makedepends=('boost' 'cmake' 'git')
-provides=('ycmd')
-conflicts=('ycmd')
-source=("git+https://github.com/Valloric/ycmd.git"
-        "git+https://github.com/bottlepy/bottle.git"
-        "git+https://github.com/davidhalter/jedi.git"
-        "git+https://github.com/davidhalter/parso.git"
-        "git+https://github.com/requests/requests.git"
-        "git+https://github.com/Pylons/waitress.git"
-        "git+https://github.com/davidhalter/typeshed.git")
-sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+depends=('clang' 'python')
+makedepends=('python' 'cmake' 'git')
+source=("git+https://github.com/ycm-core/ycmd")
+sha256sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/$_gitname"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$srcdir/$_gitname"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-    cd "$srcdir/$_gitname"
-    git submodule init third_party/bottle \
-        third_party/jedi_deps/jedi \
-        third_party/jedi_deps/parso \
-        third_party/requests_deps/requests \
-        third_party/waitress
-    git config submodule.third_party/bottle.url $srcdir/bottle
-    git config submodule.third_party/jedi_deps/jedi.url $srcdir/jedi_deps/jedi
-    git config submodule.third_party/jedi_deps/parso.url $srcdir/jedi_deps/parso
-    git config submodule.third_party/requests_deps/requests.url $srcdir/requests_deps/requests
-    git config submodule.third_party/waitress.url $srcdir/waitress
-    git submodule update
-    cd "third_party/jedi_deps/jedi"
-    git config submodule.jedi/third_party/typeshed.url "$srcdir"/typeshed
-    git submodule update
+  cd "$srcdir/$_gitname"
+  git submodule update --init --recursive
 }
 
 build() {
-    cd "$srcdir/$_gitname"
-    mkdir -p build
-    cd build
-    cmake -G "Unix Makefiles" -DUSE_SYSTEM_BOOST=ON -DUSE_SYSTEM_LIBCLANG=ON -DUSE_CLANG_COMPLETER=ON -DUSE_PYTHON2=OFF . ../cpp/
-    make ycm_core
+  cd "$srcdir/$_gitname"
+  python3 build.py --all
 }
 
 package() {
-    local trgtdir=usr/share/ycmd
-    mkdir -p "$pkgdir/$trgtdir/third_party"
-   	cp -r "$srcdir/$_gitname/"{ycmd,ycm_core.so,CORE_VERSION,cpp} \
-		    "$pkgdir/$trgtdir"
-   	cp -r "$srcdir/$_gitname/third_party/"{bottle,clang,jedi_deps,requests_deps,waitress} \
-		    "$pkgdir/$trgtdir/third_party"
-	  find "$pkgdir" -name .git -exec rm -fr {} +
-   	rm -rf "$pkgdir/$trgtdir/ycmd/tests"
+  local trgtdir=usr/share/ycmd
+  mkdir -p "$pkgdir/$trgtdir/third_party"
+  cp -r "$srcdir/$_gitname/"{ycmd,ycm_core.*.so,CORE_VERSION,cpp} "$pkgdir/$trgtdir"
+  cp -r "$srcdir/$_gitname/third_party/"{bottle,clang,generic_server,jedi_deps,mrab-regex,regex-build,tern_runtime,tsserver,waitress,watchdog_deps} \
+      "$pkgdir/$trgtdir/third_party"
+  find "$pkgdir" -name .git -exec rm -fr {} +
+  rm -rf "$pkgdir/$trgtdir/ycmd/tests"
 }