Update for recent versions

* Remove the "utils-var_length_ints-test.adb" test main.

* Build and install the lal_tools.gpr project.

* Use the "install-bin-strip" Makefile rule to install mains.

3 files changed, 39 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 956576cced35..3543f589ee81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libadalang-tools-git
 	pkgdesc = Libadalang-based tools: gnatpp, gnatmetric and gnatstub
-	pkgver = r485.8b3186df
+	pkgver = r561.e18d43fa
 	pkgrel = 1
 	url = https://github.com/AdaCore/libadalang-tools
 	arch = i686
@@ -9,7 +9,9 @@ pkgbase = libadalang-tools-git
 	makedepends = git
 	depends = libadalang
 	source = git+https://github.com/AdaCore/libadalang-tools.git
+	source = fix-mains.patch
 	sha1sums = SKIP
+	sha1sums = 29619d48e3e098fa3002d171aa50307f173ee706
 
 pkgname = libadalang-tools-git
 
diff --git a/PKGBUILD b/PKGBUILD
index a7f099025e11..67611197e893 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Pierre-Marie de Rodat <pmderodat on #ada at freenode.net>
 
 pkgname=libadalang-tools-git
-pkgver=r485.8b3186df
+pkgver=r561.e18d43fa
 pkgrel=1
 
 pkgdesc="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
@@ -12,8 +12,10 @@ license=('GPL')
 depends=('libadalang')
 makedepends=('git')
 
-source=('git+https://github.com/AdaCore/libadalang-tools.git')
-sha1sums=('SKIP')
+source=('git+https://github.com/AdaCore/libadalang-tools.git'
+        'fix-mains.patch')
+sha1sums=('SKIP'
+          '29619d48e3e098fa3002d171aa50307f173ee706')
 
 pkgver() {
     cd "$srcdir/${pkgname%-git}"
@@ -22,24 +24,33 @@ pkgver() {
         "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+    cd "$srcdir/${pkgname%-git}"
+
+    patch -Np1 -i "$srcdir/fix-mains.patch"
+}
+
 build() 
 {
     cd "$srcdir/${pkgname%-git}"
 
-    # In order to build the generated library, Langkit expects the QUEX_PATH to
-    # be set.
-    source /etc/profile.d/quex.sh
-
-    make BUILD_MODE=prod LIBRARY_TYPE=relocatable PROCESSORS=`nproc`
+    for lt in static static-pic relocatable
+    do
+        make BUILD_MODE=prod LIBRARY_TYPE=$lt PROCESSORS=`nproc` lib
+    done
+    make BUILD_MODE=prod LIBRARY_TYPE=relocatable PROCESSORS=`nproc` bin
 }
 
 package()
 {
     cd "$srcdir/${pkgname%-git}"
 
-    mkdir -p "$pkgdir/usr/bin"
-    for program in gnatpp gnatmetric gnatstub
+    for lt in static static-pic relocatable
     do
-        install -m755 bin/$program "$pkgdir/usr/bin/"
+        make BUILD_MODE=prod LIBRARY_TYPE=$lt \
+            DESTDIR="$pkgdir/usr" install-lib
     done
+
+    make BUILD_MODE=prod LIBRARY_TYPE=relocatable \
+        DESTDIR="$pkgdir/usr" install-bin-strip
 }
diff --git a/fix-mains.patch b/fix-mains.patch
new file mode 100644
index 000000000000..2f6557b0676d
--- /dev/null
+++ b/fix-mains.patch
@@ -0,0 +1,14 @@
+diff --git a/src/build.gpr b/src/build.gpr
+index 9b1e375d..49cdc0e1 100644
+--- a/src/build.gpr
++++ b/src/build.gpr
+@@ -15,8 +15,7 @@ project Build is
+      ("pp-main.adb",
+       "metrics-main.adb",
+       "stub-main.adb",
+-      "test-main.adb",
+-      "utils-var_length_ints-test.adb");
++      "test-main.adb");
+ 
+    for Source_Dirs use (".");
+    for Object_Dir use "../obj";