{"thread":{"id":"32367","subject":"[PATCH v3 3/4] gitk-git/Makefile: track TCLTK_PATH as it used to be tracked","startedAt":"2012-12-17T07:17:14Z","lastAt":"2012-12-18T15:12:04Z","messageCount":3,"participants":["Christian Couder","Junio C Hamano"],"isPatch":true,"patchVersion":3,"patchTotal":4},"messages":[{"id":"205016","messageId":"20121217071716.26209.54407.chriscool@tuxfamily.org","threadId":"32367","inReplyTo":null,"subject":"[PATCH v3 3/4] gitk-git/Makefile: track TCLTK_PATH as it used to be tracked","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2012-12-17T07:17:14Z","receivedAt":"2012-12-17T07:17:14Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"In 62ba514 (Move gitk to its own subdirectory, 2007-11-17) some\ncode used to track TCLTK_PATH was left in the main Makefile instead\nof being moved to the new Makefile that was created in gitk-git/.\n\nThe code left in the main Makefile should have been removed by a\nprevious patch in the same series as this one.\n\nAnd this patch puts some code back to track TCLTK_PATH properly\nwhere it should be, that is in gitk-git/Makefile.\n\nNote that there is already some code to do that in git-gui/Makefile.\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n .gitignore          |  1 -\n gitk-git/.gitignore |  2 ++\n gitk-git/Makefile   | 16 ++++++++++++++--\n 3 files changed, 16 insertions(+), 3 deletions(-)\n create mode 100644 gitk-git/.gitignore\n\ndiff --git a/.gitignore b/.gitignore\nindex 086c5af..56a4b2b 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -171,7 +171,6 @@\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\ndiff --git a/gitk-git/.gitignore b/gitk-git/.gitignore\nnew file mode 100644\nindex 0000000..d7ebcaf\n--- /dev/null\n+++ b/gitk-git/.gitignore\n@@ -0,0 +1,2 @@\n+/GIT-TCLTK-VARS\n+/gitk-wish\ndiff --git a/gitk-git/Makefile b/gitk-git/Makefile\nindex e1b6045..5acdc90 100644\n--- a/gitk-git/Makefile\n+++ b/gitk-git/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\"|' <gitk >$@+ && \\\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.rc1.2.g8740035\n"},{"id":"205028","messageId":"7vvcc1m8t9.fsf@alter.siamese.dyndns.org","threadId":"32367","inReplyTo":"20121217071716.26209.54407.chriscool@tuxfamily.org","subject":"Re: [PATCH v3 3/4] gitk-git/Makefile: track TCLTK_PATH as it used to be tracked","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-12-17T07:33:54Z","receivedAt":"2012-12-17T07:33:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Couder <chriscool@tuxfamily.org> writes:\n\n> In 62ba514 (Move gitk to its own subdirectory, 2007-11-17) some\n> code used to track TCLTK_PATH was left in the main Makefile instead\n> of being moved to the new Makefile that was created in gitk-git/.\n>\n> The code left in the main Makefile should have been removed by a\n> previous patch in the same series as this one.\n>\n> And this patch puts some code back to track TCLTK_PATH properly\n> where it should be, that is in gitk-git/Makefile.\n>\n> Note that there is already some code to do that in git-gui/Makefile.\n>\n> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>\n> ---\n>  .gitignore          |  1 -\n>  gitk-git/.gitignore |  2 ++\n>  gitk-git/Makefile   | 16 ++++++++++++++--\n\nI'll apply the .gitignore part to my tree, but could you split the\nrest out and have Paul apply to his tree at\n\n    git://ozlabs.org/~paulus/gitk.git\n\n>  3 files changed, 16 insertions(+), 3 deletions(-)\n>  create mode 100644 gitk-git/.gitignore\n>\n> diff --git a/.gitignore b/.gitignore\n> index 086c5af..56a4b2b 100644\n> --- a/.gitignore\n> +++ b/.gitignore\n> @@ -171,7 +171,6 @@\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> diff --git a/gitk-git/.gitignore b/gitk-git/.gitignore\n> new file mode 100644\n> index 0000000..d7ebcaf\n> --- /dev/null\n> +++ b/gitk-git/.gitignore\n> @@ -0,0 +1,2 @@\n> +/GIT-TCLTK-VARS\n> +/gitk-wish\n> diff --git a/gitk-git/Makefile b/gitk-git/Makefile\n> index e1b6045..5acdc90 100644\n> --- a/gitk-git/Makefile\n> +++ b/gitk-git/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\"|' <gitk >$@+ && \\\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"},{"id":"205122","messageId":"20121218.161204.548712704436812637.chriscool@tuxfamily.org","threadId":"32367","inReplyTo":"7vvcc1m8t9.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v3 3/4] gitk-git/Makefile: track TCLTK_PATH as it used to be tracked","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2012-12-18T15:12:04Z","receivedAt":"2012-12-18T15:12:04Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"From: Junio C Hamano <gitster@pobox.com>\n>\n>>  .gitignore          |  1 -\n>>  gitk-git/.gitignore |  2 ++\n>>  gitk-git/Makefile   | 16 ++++++++++++++--\n> \n> I'll apply the .gitignore part to my tree, but could you split the\n> rest out and have Paul apply to his tree at\n> \n>     git://ozlabs.org/~paulus/gitk.git\n\nOk, I just sent the rest to Paul and I am going to send you an updated\nseries for you.\n\nRegards,\nChristian.\n"}]}