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

switch from hothasktags to hasktags

Browse source 
hothasktags was removed from Debian. And in the meantime hasktags
improved so it works well in the source tree.

Also make dev update tags.

Sponsored-by: Jack Hill on Patreon
This commit is contained in:
Joey Hess 2022-03-24 13:07:49 -04:00
parent 5a723f4644
commit fdcb14d475
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Makefile
View file

@ -52,7 +52,7 @@ dev:
--enable-executable-dynamic --enable-profiling --enable-executable-dynamic --enable-profiling
mkdir -p tmp mkdir -p tmp
touch tmp/configure-stamp touch tmp/configure-stamp
$(MAKE) git-annex $(MAKE) git-annex tags
git-annex: tmp/configure-stamp git-annex: tmp/configure-stamp
$(BUILDER) build $(BUILDERCOMMONOPTIONS) $(BUILDEROPTIONS) $(BUILDER) build $(BUILDERCOMMONOPTIONS) $(BUILDEROPTIONS)
@ -110,19 +110,8 @@ test: git-annex git-annex-shell
retest: git-annex retest: git-annex
./git-annex test --rerun-update --rerun-filter failures ./git-annex test --rerun-update --rerun-filter failures
# tags file for vim
tags: tags:
@$(MAKE) --quiet hothasktags HOTHASKTAGS_OPT= TAGFILE=tags hasktags . -c || true
# 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 mans: Build/MakeMans
./Build/MakeMans ./Build/MakeMans
@ -148,7 +137,7 @@ docs: mans
clean: clean:
if [ "$(BUILDER)" != ./Setup ] && [ "$(BUILDER)" != cabal ]; then $(BUILDER) clean; fi if [ "$(BUILDER)" != ./Setup ] && [ "$(BUILDER)" != cabal ]; then $(BUILDER) clean; fi
rm -rf tmp dist dist-newstyle git-annex $(mans) configure *.tix .hpc \ rm -rf tmp dist dist-newstyle git-annex $(mans) configure *.tix .hpc \
doc/.ikiwiki html dist tags TAGS Build/SysConfig Build/Version \ doc/.ikiwiki html dist tags Build/SysConfig Build/Version \
Setup Build/InstallDesktopFile Build/Standalone \ Setup Build/InstallDesktopFile Build/Standalone \
Build/DistributionUpdate Build/BuildVersion Build/MakeMans \ Build/DistributionUpdate Build/BuildVersion Build/MakeMans \
git-annex-shell git-union-merge .tasty-rerun-log git-annex-shell git-union-merge .tasty-rerun-log