[PATCH 2/3] gitk: move into "subprojects/"

From: Patrick Steinhardt <ps@pks.im>
Date: Aug 19, 2025, 08:18 UTC
Message-ID: <20250819-b4-pks-meson-tcl-tk-v1-2-6bcaff0bc0a0@pks.im>
In-Reply-To: <20250819-b4-pks-meson-tcl-tk-v1-0-6bcaff0bc0a0@pks.im>

Move the "gitk-git" project into "subprojects/" with the same reasoning as in the preceding commit.

While at it, lose the "-git" suffix. There isn't any (obvious?) reason why that suffix exists as the project is called "gitk", not "gitk-git".

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 Documentation/SubmittingPatches                | 2 +-
 Documentation/gitk.adoc                        | 2 +-
 Makefile                                       | 6 +++---
 subprojects/.gitignore                         | 1 +
 {gitk-git => subprojects/gitk}/.gitignore      | 0
 {gitk-git => subprojects/gitk}/Makefile        | 0
 {gitk-git => subprojects/gitk}/generate-tcl.sh | 0
 {gitk-git => subprojects/gitk}/gitk            | 0
 {gitk-git => subprojects/gitk}/meson.build     | 0
 {gitk-git => subprojects/gitk}/po/.gitignore   | 0
 {gitk-git => subprojects/gitk}/po/bg.po        | 0
 {gitk-git => subprojects/gitk}/po/ca.po        | 0
 {gitk-git => subprojects/gitk}/po/de.po        | 0
 {gitk-git => subprojects/gitk}/po/es.po        | 0
 {gitk-git => subprojects/gitk}/po/fr.po        | 0
 {gitk-git => subprojects/gitk}/po/hu.po        | 0
 {gitk-git => subprojects/gitk}/po/it.po        | 0
 {gitk-git => subprojects/gitk}/po/ja.po        | 0
 {gitk-git => subprojects/gitk}/po/meson.build  | 0
 {gitk-git => subprojects/gitk}/po/po2msg.sh    | 0
 {gitk-git => subprojects/gitk}/po/pt_br.po     | 0
 {gitk-git => subprojects/gitk}/po/pt_pt.po     | 0
 {gitk-git => subprojects/gitk}/po/ru.po        | 0
 {gitk-git => subprojects/gitk}/po/sv.po        | 0
 {gitk-git => subprojects/gitk}/po/ta.po        | 0
 {gitk-git => subprojects/gitk}/po/vi.po        | 0
 {gitk-git => subprojects/gitk}/po/zh_cn.po     | 0
 27 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 3aca70728c7..7492db36d0a 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -705,7 +705,7 @@ repositories.
 
    Contibutions should go via the git mailing list.
 
-- `gitk-git/` comes from the gitk project, maintained by Johannes Sixt:
+- `subprojects/gitk/` comes from the gitk project, maintained by Johannes Sixt:
 
 	https://github.com/j6t/gitk
 
diff --git a/Documentation/gitk.adoc b/Documentation/gitk.adoc
index 58ce40ddb11..284266711f1 100644
--- a/Documentation/gitk.adoc
+++ b/Documentation/gitk.adoc
@@ -170,7 +170,7 @@ tcl/tk.
 versions are distributed as part of the Git suite for the convenience
 of end users.
 
-gitk-git/ comes from Paul Mackerras's gitk project:
+subprojects/gitk/ comes from Paul Mackerras's gitk project:
 
 	git://ozlabs.org/~paulus/gitk
 
diff --git a/Makefile b/Makefile
index 834b79ca7ec..861b0b98594 100644
--- a/Makefile
+++ b/Makefile
@@ -2458,7 +2458,7 @@ endif
 all::
 ifndef NO_TCLTK
 	$(QUIET_SUBDIR0)subprojects/git-gui $(QUIET_SUBDIR1) gitexecdir='$(gitexec_instdir_SQ)' all
-	$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
+	$(QUIET_SUBDIR0)subprojects/gitk $(QUIET_SUBDIR1) all
 endif
 	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
 
@@ -3568,7 +3568,7 @@ ifndef NO_PERL
 	(cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xof -)
 endif
 ifndef NO_TCLTK
-	$(MAKE) -C gitk-git install
+	$(MAKE) -C subprojects/gitk install
 	$(MAKE) -C subprojects/git-gui gitexecdir='$(gitexec_instdir_SQ)' install
 endif
 ifneq (,$X)
@@ -3786,7 +3786,7 @@ endif
 	$(MAKE) -C templates/ clean
 	$(MAKE) -C t/ clean
 ifndef NO_TCLTK
-	$(MAKE) -C gitk-git clean
+	$(MAKE) -C subprojects/gitk clean
 	$(MAKE) -C subprojects/git-gui clean
 endif
 	$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index 96388dbdd22..fd66efe7100 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -1,2 +1,3 @@
 /*/
 !/git-gui/
+!/gitk/
diff --git a/gitk-git/.gitignore b/subprojects/gitk/.gitignore
similarity index 100%
rename from gitk-git/.gitignore
rename to subprojects/gitk/.gitignore
diff --git a/gitk-git/Makefile b/subprojects/gitk/Makefile
similarity index 100%
rename from gitk-git/Makefile
rename to subprojects/gitk/Makefile
diff --git a/gitk-git/generate-tcl.sh b/subprojects/gitk/generate-tcl.sh
similarity index 100%
rename from gitk-git/generate-tcl.sh
rename to subprojects/gitk/generate-tcl.sh
diff --git a/gitk-git/gitk b/subprojects/gitk/gitk
similarity index 100%
rename from gitk-git/gitk
rename to subprojects/gitk/gitk
diff --git a/gitk-git/meson.build b/subprojects/gitk/meson.build
similarity index 100%
rename from gitk-git/meson.build
rename to subprojects/gitk/meson.build
diff --git a/gitk-git/po/.gitignore b/subprojects/gitk/po/.gitignore
similarity index 100%
rename from gitk-git/po/.gitignore
rename to subprojects/gitk/po/.gitignore
diff --git a/gitk-git/po/bg.po b/subprojects/gitk/po/bg.po
similarity index 100%
rename from gitk-git/po/bg.po
rename to subprojects/gitk/po/bg.po
diff --git a/gitk-git/po/ca.po b/subprojects/gitk/po/ca.po
similarity index 100%
rename from gitk-git/po/ca.po
rename to subprojects/gitk/po/ca.po
diff --git a/gitk-git/po/de.po b/subprojects/gitk/po/de.po
similarity index 100%
rename from gitk-git/po/de.po
rename to subprojects/gitk/po/de.po
diff --git a/gitk-git/po/es.po b/subprojects/gitk/po/es.po
similarity index 100%
rename from gitk-git/po/es.po
rename to subprojects/gitk/po/es.po
diff --git a/gitk-git/po/fr.po b/subprojects/gitk/po/fr.po
similarity index 100%
rename from gitk-git/po/fr.po
rename to subprojects/gitk/po/fr.po
diff --git a/gitk-git/po/hu.po b/subprojects/gitk/po/hu.po
similarity index 100%
rename from gitk-git/po/hu.po
rename to subprojects/gitk/po/hu.po
diff --git a/gitk-git/po/it.po b/subprojects/gitk/po/it.po
similarity index 100%
rename from gitk-git/po/it.po
rename to subprojects/gitk/po/it.po
diff --git a/gitk-git/po/ja.po b/subprojects/gitk/po/ja.po
similarity index 100%
rename from gitk-git/po/ja.po
rename to subprojects/gitk/po/ja.po
diff --git a/gitk-git/po/meson.build b/subprojects/gitk/po/meson.build
similarity index 100%
rename from gitk-git/po/meson.build
rename to subprojects/gitk/po/meson.build
diff --git a/gitk-git/po/po2msg.sh b/subprojects/gitk/po/po2msg.sh
similarity index 100%
rename from gitk-git/po/po2msg.sh
rename to subprojects/gitk/po/po2msg.sh
diff --git a/gitk-git/po/pt_br.po b/subprojects/gitk/po/pt_br.po
similarity index 100%
rename from gitk-git/po/pt_br.po
rename to subprojects/gitk/po/pt_br.po
diff --git a/gitk-git/po/pt_pt.po b/subprojects/gitk/po/pt_pt.po
similarity index 100%
rename from gitk-git/po/pt_pt.po
rename to subprojects/gitk/po/pt_pt.po
diff --git a/gitk-git/po/ru.po b/subprojects/gitk/po/ru.po
similarity index 100%
rename from gitk-git/po/ru.po
rename to subprojects/gitk/po/ru.po
diff --git a/gitk-git/po/sv.po b/subprojects/gitk/po/sv.po
similarity index 100%
rename from gitk-git/po/sv.po
rename to subprojects/gitk/po/sv.po
diff --git a/gitk-git/po/ta.po b/subprojects/gitk/po/ta.po
similarity index 100%
rename from gitk-git/po/ta.po
rename to subprojects/gitk/po/ta.po
diff --git a/gitk-git/po/vi.po b/subprojects/gitk/po/vi.po
similarity index 100%
rename from gitk-git/po/vi.po
rename to subprojects/gitk/po/vi.po
diff --git a/gitk-git/po/zh_cn.po b/subprojects/gitk/po/zh_cn.po
similarity index 100%
rename from gitk-git/po/zh_cn.po
rename to subprojects/gitk/po/zh_cn.po

-- 
2.51.0.261.g7ce5a0a67e.dirty