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

simplify ikiwiki docs build testing and output

Browse source
This commit is contained in:
Joey Hess 2017-11-07 16:36:01 -04:00
parent f88ff8d460
commit 193612c97a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile
View file

@ -1,4 +1,4 @@
all=git-annex git-annex-shell mans docs Build/InstallDesktopFile all=git-annex git-annex-shell mans docs
# set to "./Setup" if you lack a cabal program. Or can be set to "stack" # set to "./Setup" if you lack a cabal program. Or can be set to "stack"
BUILDER?=cabal BUILDER?=cabal
@ -85,19 +85,14 @@ retest: git-annex
tags: tags:
(for f in $$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$'); do hothasktags -c --cpp -c -traditional -c --include=dist/build/autogen/cabal_macros.h $$f; done) 2>/dev/null | sort > tags (for f in $$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$'); do hothasktags -c --cpp -c -traditional -c --include=dist/build/autogen/cabal_macros.h $$f; done) 2>/dev/null | sort > tags
# If ikiwiki is available, build static html docs suitable for being
# shipped in the software package.
ifeq ($(shell which ikiwiki),)
IKIWIKI=echo "** ikiwiki not found, skipping building docs" >&2; true
else
IKIWIKI=ikiwiki
endif
mans: Build/MakeMans mans: Build/MakeMans
./Build/MakeMans ./Build/MakeMans
# If ikiwiki is available, build static html docs suitable for being
# shipped in the software package.
docs: mans docs: mans
LC_ALL=C TZ=UTC $(IKIWIKI) doc html -v --wikiname git-annex \ @if [ -n "`which ikiwiki`" ]; then \
LC_ALL=C TZ=UTC ikiwiki doc html -v --wikiname git-annex \
--plugin=goodstuff \ --plugin=goodstuff \
--no-usedirs --disable-plugin=openid --plugin=sidebar \ --no-usedirs --disable-plugin=openid --plugin=sidebar \
--plugin theme --set theme=actiontabs --set deterministic=1 \ --plugin theme --set theme=actiontabs --set deterministic=1 \
@ -106,7 +101,10 @@ docs: mans
--exclude='ikiwiki/*' \ --exclude='ikiwiki/*' \
--exclude='news/.*' --exclude='design/assistant/blog/*' \ --exclude='news/.*' --exclude='design/assistant/blog/*' \
--exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \ --exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \
--exclude='users/*' --exclude='devblog/*' --exclude='thanks' --exclude='users/*' --exclude='devblog/*' --exclude='thanks'; \
else \
echo "** ikiwiki not found, skipping building docs" >&2; \
fi
clean: clean:
if [ "$(BUILDER)" != ./Setup ] && [ "$(BUILDER)" != cabal ]; then $(BUILDER) clean; fi if [ "$(BUILDER)" != ./Setup ] && [ "$(BUILDER)" != cabal ]; then $(BUILDER) clean; fi

2
doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run.mdwn
View file

@ -40,3 +40,5 @@ No intended functional change; only what *make* prints should be different.
--plugin=goodstuff \ --plugin=goodstuff \
--no-usedirs --disable-plugin=openid --plugin=sidebar \ --no-usedirs --disable-plugin=openid --plugin=sidebar \
--plugin theme --set theme=actiontabs --set deterministic=1 \ --plugin theme --set theme=actiontabs --set deterministic=1 \
> [[done]] --[[Joey]]

9
doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run/comment_1_b8304ff302805f7bec977002d733436a._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2017-11-07T20:31:00Z"
content="""
I don't like this amount of complication for a build system cosmetic
improvement. Instead, I have added a "@" to the objectionably long
command line in the Makefile.
"""]]