{"thread":{"id":"32706","subject":"[PATCH] Ignore gitk-wish buildproduct","startedAt":"2013-01-23T18:55:40Z","lastAt":"2013-01-23T20:00:35Z","messageCount":3,"participants":["Lars Hjemli","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"207618","messageId":"1358967340-3642-1-git-send-email-hjemli@gmail.com","threadId":"32706","inReplyTo":null,"subject":"[PATCH] Ignore gitk-wish buildproduct","fromName":"Lars Hjemli","fromEmail":"hjemli@gmail.com","sentAt":"2013-01-23T18:55:40Z","receivedAt":"2013-01-23T18:55:40Z","isPatch":true,"sender":{"key":"hjemli@gmail.com","avatar":null},"body":"After running `make` on latest master, gitk-git/gitk-wish shows up as\nuntracked. This fixes it.\n\nSigned-off-by: Lars Hjemli \n\n---\n .gitignore | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/.gitignore b/.gitignore\nindex aa258a6..63d4904 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -171,6 +171,7 @@\n /git-whatchanged\n /git-write-tree\n /git-core-*/?*\n+/gitk-git/gitk-wish\n /gitweb/GITWEB-BUILD-OPTIONS\n /gitweb/gitweb.cgi\n /gitweb/static/gitweb.js\n-- \n1.8.1.1.296.g725455c\n"},{"id":"207623","messageId":"7vip6nhdry.fsf@alter.siamese.dyndns.org","threadId":"32706","inReplyTo":"1358967340-3642-1-git-send-email-hjemli@gmail.com","subject":"Re: [PATCH] Ignore gitk-wish buildproduct","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-23T19:58:57Z","receivedAt":"2013-01-23T19:58:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lars Hjemli writes:\n\n> After running `make` on latest master, gitk-git/gitk-wish shows up as\n> untracked. This fixes it.\n>\n> Signed-off-by: Lars Hjemli \n\nThe removal was very much deliberate [*1*]; Christian was going to\nsend a corresponding updates to gitk maintainer [*2*, *3*] but I\nguess we haven't sync'ed up yet.\n\nPaul, I'll resend another copy of [*3*] to you as a follow-up;\nplease apply, thanks.\n\n\n[References]\n\n*1* http://thread.gmane.org/gmane.comp.version-control.git/211773\n*2* http://thread.gmane.org/gmane.comp.version-control.git/211641/focus=211751\n*3* http://thread.gmane.org/gmane.comp.version-control.git/213067\n\n>\n> ---\n> .gitignore | 1 +\n> 1 file changed, 1 insertion(+)\n>\n> diff --git a/.gitignore b/.gitignore\n> index aa258a6..63d4904 100644\n> --- a/.gitignore\n> +++ b/.gitignore\n> @@ -171,6 +171,7 @@\n> /git-whatchanged\n> /git-write-tree\n> /git-core-*/?*\n> +/gitk-git/gitk-wish\n> /gitweb/GITWEB-BUILD-OPTIONS\n> /gitweb/gitweb.cgi\n> /gitweb/static/gitweb.js\n"},{"id":"207627","messageId":"7vehhbhdp8.fsf@alter.siamese.dyndns.org","threadId":"32706","inReplyTo":"7vip6nhdry.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Ignore gitk-wish buildproduct","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-23T20:00:35Z","receivedAt":"2013-01-23T20:00:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"From: Christian Couder \n\ngitk, when bound into the git.git project tree, used to live at the\nroot level, but in 62ba514 (Move gitk to its own subdirectory,\n2007-11-17) it was moved to a subdirectory. The code used to track\nchanges to TCLTK_PATH (which should cause gitk to be rebuilt to\npoint at the new interpreter) was left in the main Makefile instead\nof being moved to the new Makefile that was created for the gitk\nproject.\n\nAlso add .gitignore file to list build artifacts for the gitk\nproject.\n\nSigned-off-by: Christian Couder \nSigned-off-by: Junio C Hamano \n---\n\n Paul, this is relative to the tip of your tree, 386befb (gitk:\n Display important heads even when there are many, 2013-01-02).\n Could you consider applying it?\n\n Also I notice that you have many patches I still do not have\n there, and I'd appreciate a \"Go ahead and pull from me!\".\n\n Thanks.\n\n .gitignore | 2 ++\n Makefile | 16 ++++++++++++++--\n 2 files changed, 16 insertions(+), 2 deletions(-)\n create mode 100644 .gitignore\n\ndiff --git a/.gitignore b/.gitignore\nnew file mode 100644\nindex 0000000..d7ebcaf\n--- /dev/null\n+++ b/.gitignore\n@@ -0,0 +1,2 @@\n+/GIT-TCLTK-VARS\n+/gitk-wish\ndiff --git a/Makefile b/Makefile\nindex e1b6045..5acdc90 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -17,6 +17,16 @@ DESTDIR_SQ = $(subst ','\\'',$(DESTDIR))\n bindir_SQ = $(subst ','\\'',$(bindir))\n TCLTK_PATH_SQ = $(subst ','\\'',$(TCLTK_PATH))\n \n+### Detect Tck/Tk interpreter path changes\n+TRACK_TCLTK = $(subst ','\\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')\n+\n+GIT-TCLTK-VARS: FORCE\n+\t@VARS='$(TRACK_TCLTK)'; \\\n+\t\tif test x\"$$VARS\" != x\"`cat $@ 2>/dev/null`\" ; then \\\n+\t\t\techo 1>&2 \" * new Tcl/Tk interpreter location\"; \\\n+\t\t\techo \"$$VARS\" >$@; \\\n+\t\tfi\n+\n ## po-file creation rules\n XGETTEXT ?= xgettext\n ifdef NO_MSGFMT\n@@ -49,9 +59,9 @@ uninstall::\n \t$(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk\n \n clean::\n-\t$(RM) gitk-wish po/*.msg\n+\t$(RM) gitk-wish po/*.msg GIT-TCLTK-VARS\n \n-gitk-wish: gitk\n+gitk-wish: gitk GIT-TCLTK-VARS\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n \tsed -e '1,3s|^exec .* \"$$0\"|exec $(subst |,'\\|',$(TCLTK_PATH_SQ)) \"$$0\"|' $@+ && \\\n \tchmod +x $@+ && \\\n@@ -65,3 +75,5 @@ $(ALL_MSGFILES): %.msg : %.po\n \t@echo Generating catalog $@\n \t$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)\n \n+.PHONY: all install uninstall clean update-po\n+.PHONY: FORCE\n-- \n1.8.1.336.g866ceff\n"}]}