branch: externals/gpr-query
commit da526d4269848a3156d3e14c68328d69372a5bba
Author: Stephen Leake <[email protected]>
Commit: Stephen Leake <[email protected]>
Misc fixes
* Alire.make (ALIRE_RULES_DIR): Allow overriding alire_rules location from
command line.
(install): Just copy; gprinstall is overkill, and not in path.
* gpr-query.el (gpr-query-exec-opts): Fix defcustom type.
* prj.el: Add lexical-binding: t.
---
Alire.make | 7 ++++---
gpr-query.el | 4 ++--
prj.el | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Alire.make b/Alire.make
index dfe494e602..bbcc758ffa 100644
--- a/Alire.make
+++ b/Alire.make
@@ -1,9 +1,10 @@
# For compiling gpr-query Ada code with Alire
-include ../wisi/alire_rules.make
+ALIRE_RULES_DIR ?= ../wisi
+include $(ALIRE_RULES_DIR)/alire_rules.make
-install : bin/gpr_query$(EXE_EXT)
- gprinstall -f -p -P emacs_gpr_query.gpr --prefix=~/.local
--install-name=gpr_query
+install : alire-build
+ cp bin/gpr_query$(EXE_EXT) ~/.local/bin
# Local Variables:
# eval: (load-file "prj.el")
diff --git a/gpr-query.el b/gpr-query.el
index b2f6e831d6..335b49fedd 100644
--- a/gpr-query.el
+++ b/gpr-query.el
@@ -3,7 +3,7 @@
;; gpr-query supports Ada and any gcc language that supports the
;; AdaCore -fdump-xref switch (which includes C, C++).
;;
-;; Copyright (C) 2013 - 2023 Free Software Foundation, Inc.
+;; Copyright (C) 2013 - 2023, 2025 Free Software Foundation, Inc.
;; Author: Stephen Leake <[email protected]>
;; Maintainer: Stephen Leake <[email protected]>
@@ -54,7 +54,7 @@ Reading all the symbols can be slow in a very large project."
override the database location by specifying
\"--db=<writeable_file>\". See \"gpr_query --help\" for more
options."
- :type 'list)
+ :type '(list string))
(defcustom gpr-query-env nil
"Environment variables needed by the gpr_query executable.
diff --git a/prj.el b/prj.el
index d16bcb9007..e0aa4f660e 100644
--- a/prj.el
+++ b/prj.el
@@ -1,6 +1,6 @@
-;; Emacs wisi project definitions for compiling gpr-query in ELPA or devel
workspace -*- no-byte-compile: t; -*-
+;; Emacs wisi project definitions for compiling gpr-query in ELPA or devel
workspace -*- no-byte-compile: t lexical-binding:t; -*-
;;
-;; Copyright (C) 2021, 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022, 2025 Free Software Foundation, Inc.
(wisi-prj-select-cache
"gpr-query.prj"
