diff options
8 files changed, 91 insertions, 18 deletions
@@ -6,6 +6,9 @@ git-annex (6.20171027) UNRELEASED; urgency=medium * When there are multiple urls for a file, still treat it as being present in the web when some urls don't work, as long as at least one url does work. + * Makefile improvement for sudo make install. + Thanks, Eric Siegerman + * Makefile improvement for BUILDER=stack, use stack to run ghc. -- Joey Hess <id@joeyh.name> Mon, 30 Oct 2017 12:01:45 -0400 @@ -2,7 +2,11 @@ all=git-annex git-annex-shell mans docs # set to "./Setup" if you lack a cabal program. Or can be set to "stack" BUILDER?=cabal +ifeq ($(BUILDER),stack) +GHC?=stack ghc -- +else GHC?=ghc +endif PREFIX?=/usr SHAREDIR?=share @@ -85,28 +89,26 @@ retest: git-annex 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 ./Build/MakeMans +# If ikiwiki is available, build static html docs suitable for being +# shipped in the software package. docs: mans - LC_ALL=C TZ=UTC $(IKIWIKI) doc html -v --wikiname git-annex \ - --plugin=goodstuff \ - --no-usedirs --disable-plugin=openid --plugin=sidebar \ - --plugin theme --set theme=actiontabs --set deterministic=1 \ - --disable-plugin=shortcut --disable-plugin=smiley \ - --plugin=comments --set comments_pagespec="*" \ - --exclude='ikiwiki/*' \ - --exclude='news/.*' --exclude='design/assistant/blog/*' \ - --exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \ - --exclude='users/*' --exclude='devblog/*' --exclude='thanks' + @if [ -n "`which ikiwiki`" ]; then \ + LC_ALL=C TZ=UTC ikiwiki doc html -v --wikiname git-annex \ + --plugin=goodstuff \ + --no-usedirs --disable-plugin=openid --plugin=sidebar \ + --plugin theme --set theme=actiontabs --set deterministic=1 \ + --disable-plugin=shortcut --disable-plugin=smiley \ + --plugin=comments --set comments_pagespec="*" \ + --exclude='ikiwiki/*' \ + --exclude='news/.*' --exclude='design/assistant/blog/*' \ + --exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \ + --exclude='users/*' --exclude='devblog/*' --exclude='thanks'; \ + else \ + echo "** ikiwiki not found, skipping building docs" >&2; \ + fi clean: if [ "$(BUILDER)" != ./Setup ] && [ "$(BUILDER)" != cabal ]; then $(BUILDER) clean; fi diff --git a/doc/bugs/__91__PATCH__93___Build_Build__47__InstallDesktopFile_at___34__make_all__34___time.mdwn b/doc/bugs/__91__PATCH__93___Build_Build__47__InstallDesktopFile_at___34__make_all__34___time.mdwn index 0ee250c6c..ef4e63ffa 100644 --- a/doc/bugs/__91__PATCH__93___Build_Build__47__InstallDesktopFile_at___34__make_all__34___time.mdwn +++ b/doc/bugs/__91__PATCH__93___Build_Build__47__InstallDesktopFile_at___34__make_all__34___time.mdwn @@ -22,3 +22,8 @@ # set to "./Setup" if you lack a cabal program. Or can be set to "stack" BUILDER?=cabal + +> Applied [[done]]. Note that I had to do a considerable amount of editing to +> get that in to a form that `git am` would accept. In the future, +> providing a patch in a form that `git am` can use would be better. +> --[[Joey]] diff --git a/doc/bugs/__91__PATCH__93___Cosmetic__58___clarify_a_warning_message/comment_1_2ec5e2dfe502b3357f7cb224bb28219a._comment b/doc/bugs/__91__PATCH__93___Cosmetic__58___clarify_a_warning_message/comment_1_2ec5e2dfe502b3357f7cb224bb28219a._comment new file mode 100644 index 000000000..fba3a63f7 --- /dev/null +++ b/doc/bugs/__91__PATCH__93___Cosmetic__58___clarify_a_warning_message/comment_1_2ec5e2dfe502b3357f7cb224bb28219a._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-11-07T20:39:22Z" + content=""" +Perhaps I'm blind as the one who wrote it, but I don't see anything +unclear about the message. +"""]] diff --git a/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run.mdwn b/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run.mdwn index 02fac5a6a..f2cea95f5 100644 --- a/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run.mdwn +++ b/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run.mdwn @@ -40,3 +40,5 @@ No intended functional change; only what *make* prints should be different. --plugin=goodstuff \ --no-usedirs --disable-plugin=openid --plugin=sidebar \ --plugin theme --set theme=actiontabs --set deterministic=1 \ + +> [[done]] --[[Joey]] diff --git a/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run/comment_1_b8304ff302805f7bec977002d733436a._comment b/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run/comment_1_b8304ff302805f7bec977002d733436a._comment new file mode 100644 index 000000000..31a670086 --- /dev/null +++ b/doc/bugs/__91__PATCH__93___Cosmetic__58___only_print_ikiwiki_command_if_it__39__s_run/comment_1_b8304ff302805f7bec977002d733436a._comment @@ -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. +"""]] diff --git a/doc/git-annex-adjust/comment_2_383af8e1e26e4119671437aace0a58f5._comment b/doc/git-annex-adjust/comment_2_383af8e1e26e4119671437aace0a58f5._comment new file mode 100644 index 000000000..a0a270095 --- /dev/null +++ b/doc/git-annex-adjust/comment_2_383af8e1e26e4119671437aace0a58f5._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2017-11-07T20:18:19Z" + content=""" +`git annex fix` fixes up the symlinks before they're committed. +It's run by the pre-commit hook, so even when annexed files are +manually moved around, the symlinks that get committed are always +right. + +So then, if the symlinks committed are always right, +how would `git annex adjust --fix` be useful? Well, +there are ways to check out git repositories that make +the .git directory not be in the usual place. For example, +when using submodules, git puts that directory in a different place. +And then the committed symlinks won't point to .git. So, +`git annex adjust --fix` is useful as a way to adjust the symlinks +locally, without committing any changes to them, in that kind of +situation. +"""]] diff --git a/doc/install/fromsource/comment_68_059f1cd929228e131bf88d80aca0b573._comment b/doc/install/fromsource/comment_68_059f1cd929228e131bf88d80aca0b573._comment new file mode 100644 index 000000000..e1f96f95e --- /dev/null +++ b/doc/install/fromsource/comment_68_059f1cd929228e131bf88d80aca0b573._comment @@ -0,0 +1,24 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 68""" + date="2017-11-07T20:42:14Z" + content=""" +@erics, thanks for the useful feedback about stack. I've applied your +patch to avoid the Build/InstallDesktopFile problem. And, I made it +automatically set GHC when BUILDER=stack. + +Using the Makefile is documented, up in the "building from source on +Debian" section. But there's a set of users who want to use stack, +and don't want to mess around with Makefiles (including users on Windows +without a "make"), and that's who the stack instructions are kind of +targeted at. It's an unfortunate problem with stack that it doesn't provide +any way to make the git-annex-shell symlink. + +I am doubtful that --allow-different-user is a good idea. I sometimes +use stack to build git-annex for testing purposes, but I have never +built it with stack and installed that with `sudo make install`. +And it may well be that there's not a reasonable way to make that work; +and the install target is mostly intended for use by distributions that +are creating a package of git-annex, who probably set PREFIX and don't run +it as root. +"""]] |