{"thread":{"id":"49502","subject":"[PATCH 1/1] subtree: add build targets 'man' and 'html'","startedAt":"2018-10-07T07:39:24Z","lastAt":"2018-10-18T08:05:11Z","messageCount":12,"participants":["Christian Hesse","Junio C Hamano","Johannes Schindelin","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"359788","messageId":"20181007073036.30643-1-list@eworm.de","threadId":"49502","inReplyTo":null,"subject":"[PATCH 1/1] subtree: add build targets 'man' and 'html'","fromName":"Christian Hesse","fromEmail":"list@eworm.de","sentAt":"2018-10-07T07:30:36Z","receivedAt":"2018-10-07T07:39:24Z","isPatch":true,"sender":{"key":"list@eworm.de","avatar":"https://gravatar.com/avatar/ec9a78d63ae8bf8efdc06867449c0a3e763066c462c2c2f9f103ac4675109e14?d=mp&s=160"},"body":"From: Christian Hesse \n\nWe have targets 'install-man' and 'install-html', let's add build\ntargets as well.\n\nSigned-off-by: Christian Hesse \n---\n contrib/subtree/Makefile | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\nindex 5c6cc4ab2c..6906aae441 100644\n--- a/contrib/subtree/Makefile\n+++ b/contrib/subtree/Makefile\n@@ -59,6 +59,10 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)\n \n doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML)\n \n+man: $(GIT_SUBTREE_DOC)\n+\n+html: $(GIT_SUBTREE_HTML)\n+\n install: $(GIT_SUBTREE)\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)\n \t$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir)\n"},{"id":"359976","messageId":"xmqqmurmmt9j.fsf@gitster-ct.c.googlers.com","threadId":"49502","inReplyTo":"20181007073036.30643-1-list@eworm.de","subject":"Re: [PATCH 1/1] subtree: add build targets 'man' and 'html'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-10T02:26:32Z","receivedAt":"2018-10-10T02:26:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Hesse writes:\n\n> From: Christian Hesse \n>\n> We have targets 'install-man' and 'install-html', let's add build\n> targets as well.\n> ...\n> +man: $(GIT_SUBTREE_DOC)\n> +\n> +html: $(GIT_SUBTREE_HTML)\n> +\n\nAs 'contrib' material without real maintenance, I do not care too\ndeeply, but shouldn't this change be more like this to avoid\nduplicating the list of targets?\n\n\ndiff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\nindex 5c6cc4ab2c..4a10a020a0 100644\n--- a/contrib/subtree/Makefile\n+++ b/contrib/subtree/Makefile\n@@ -59,17 +59,21 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)\n \n doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML)\n \n+man: $(GIT_SUBTREE_DOC)\n+\n+html: $(GIT_SUBTREE_HTML)\n+\n install: $(GIT_SUBTREE)\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)\n \t$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir)\n \n install-doc: install-man install-html\n \n-install-man: $(GIT_SUBTREE_DOC)\n+install-man: man\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)\n \t$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)\n \n-install-html: $(GIT_SUBTREE_HTML)\n+install-html: html\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)\n \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n \n@@ -94,4 +98,4 @@ clean:\n \t$(RM) $(GIT_SUBTREE)\n \t$(RM) *.xml *.html *.1\n \n-.PHONY: FORCE\n+.PHONY: FORCE man html install-man install-html\n\n"},{"id":"360281","messageId":"nycvar.QRO.7.76.6.1810121006180.45@tvgsbejvaqbjf.bet","threadId":"49502","inReplyTo":"xmqqmurmmt9j.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] subtree: add build targets 'man' and 'html'","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-10-12T08:08:12Z","receivedAt":"2018-10-12T08:08:19Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\n\nOn Wed, 10 Oct 2018, Junio C Hamano wrote:\n\n> Christian Hesse writes:\n> \n> > From: Christian Hesse \n> >\n> > We have targets 'install-man' and 'install-html', let's add build\n> > targets as well.\n> > ...\n> > +man: $(GIT_SUBTREE_DOC)\n> > +\n> > +html: $(GIT_SUBTREE_HTML)\n> > +\n> \n> As 'contrib' material without real maintenance, I do not care too\n> deeply, but shouldn't this change be more like this to avoid\n> duplicating the list of targets?\n\nÆvar mentioned that he'd like this to graduate from contrib into core, and\nI had briefly looked at making subtree a built-in to that end. IOW please\ndo not get too used to subtree being in contrib.\n\nCiao,\nDscho\n\n> \n> \n> diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\n> index 5c6cc4ab2c..4a10a020a0 100644\n> --- a/contrib/subtree/Makefile\n> +++ b/contrib/subtree/Makefile\n> @@ -59,17 +59,21 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)\n> \n> doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML)\n> \n> +man: $(GIT_SUBTREE_DOC)\n> +\n> +html: $(GIT_SUBTREE_HTML)\n> +\n> install: $(GIT_SUBTREE)\n> \t$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)\n> \t$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir)\n> \n> install-doc: install-man install-html\n> \n> -install-man: $(GIT_SUBTREE_DOC)\n> +install-man: man\n> \t$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)\n> \t$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)\n> \n> -install-html: $(GIT_SUBTREE_HTML)\n> +install-html: html\n> \t$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)\n> \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n> \n> @@ -94,4 +98,4 @@ clean:\n> \t$(RM) $(GIT_SUBTREE)\n> \t$(RM) *.xml *.html *.1\n> \n> -.PHONY: FORCE\n> +.PHONY: FORCE man html install-man install-html\n> \n> "},{"id":"360555","messageId":"20181015231501.5a7524b0@leda","threadId":"49502","inReplyTo":"xmqqmurmmt9j.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] subtree: add build targets 'man' and 'html'","fromName":"Christian Hesse","fromEmail":"list@eworm.de","sentAt":"2018-10-15T21:15:01Z","receivedAt":"2018-10-15T21:24:44Z","isPatch":true,"sender":{"key":"list@eworm.de","avatar":"https://gravatar.com/avatar/ec9a78d63ae8bf8efdc06867449c0a3e763066c462c2c2f9f103ac4675109e14?d=mp&s=160"},"body":"Junio C Hamano on Wed, 2018/10/10 11:26:\n> As 'contrib' material without real maintenance, I do not care too\n> deeply, but shouldn't this change be more like this to avoid\n> duplicating the list of targets?\n\nProbably, yes.\nDo you want to add this yourself or do you want me to send an updated patch\nor one on top of the last change?\n-- \nmain(a){char*c=/* Schoene Gruesse */\"B?IJj;MEH\"\n\"CX:;\",b;for(a/* Best regards my address: */=0;b=c[a++];)\nputchar(b-1/(/* Chris cc -ox -xc - && ./x */b/42*2-3)*42);}\n"},{"id":"360566","messageId":"xmqq1s8q4pen.fsf@gitster-ct.c.googlers.com","threadId":"49502","inReplyTo":"20181015231501.5a7524b0@leda","subject":"Re: [PATCH 1/1] subtree: add build targets 'man' and 'html'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-16T02:05:20Z","receivedAt":"2018-10-16T02:05:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Hesse writes:\n\n> Junio C Hamano on Wed, 2018/10/10 11:26:\n>> As 'contrib' material without real maintenance, I do not care too\n>> deeply, but shouldn't this change be more like this to avoid\n>> duplicating the list of targets?\n>\n> Probably, yes.\n> Do you want to add this yourself or do you want me to send an updated patch\n> or one on top of the last change?\n\nIn principle either is fine but keep in mind that I'll likely forget\nif you leave it up to me.\n"},{"id":"360580","messageId":"xmqq8t2y1o4y.fsf@gitster-ct.c.googlers.com","threadId":"49502","inReplyTo":"xmqq1s8q4pen.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] subtree: add build targets 'man' and 'html'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-16T05:01:01Z","receivedAt":"2018-10-16T05:01:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Christian Hesse writes:\n>\n>> Junio C Hamano on Wed, 2018/10/10 11:26:\n>>> As 'contrib' material without real maintenance, I do not care too\n>>> deeply, but shouldn't this change be more like this to avoid\n>>> duplicating the list of targets?\n>>\n>> Probably, yes.\n>> Do you want to add this yourself or do you want me to send an updated patch\n>> or one on top of the last change?\n>\n> In principle either is fine but keep in mind that I'll likely forget\n> if you leave it up to me.\n\nActully, I take it back. The original patch is already in 'next',\nso an incremental on top of what you sent is the only valid\nimprovement ;-)\n\n"},{"id":"360595","messageId":"20181016075624.30176-1-list@eworm.de","threadId":"49502","inReplyTo":"xmqq8t2y1o4y.fsf@gitster-ct.c.googlers.com","subject":"[PATCH 1/1] subtree: make install targets depend on build targets","fromName":"Christian Hesse","fromEmail":"list@eworm.de","sentAt":"2018-10-16T07:56:24Z","receivedAt":"2018-10-16T07:57:09Z","isPatch":true,"sender":{"key":"list@eworm.de","avatar":"https://gravatar.com/avatar/ec9a78d63ae8bf8efdc06867449c0a3e763066c462c2c2f9f103ac4675109e14?d=mp&s=160"},"body":"From: Christian Hesse \n\nNow that we have build targets let the install targets depend on them.\nAlso make the targets phony.\n\nSigned-off-by: Christian Hesse \n---\n contrib/subtree/Makefile | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\nindex 6906aae441..4a10a020a0 100644\n--- a/contrib/subtree/Makefile\n+++ b/contrib/subtree/Makefile\n@@ -69,11 +69,11 @@ install: $(GIT_SUBTREE)\n \n install-doc: install-man install-html\n \n-install-man: $(GIT_SUBTREE_DOC)\n+install-man: man\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)\n \t$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)\n \n-install-html: $(GIT_SUBTREE_HTML)\n+install-html: html\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)\n \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n \n@@ -98,4 +98,4 @@ clean:\n \t$(RM) $(GIT_SUBTREE)\n \t$(RM) *.xml *.html *.1\n \n-.PHONY: FORCE\n+.PHONY: FORCE man html install-man install-html\n"},{"id":"360597","messageId":"xmqqy3ayxqwb.fsf@gitster-ct.c.googlers.com","threadId":"49502","inReplyTo":"20181016075624.30176-1-list@eworm.de","subject":"Re: [PATCH 1/1] subtree: make install targets depend on build targets","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-16T08:00:20Z","receivedAt":"2018-10-16T08:00:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Hesse writes:\n\n> From: Christian Hesse \n>\n> Now that we have build targets let the install targets depend on them.\n> Also make the targets phony.\n>\n> Signed-off-by: Christian Hesse \n> ---\n> contrib/subtree/Makefile | 6 +++---\n> 1 file changed, 3 insertions(+), 3 deletions(-)\n\nThanks, will queue.\n\n> diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\n> index 6906aae441..4a10a020a0 100644\n> --- a/contrib/subtree/Makefile\n> +++ b/contrib/subtree/Makefile\n> @@ -69,11 +69,11 @@ install: $(GIT_SUBTREE)\n> \n> install-doc: install-man install-html\n> \n> -install-man: $(GIT_SUBTREE_DOC)\n> +install-man: man\n> \t$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)\n> \t$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)\n> \n> -install-html: $(GIT_SUBTREE_HTML)\n> +install-html: html\n> \t$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)\n> \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n> \n> @@ -98,4 +98,4 @@ clean:\n> \t$(RM) $(GIT_SUBTREE)\n> \t$(RM) *.xml *.html *.1\n> \n> -.PHONY: FORCE\n> +.PHONY: FORCE man html install-man install-html\n"},{"id":"360725","messageId":"20181017024503.GA117170@aiede.svl.corp.google.com","threadId":"49502","inReplyTo":"20181016075624.30176-1-list@eworm.de","subject":"Re: [PATCH 1/1] subtree: make install targets depend on build targets","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2018-10-17T02:45:03Z","receivedAt":"2018-10-17T02:45:09Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nChristian Hesse wrote:\n\n> --- a/contrib/subtree/Makefile\n> +++ b/contrib/subtree/Makefile\n> @@ -69,11 +69,11 @@ install: $(GIT_SUBTREE)\n[...]\n> -install-html: $(GIT_SUBTREE_HTML)\n> +install-html: html\n\nThis broke the build for me:\n\n make[2]: Entering directory '/build/git-2.19.1+next.20181016/contrib/subtree'\n install -m 644 html /build/git-2.19.1+next.20181016/debian/tmp/usr/share/doc/git/html\n install: cannot stat 'html': No such file or directory\n make[2]: *** [Makefile:78: install-html] Error 1\n\nThe rule says\n\n install-html: html\n\t$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)\n\t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n\nand $^ substitutes to \"html\" after this change. How was this patch\ntested?\n\nThanks,\nJonathan\n"},{"id":"360805","messageId":"xmqqk1mgvwks.fsf@gitster-ct.c.googlers.com","threadId":"49502","inReplyTo":"20181017024503.GA117170@aiede.svl.corp.google.com","subject":"Re: [PATCH 1/1] subtree: make install targets depend on build targets","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-18T02:05:07Z","receivedAt":"2018-10-18T02:05:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n>> -install-html: $(GIT_SUBTREE_HTML)\n>> +install-html: html\n>\n> This broke the build for me:\n>\n> make[2]: Entering directory '/build/git-2.19.1+next.20181016/contrib/subtree'\n> install -m 644 html /build/git-2.19.1+next.20181016/debian/tmp/usr/share/doc/git/html\n> install: cannot stat 'html': No such file or directory\n> make[2]: *** [Makefile:78: install-html] Error 1\n>\n> The rule says\n>\n> install-html: html\n> \t$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)\n> \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n>\n> and $^ substitutes to \"html\" after this change. How was this patch\n> tested?\n\nGah, that was silly of me.\n"},{"id":"360806","messageId":"xmqqftx4vwe5.fsf@gitster-ct.c.googlers.com","threadId":"49502","inReplyTo":"20181017024503.GA117170@aiede.svl.corp.google.com","subject":"Re: [PATCH 1/1] subtree: make install targets depend on build targets","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-18T02:09:06Z","receivedAt":"2018-10-18T02:09:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> The rule says\n>\n> install-html: html\n> \t$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)\n> \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n>\n> and $^ substitutes to \"html\" after this change.\n\nSorry about that.\n\nFrom: Junio C Hamano \nDate: Thu, 18 Oct 2018 11:07:17 +0900\nSubject: [PATCH] Revert \"subtree: make install targets depend on build targets\"\n\nThis reverts commit 744f7c4c314dc0e7816ac05520e8358c8318187a.\n\nThese targets do depend on the fact that each prereq is explicitly\nlisted via their use of $^, which I failed to notice, and broke the\nbuild.\n---\n contrib/subtree/Makefile | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\nindex 4a10a020a0..6906aae441 100644\n--- a/contrib/subtree/Makefile\n+++ b/contrib/subtree/Makefile\n@@ -69,11 +69,11 @@ install: $(GIT_SUBTREE)\n \n install-doc: install-man install-html\n \n-install-man: man\n+install-man: $(GIT_SUBTREE_DOC)\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)\n \t$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)\n \n-install-html: html\n+install-html: $(GIT_SUBTREE_HTML)\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)\n \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n \n@@ -98,4 +98,4 @@ clean:\n \t$(RM) $(GIT_SUBTREE)\n \t$(RM) *.xml *.html *.1\n \n-.PHONY: FORCE man html install-man install-html\n+.PHONY: FORCE\n-- \n2.19.1-450-ga4b8ab5363\n\n\n"},{"id":"360830","messageId":"20181018100504.053e4827@leda","threadId":"49502","inReplyTo":"xmqqftx4vwe5.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] subtree: make install targets depend on build targets","fromName":"Christian Hesse","fromEmail":"list@eworm.de","sentAt":"2018-10-18T08:05:04Z","receivedAt":"2018-10-18T08:05:11Z","isPatch":true,"sender":{"key":"list@eworm.de","avatar":"https://gravatar.com/avatar/ec9a78d63ae8bf8efdc06867449c0a3e763066c462c2c2f9f103ac4675109e14?d=mp&s=160"},"body":"Junio C Hamano on Thu, 2018/10/18 11:09:\n> Jonathan Nieder writes:\n> \n> > The rule says\n> >\n> > install-html: html\n> > \t$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)\n> > \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n> >\n> > and $^ substitutes to \"html\" after this change. \n> \n> Sorry about that.\n> \n> From: Junio C Hamano \n> Date: Thu, 18 Oct 2018 11:07:17 +0900\n> Subject: [PATCH] Revert \"subtree: make install targets depend on build\n> targets\"\n> \n> This reverts commit 744f7c4c314dc0e7816ac05520e8358c8318187a.\n> \n> These targets do depend on the fact that each prereq is explicitly\n> listed via their use of $^, which I failed to notice, and broke the\n> build.\n>\n> [...]\n>\n> @@ -98,4 +98,4 @@ clean:\n> \t$(RM) $(GIT_SUBTREE)\n> \t$(RM) *.xml *.html *.1\n> \n> -.PHONY: FORCE man html install-man install-html\n> +.PHONY: FORCE\n\nWe could keep the phony part at least...\n\n-- \nmain(a){char*c=/* Schoene Gruesse */\"B?IJj;MEH\"\n\"CX:;\",b;for(a/* Best regards my address: */=0;b=c[a++];)\nputchar(b-1/(/* Chris cc -ox -xc - && ./x */b/42*2-3)*42);}\n"}]}