git-gui: add mingw specific startup wrapper
The wrapper adds the directory it is installed in to PATH. This is required for the git commands implemented in shell. git-gui fails to launch them if PATH is not modified. The wrapper script also accepts an optional command line switch '--working-dir <dir>' and changes to <dir> before launching the actual git-gui. This is required to implement the "Git Gui Here" Explorer shell extension. As a last step the original git-gui script is launched, which is expected to be located in the same directory under the name git-gui.tcl. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Steffen Prohaska committed
Oct 10, 2007 at 08:58 UTC
99fe594d9677d55d773db3ab180310a3d3bf090b
2 files changed
+36
Makefile
+20
@@ -128,6 +128,7 @@ ifeq ($(uname_S),Darwin)
128
endif
129
ifneq (,$(findstring MINGW,$(uname_S)))
130
NO_MSGFMT=1
131
+ GITGUI_WINDOWS_WRAPPER := YesPlease
132
endif
133
134
ifdef GITGUI_MACOSXAPP
@@ -168,6 +169,13 @@ Git\ Gui.app: GIT-VERSION-FILE GIT-GUI-VARS \
169
mv '$@'+ '$@'
170
endif
171
172
+ifdef GITGUI_WINDOWS_WRAPPER
173
+GITGUI_MAIN := git-gui.tcl
174
+
175
+git-gui: windows/git-gui.sh
176
+ cp $< $@
177
+endif
178
+
179
$(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS
180
$(QUIET_GEN)rm -f $@ $@+ && \
181
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
@@ -233,12 +241,18 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
241
ifdef GITGUI_MACOSXAPP
242
all:: git-gui Git\ Gui.app
243
endif
244
+ifdef GITGUI_WINDOWS_WRAPPER
245
+all:: git-gui
246
+endif
247
all:: $(GITGUI_MAIN) lib/tclIndex $(ALL_MSGFILES)
248
249
install: all
250
$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)
251
$(QUIET)$(INSTALL_X0)git-gui $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
252
$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(INSTALL_L0)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L1)'$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' $(INSTALL_L2)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L3) &&) true
253
+ifdef GITGUI_WINDOWS_WRAPPER
254
+ $(QUIET)$(INSTALL_R0)git-gui.tcl $(INSTALL_R1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
255
+endif
256
$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
257
$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
258
$(QUIET)$(INSTALL_R0)lib/git-gui.ico $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
@@ -254,6 +268,9 @@ uninstall:
268
$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
269
$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui $(REMOVE_F1)
270
$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/$p $(REMOVE_F1) &&) true
271
+ifdef GITGUI_WINDOWS_WRAPPER
272
+ $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui.tcl $(REMOVE_F1)
273
+endif
274
$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
275
$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
276
$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.ico $(REMOVE_F1)
@@ -279,6 +296,9 @@ clean::
296
ifdef GITGUI_MACOSXAPP
297
$(RM_RF) 'Git Gui.app'* git-gui
298
endif
299
+ifdef GITGUI_WINDOWS_WRAPPER
300
+ $(RM_RF) git-gui
301
+endif
302
303
.PHONY: all install uninstall dist-version clean
304
.PHONY: .FORCE-GIT-VERSION-FILE
windows/git-gui.sh
new
+16
@@ -0,0 +1,16 @@
1
+#!/bin/sh
2
+# Tcl ignores the next line -*- tcl -*- \
3
+exec wish "$0" -- "$@"
4
+
5
+if { $argc >=2 && [lindex $argv 0] == "--working-dir" } {
6
+ cd [lindex $argv 1]
7
+ set argv [lrange $argv 2 end]
8
+ incr argc -2
9
+}
10
+
11
+set gitguidir [file dirname [info script]]
12
+regsub -all ";" $gitguidir "\\;" gitguidir
13
+set env(PATH) "$gitguidir;$env(PATH)"
14
+unset gitguidir
15
+
16
+source [file join [file dirname [info script]] git-gui.tcl]