mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

improve cabal v2 use

Browse source 
cabal exec in v2 puts the built binary in PATH, so can just ask where it
is that way, and symlink it

And cabal exec hothasktags simplifies running that, because it sets up
most of the necessary environment.

The tags and TAGS targets now need cabal v2 to work.
This commit is contained in:
Joey Hess 2020-06-18 13:56:03 -04:00
parent 22ac56fece
commit 4c44deb2cd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Makefile
View file

@ -58,7 +58,7 @@ git-annex: tmp/configure-stamp
ln -sf $$(stack path $(BUILDERCOMMONOPTIONS) --dist-dir)/build/git-annex/git-annex git-annex; \
else \
if [ -d dist-newstyle ]; then \
ln -sf $$(find dist-newstyle/ -executable -type f | grep 'git-annex$$' | tail -n1) git-annex; \
ln -sf $$(cabal exec -- sh -c 'command -v git-annex') git-annex; \
else \
ln -sf dist/build/git-annex/git-annex git-annex; \
fi; \
@ -108,17 +108,23 @@ test: git-annex git-annex-shell
retest: git-annex
./git-annex test --rerun-update --rerun-filter failures
# https://github.com/luqui/hothasktags/issues/18
HOTHASKTAGS_ARGS=-XLambdaCase -XPackageImports -c --cpp -c -traditional -c --include=$$(find dist-newstyle | grep cabal_macros.h | head -n1)
# tags file for vim
# hothasktags chokes on some template haskell etc, so ignore errors
tags:
(for f in $$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v dist/ | grep -v /doc/ | egrep '\.hs$$'); do hothasktags ${HOTHASKTAGS_ARGS} $$f; done) 2>/dev/null | sort > tags
@$(MAKE) --quiet hothasktags HOTHASKTAGS_OPT= TAGFILE=tags
# TAGS file for emacs
TAGS:
(for f in $$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v dist/ | grep -v /doc/ | egrep '\.hs$$'); do hothasktags ${HOTHASKTAGS_ARGS} -e $$f; done) 2>/dev/null > TAGS
@$(MAKE) --quiet hothasktags HOTHASKTAGS_OPT=-e TAGFILE=TAGS
# https://github.com/luqui/hothasktags/issues/18
HOTHASKTAGS_ARGS=-XLambdaCase -XPackageImports --cpp
hothasktags:
@if ! cabal exec hothasktags -- $(HOTHASKTAGS_OPT) $(HOTHASKTAGS_ARGS) \
$$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v dist/ | grep -v /doc/ | egrep '\.hs$$') 2>/dev/null \
| sort > $(TAGFILE); then \
echo "** hothasktags failed"; \
fi
mans: Build/MakeMans
./Build/MakeMans
@ -283,4 +289,4 @@ distributionupdate:
ghc -Wall -fno-warn-tabs --make Build/DistributionUpdate -XLambdaCase -XPackageImports
./Build/DistributionUpdate
.PHONY: git-annex git-union-merge tags
.PHONY: git-annex git-union-merge tags TAGS