branch: externals/gpr-query
commit a9cb407ef8adca50e0ef5d2dece57529e1d2d380
Author: Stephen Leake <stephen_le...@stephe-leake.org>
Commit: Stephen Leake <stephen_le...@stephe-leake.org>
Misc improve
* Alire.make: Simplify path to alire_rules.make.
(install): New.
* ELPA.make: Delete copy to elpa, tar, zip, tag; only developed in elpa git.
(install): Add --prefix=~/.local.
* gpr-query.texi (Installation): Delete install Alire compiler for
external use; would also require gnatcoll.
---
.gitignore | 7 +++++++
Alire.make | 5 +++--
ELPA.make | 34 +++++-----------------------------
gpr-query.texi | 12 +-----------
4 files changed, 16 insertions(+), 42 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..4eac78d3ce
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+alire/
+autoloads.el
+autoloads.el~
+bin/
+config/
+*.elc
+obj/
diff --git a/Alire.make b/Alire.make
index b002db006e..a52a8e8602 100644
--- a/Alire.make
+++ b/Alire.make
@@ -1,8 +1,9 @@
# For compiling gpr-query Ada code with Alire
-STEPHES_ADA_LIBRARY_ALIRE_PREFIX ?= $(CURDIR)/../org.stephe_leake.sal
+include ../wisi/alire_rules.make
-include $(STEPHES_ADA_LIBRARY_ALIRE_PREFIX)/build/alire_rules.make
+install : bin/gpr_query$(EXE_EXT)
+ gprinstall -f -p -P emacs_gpr_query.gpr --prefix=~/.local
--install-name=gpr_query
# Local Variables:
# eval: (load-file "prj-eglot.el")
diff --git a/ELPA.make b/ELPA.make
index 9128803062..e0fa44f647 100644
--- a/ELPA.make
+++ b/ELPA.make
@@ -12,7 +12,7 @@ build : config/emacs_gpr_query_config.gpr force
gprbuild -p -j8 emacs_gpr_query.gpr
install : bin/gpr_query$(EXE_EXT)
- gprinstall -f -p -P emacs_gpr_query.gpr --install-name=gpr_query
+ gprinstall -f -p -P emacs_gpr_query.gpr --prefix=~/.local
--install-name=gpr_query
ifeq ($(shell uname),Linux)
EMACS_EXE ?= emacs
@@ -43,15 +43,6 @@ clean : force
recursive-clean : force
gprclean -r -P emacs_gpr_query.gpr
-### publish to elpa package
-ELPA_ROOT ?= $(shell cd ../elpa; pwd -W)
-
-pub : force | $(ELPA_ROOT)/packages/gpr-query
- rm -rf $(ELPA_ROOT)/packages/gpr-query/*
- cp *.el *.gpr *.make *.prj *.sh *.texi $(ELPA_ROOT)/packages/gpr-query
- cp NEWS README $(ELPA_ROOT)/packages/gpr-query
- cd $(ELPA_ROOT)/packages/gpr-query; rm autoloads.el
-
# builds $(ELPA_ROOT)/archive-devel/*, from the last commit, _not_ the
# current workspace Also checks copyright; run elpa/GNUMakefile
# check/<pkg> first if added files.
@@ -59,26 +50,11 @@ build-elpa : force
rm -rf $(ELPA_ROOT)/archive-devel
make -C $(ELPA_ROOT)/ build/gpr-query
-config/emacs_gpr_query_config.gpr :
- cp emacs_gpr_query_config_devel.gpr config/emacs_gpr_query_config.gpr
-
-### misc stuff
-BRANCH := $(notdir $(shell cd ..; pwd))
-
-ifeq ($(BRANCH),org.emacs.gpr-query)
- TAR_FILE := org.emacs.gpr-query-$(GPR_QUERY_VERSION)
-else
- TAR_FILE := $(BRANCH)
-endif
-
-zip :
- rm -rf $(TAR_FILE)
- mtn checkout --branch $(BRANCH) $(TAR_FILE)
- tar jcf $(TAR_FILE).tar.bz2 --exclude _MTN -C .. $(TAR_FILE)
-
-tag :
- mtn tag h:org.emacs.gpr-query org.emacs.gpr-query-$(GPR_QUERY_VERSION)
+config :
+ mkdir config
+config/emacs_gpr_query_config.gpr : config
+ cp emacs_gpr_query_config_devel.gpr config/emacs_gpr_query_config.gpr
# Local Variables:
# eval: (load-file "prj.el")
diff --git a/gpr-query.texi b/gpr-query.texi
index 59a870a023..3723803b36 100644
--- a/gpr-query.texi
+++ b/gpr-query.texi
@@ -77,17 +77,7 @@ gprbuild; then you must use the toolchain assistant:
alr toolchain --select --local
@end example
-You can also install a compiler provided by Alire in an external
-directory, to be used outside Alire:
-@example
-alr toolchain --install --install-dir $HOME/.local gnat_native
-alr toolchain --install --install-dir $HOME/.local gprbuild
-@end example
-
-Then add the installed @code{bin} directories to your @code{PATH}.
-
-
-In any case, after installing the gpr-query ELPA package:
+After installing the gpr-query ELPA package:
@example
cd ~/.emacs.d/elpa/gpr-query-1.0.x
./build.sh
