diff options
author | Tim Lagnese | 2021-02-14 00:43:34 -0800 |
---|---|---|
committer | Tim Lagnese | 2021-09-28 23:30:28 -0700 |
commit | 53eae1293d81eaf32272a30b21df320c1e9624a4 (patch) | |
tree | dbbc67224803d6e417f881c89b7c64262aed2230 | |
parent | 25e4893d1894f765b656ea99f374880a26801046 (diff) | |
download | aur-53eae1293d81eaf32272a30b21df320c1e9624a4.tar.gz |
Update to 22.0.3
-rw-r--r-- | .SRCINFO | 47 | ||||
-rw-r--r-- | Makefile.patch | 21 | ||||
-rw-r--r-- | PKGBUILD | 66 | ||||
-rw-r--r-- | VSS.patch | 13 | ||||
-rw-r--r-- | ada_language_server.patch | 34 | ||||
-rw-r--r-- | libadalang-tools.patch | 13 |
6 files changed, 152 insertions, 42 deletions
@@ -1,19 +1,50 @@ pkgbase = ada_language_server pkgdesc = High performance syntactic and semantic engine for the Ada programming language - pkgver = 21.0.11 + pkgver = 22.0.3 pkgrel = 1 url = https://github.com/AdaCore/ada_language_server/ - arch = any + arch = x86_64 license = GPL3 makedepends = gcc-ada - makedepends = gprbuild - depends = libadalang + makedepends = gprbuild-git + makedepends = autopep8 + makedepends = python-coverage + makedepends = python-docutils + makedepends = python-funcy + makedepends = python-mako + makedepends = python-psutil + makedepends = python-sphinx_rtd_theme + makedepends = yapf + makedepends = python-pycodestyle + makedepends = mypy + makedepends = flake8 + makedepends = python-jsonschema + makedepends = python-e3-core + makedepends = python-e3-testsuite + makedepends = git + depends = gnatcoll-iconv + depends = gnatcoll-gmp + depends = ada-libfswatch-git provides = ada_language_server conflicts = ada_language_server-git - source = ada_language_server-21.0.11.tar.gz::https://github.com/AdaCore/ada_language_server/archive/21.0.11.tar.gz - source = Makefile.patch - sha1sums = d1e29d21162d465b92c4dce33c3a8a0b787baeee - sha1sums = f8afe12dedcef533b6888aa227da2a5dbe199376 + conflicts = libvss + conflicts = libadalang + source = ada_language_server-22.0.3.tar.gz::https://github.com/AdaCore/ada_language_server/archive/22.0.3.tar.gz + source = git+https://github.com/AdaCore/VSS.git#commit=b9c65707a43d747116dad7711d1d026c9b767d41 + source = git+https://github.com/AdaCore/langkit.git#commit=3e376436d169a91bda26ba48ed151acf22bada9a + source = git+https://github.com/AdaCore/libadalang.git#commit=f95e0161cf0bca8e21c8bc7a8795eb332b153733 + source = git+https://github.com/AdaCore/libadalang-tools.git#commit=9bfbf407d9f376684aafe25797b04cb3fe10ca02 + source = libadalang-tools.patch + source = VSS.patch + source = ada_language_server.patch + sha1sums = fec24df3cda0ed7a0022a5f09a2ca4194aecb778 + sha1sums = SKIP + sha1sums = SKIP + sha1sums = SKIP + sha1sums = SKIP + sha1sums = b1d6d2578ef21d3dd71dee10ed4857a5a4e5f8d5 + sha1sums = dcc8be463ad852ea595748b5c3c092fc88f79ae5 + sha1sums = 23f4f0502d322bda621ad013aab5f45ab20555aa pkgname = ada_language_server diff --git a/Makefile.patch b/Makefile.patch deleted file mode 100644 index 370fbf9d90fa..000000000000 --- a/Makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile -+++ Makefile -@@ -52,11 +52,14 @@ ifeq ($(LIBRARY_TYPE), static) - -XGPR_BUILD=static \ - -XOS=$(OS) - else -- LIBRARY_FLAGS=-XBUILD_MODE=$(BUILD_MODE) -XOS=$(OS) -+ LIBRARY_FLAGS=-XBUILD_MODE=$(BUILD_MODE) -XLIBRARY_TYPE=relocatable -XOS=$(OS) - endif - - BUILD_FLAGS=$(LIBRARY_FLAGS) - -+ifeq ($(COVERAGE),) -+ COVERAGE_BUILD_FLAGS= $(LIBRARY_FLAGS) -+ COVERAGE_BUILD_FLAGS=$(LIBRARY_FLAGS) -+else --ifneq ($(COVERAGE),) - COVERAGE_BUILD_FLAGS= $(LIBRARY_FLAGS) \ - --implicit-with=gnatcov_rts_full \ @@ -1,35 +1,75 @@ # Maintainer: Tim Lagnese <tim at inept tech> pkgname=ada_language_server -pkgver=21.0.11 +pkgver=22.0.3 pkgrel=1 pkgdesc='High performance syntactic and semantic engine for the Ada programming language' url='https://github.com/AdaCore/ada_language_server/' -arch=('any') +arch=('x86_64') license=('GPL3') -depends=('libadalang') -makedepends=('gcc-ada' 'gprbuild') +depends=('gnatcoll-iconv' 'gnatcoll-gmp' 'ada-libfswatch-git') +makedepends=('gcc-ada' 'gprbuild-git' 'autopep8' 'python-coverage' + 'python-docutils' 'python-funcy' 'python-mako' 'python-psutil' + 'python-sphinx_rtd_theme' 'yapf' 'python-pycodestyle' 'mypy' 'flake8' 'python-jsonschema' + 'python-e3-core' 'python-e3-testsuite' 'git') provides=('ada_language_server') -conflicts=('ada_language_server-git') - -source=("$pkgname-$pkgver.tar.gz::https://github.com/AdaCore/ada_language_server/archive/$pkgver.tar.gz" 'Makefile.patch') -sha1sums=('d1e29d21162d465b92c4dce33c3a8a0b787baeee' 'f8afe12dedcef533b6888aa227da2a5dbe199376') +conflicts=('ada_language_server-git' 'libvss' 'libadalang') +_upstream_ver=2020-20200429-1998C +_pkgname=libadalang-tools +_pkgver=2020 +_checksum=740372d8ffb1e4755a99bead2d78dace904235c0 +source=("$pkgname-$pkgver.tar.gz::https://github.com/AdaCore/ada_language_server/archive/$pkgver.tar.gz" + "git+https://github.com/AdaCore/VSS.git#commit=b9c65707a43d747116dad7711d1d026c9b767d41" + "git+https://github.com/AdaCore/langkit.git#commit=3e376436d169a91bda26ba48ed151acf22bada9a" + "git+https://github.com/AdaCore/libadalang.git#commit=f95e0161cf0bca8e21c8bc7a8795eb332b153733" + "git+https://github.com/AdaCore/libadalang-tools.git#commit=9bfbf407d9f376684aafe25797b04cb3fe10ca02" + "libadalang-tools.patch" + "VSS.patch" + "ada_language_server.patch") +sha1sums=('fec24df3cda0ed7a0022a5f09a2ca4194aecb778' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'b1d6d2578ef21d3dd71dee10ed4857a5a4e5f8d5' + 'dcc8be463ad852ea595748b5c3c092fc88f79ae5' + '23f4f0502d322bda621ad013aab5f45ab20555aa') prepare() { - cd "$pkgname-$pkgver" - patch --forward --strip=0 --input="${srcdir}/Makefile.patch" + cd "$srcdir/libadalang-tools" + git apply "$srcdir/libadalang-tools.patch" + cd "$srcdir/VSS" + git apply "$srcdir/VSS.patch" + cd "$srcdir/$pkgname-$pkgver" + git apply "$srcdir/ada_language_server.patch" } build() { - cd "$srcdir/$pkgname-$pkgver" - make LIBRARY_TYPE=relocatable BUILD_MODE=prod + # Manually handle dependencies since we have to use specific versions that don't match version in the AUR + # 1. Build VSS + cd "$srcdir/VSS" + make BUILD_MODE=prod all + # 2. Build langkit + cd ../langkit + python manage.py build-langkit-support --library-types=static-pic + # 3. Build libadalang + cd ../libadalang + PYTHONPATH="../langkit" + export PYTHONPATH + python manage.py generate + # 4. Build libadalang-tools + cd ../libadalang-tools + make BUILD_MODE=prod LIBRARY_TYPE=static-pic + # 5. Finally, build ada_language_server + cd "../$pkgname-$pkgver" + make BUILD_MODE=prod LIBRARY_TYPE=static-pic } package() { cd "$srcdir/$pkgname-$pkgver" - make LIBRARY_TYPE=relocatable BUILD_MODE=prod DESTDIR="$pkgdir/usr" install + make BUILD_MODE=prod LIBRARY_TYPE=static-pic DESTDIR="$pkgdir/usr" install } diff --git a/VSS.patch b/VSS.patch new file mode 100644 index 000000000000..cf5f546a3c1e --- /dev/null +++ b/VSS.patch @@ -0,0 +1,13 @@ +Index: VSS/gnat/vss_config.gpr +=================================================================== +--- VSS.orig/gnat/vss_config.gpr ++++ VSS/gnat/vss_config.gpr +@@ -31,6 +31,8 @@ abstract project VSS_Config is + Ada_Coverage_Switches := (); + Linker_Options := (); + ++ for Library_Kind use "static-pic"; ++ + case Build_Mode is + when "prod" => + Ada_Switches := ( diff --git a/ada_language_server.patch b/ada_language_server.patch new file mode 100644 index 000000000000..95ee61cb3d7f --- /dev/null +++ b/ada_language_server.patch @@ -0,0 +1,34 @@ +Index: ada_language_server-22.0.3/Makefile +=================================================================== +--- ada_language_server-22.0.3.orig/Makefile ++++ ada_language_server-22.0.3/Makefile +@@ -72,11 +72,11 @@ endif + all: coverage-instrument + $(GPRBUILD) -P gnat/spawn_tests.gpr -p $(BUILD_FLAGS) + $(GPRBUILD) -P gnat/tester.gpr -p $(BUILD_FLAGS) +- $(GPRBUILD) -d -ws -c -u -P gnat/lsp_server.gpr -p $(BUILD_FLAGS) s-memory.adb +- $(GPRBUILD) -P gnat/lsp_server.gpr -p $(COVERAGE_BUILD_FLAGS) \ ++ $(GPRBUILD) -d -ws -c -u -P gnat/lsp_server.gpr -aP ../libadalang-tools/src -aP ../VSS/gnat -aP ../libadalang/build -aP ../langkit/support -p $(BUILD_FLAGS) s-memory.adb ++ $(GPRBUILD) -P gnat/lsp_server.gpr -aP ../libadalang-tools/src -aP ../VSS/gnat -aP ../libadalang/build -aP ../langkit/support -p $(COVERAGE_BUILD_FLAGS) \ + -XVERSION=$(TRAVIS_TAG) +- $(GPRBUILD) -P gnat/codec_test.gpr -p $(COVERAGE_BUILD_FLAGS) +- $(GPRBUILD) -P gnat/lsp_client.gpr -p $(COVERAGE_BUILD_FLAGS) \ ++ $(GPRBUILD) -P gnat/codec_test.gpr -aP ../VSS/gnat -p $(COVERAGE_BUILD_FLAGS) ++ $(GPRBUILD) -P gnat/lsp_client.gpr -aP ../VSS/gnat -p $(COVERAGE_BUILD_FLAGS) \ + -XVERSION=$(TRAVIS_TAG) + mkdir -p integration/vscode/ada/$(PLATFORM) + cp -f .obj/server/ada_language_server integration/vscode/ada/$(PLATFORM) ||\ +@@ -97,11 +97,11 @@ ifneq ($(COVERAGE),) + endif + + install: +- gprinstall -f -P gnat/lsp_server.gpr -p -r --mode=usage \ ++ gprinstall -f -P gnat/lsp_server.gpr -aP ../libadalang-tools/src -aP ../VSS/gnat -aP ../libadalang/build -aP ../langkit/support -p -r --mode=usage \ + --prefix=$(DESTDIR) $(LIBRARY_FLAGS) + gprinstall -f -P gnat/tester.gpr -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS) + gprinstall -f -P gnat/codec_test.gpr -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS) +- gprinstall -f -P gnat/lsp_client.gpr -p -r \ ++ gprinstall -f -P gnat/lsp_client.gpr -aP ../VSS/gnat -p -r \ + --mode=dev \ + --prefix=$(DESTDIR) \ + $(LIBRARY_FLAGS) diff --git a/libadalang-tools.patch b/libadalang-tools.patch new file mode 100644 index 000000000000..09da8fe0d85e --- /dev/null +++ b/libadalang-tools.patch @@ -0,0 +1,13 @@ +Index: libadalang-tools/Makefile +=================================================================== +--- libadalang-tools.orig/Makefile ++++ libadalang-tools/Makefile +@@ -22,7 +22,7 @@ lib: + which gprbuild + which gcc + for proj in $(LIB_PROJECTS) ; do \ +- gprbuild -v -k \ ++ gprbuild -v -aP ../libadalang/build -aP ../langkit/support -k \ + -XLIBRARY_TYPE=$(LIBRARY_TYPE) \ + -XXMLADA_BUILD=$(LIBRARY_TYPE) \ + -XBUILD_MODE=$(BUILD_MODE) \ |