Merge branch 'master' of https://github.com/j6t/gitk

* 'master' of https://github.com/j6t/gitk:
  gitk: introduce support for the Meson build system
  gitk: extract script to build executable
  gitk: make the "list references" default window width wider
  gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6
  gitk: Use an external icon file on Windows
  gitk: Unicode file name support
  gitk(Windows): avoid inadvertently calling executables in the worktree

diff --cc gitk-git/Makefile
index e1f0aff4a191d305be6a69c8befe1c2975c1debe,0000000000000000000000000000000000000000..3a3c56c318bad6e30e5f4a14b9fb8fefb621ed96
mode 100644,000000..100644
--- 1/gitk-git/Makefile
--- /dev/null
+++ b/gitk-git/Makefile
@@@ -1,80 -1,0 +1,79 @@@
-       sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
-       chmod +x $@+ && \
-       mv -f $@+ $@
 +# The default target of this Makefile is...
 +all::
 +
 +prefix ?= $(HOME)
 +bindir ?= $(prefix)/bin
 +sharedir ?= $(prefix)/share
 +gitk_libdir   ?= $(sharedir)/gitk/lib
 +msgsdir    ?= $(gitk_libdir)/msgs
 +msgsdir_SQ  = $(subst ','\'',$(msgsdir))
 +
++SHELL_PATH ?= /bin/sh
 +TCL_PATH ?= tclsh
 +TCLTK_PATH ?= wish
 +INSTALL ?= install
 +RM ?= rm -f
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +bindir_SQ = $(subst ','\'',$(bindir))
 +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 +
 +### Detect Tck/Tk interpreter path changes
 +TRACK_TCLTK = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
 +
 +GIT-TCLTK-VARS: FORCE
 +      @VARS='$(TRACK_TCLTK)'; \
 +              if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
 +                      echo 1>&2 "    * new Tcl/Tk interpreter location"; \
 +                      echo "$$VARS" >$@; \
 +              fi
 +
 +## po-file creation rules
 +XGETTEXT   ?= xgettext
 +ifdef NO_MSGFMT
 +      MSGFMT ?= $(TCL_PATH) po/po2msg.sh
 +else
 +      MSGFMT ?= msgfmt
 +        ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0)
 +              MSGFMT := $(TCL_PATH) po/po2msg.sh
 +        endif
 +endif
 +
 +PO_TEMPLATE = po/gitk.pot
 +ALL_POFILES = $(wildcard po/*.po)
 +ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
 +
 +ifndef V
 +      QUIET          = @
 +      QUIET_GEN      = $(QUIET)echo '   ' GEN $@ &&
 +endif
 +
 +all:: gitk-wish $(ALL_MSGFILES)
 +
 +install:: all
 +      $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
 +      $(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 +      $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
 +      $(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
 +
 +uninstall::
 +      $(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
 +      $(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 +
 +clean::
 +      $(RM) gitk-wish po/*.msg GIT-TCLTK-VARS
 +
 +gitk-wish: gitk GIT-TCLTK-VARS
 +      $(QUIET_GEN)$(RM) $@ $@+ && \
++      $(SHELL_PATH) ./generate-tcl.sh "$(TCLTK_PATH_SQ)" "$<" "$@"
 +
 +$(PO_TEMPLATE): gitk
 +      $(XGETTEXT) -kmc -LTcl -o $@ gitk
 +update-po:: $(PO_TEMPLATE)
 +      $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
 +$(ALL_MSGFILES): %.msg : %.po
 +      @echo Generating catalog $@
 +      $(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
 +
 +.PHONY: all install uninstall clean update-po
 +.PHONY: FORCE

diff --cc gitk-git/generate-tcl.sh
index 0000000000000000000000000000000000000000,46bba6d246468af3e6a3ad89d17db64b5f62f35c..46bba6d246468af3e6a3ad89d17db64b5f62f35c
mode 000000,100755..100755
--- /dev/null
--- 2/generate-tcl.sh
+++ b/gitk-git/generate-tcl.sh

diff --cc gitk-git/gitk
Simple merge

diff --cc gitk-git/meson.build
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ca3c0cec5832478594d9e0cc07f5f044e3a920f3
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/gitk-git/meson.build
@@@ -1,0 -1,0 +1,30 @@@
++project('gitk')
++
++shell = find_program('sh')
++wish = find_program('wish')
++
++# Verify that dependencies of "generate-tcl.sh" are satisfied.
++foreach dependency : [ 'chmod', 'mv', 'sed' ]
++  find_program(dependency)
++endforeach
++
++custom_target(
++  command: [
++    shell,
++    meson.current_source_dir() / 'generate-tcl.sh',
++    wish.full_path(),
++    '@INPUT@',
++    '@OUTPUT@',
++  ],
++  input: 'gitk',
++  output: 'gitk',
++  depend_files: [
++    'generate-tcl.sh',
++  ],
++  install: true,
++  install_dir: get_option('bindir'),
++)
++
++if find_program('msgfmt').found()
++  subdir('po')
++endif

diff --cc gitk-git/po/meson.build
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b1ed0198285815c48264b2da677aaf99c51c28bf
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/gitk-git/po/meson.build
@@@ -1,0 -1,0 +1,19 @@@
++import('i18n').gettext('gitk',
++  languages: [
++    'bg',
++    'ca',
++    'de',
++    'es',
++    'fr',
++    'hu',
++    'it',
++    'ja',
++    'pt_br',
++    'pt_pt',
++    'ru',
++    'sv',
++    'vi',
++    'zh_cn',
++  ],
++  install: true,
++)