@matheusbsbs / matheus-bagliano / commits / 72a8e81d45
Fork 0

git-gui: Support a native Mac OS X application bundle

If we are building on Darwin (sometimes known as Mac OS X) and we find the Mac OS X Tk.framework in the expected location we build a proper Mac OS X application bundle with icons and info list. The git-gui and git-citool commands are modified to be very short shell scripts that just execute the application bundle, starting Tk with our own info list and icon set. Although the Makefile change here is rather large it makes for a much more pleasant user experience on Mac OS X as git-gui now has its own icon on the dock, in the standard tk_messageBox dialogs, and the application name now says "Git Gui" instead of "Wish" in locations such as the menu bar and the alt-tab window. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Sep 27, 2007 at 02:30 UTC 72a8e81d457a1ee1283817d03d8e28303c2b4e7e
5 files changed +129 -21
.gitignore
+3 -1
@@ -1,5 +1,7 @@
1 +.DS_Store
2 +Git Gui.app*
3 +git-gui.tcl
4 GIT-VERSION-FILE
5 GIT-GUI-VARS
3 -git-citool
6 git-gui
7 lib/tclIndex
Makefile
+76 -20
@@ -11,11 +11,12 @@ GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
11 @$(SHELL_PATH) ./GIT-VERSION-GEN
12 -include GIT-VERSION-FILE
13
14 +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
15 uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
16
17 SCRIPT_SH = git-gui.sh
18 +GITGUI_MAIN := git-gui
19 GITGUI_BUILT_INS = git-citool
18 -ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
20 ALL_LIBFILES = $(wildcard lib/*.tcl)
21 PRELOAD_FILES = lib/class.tcl
22
@@ -35,7 +36,7 @@ ifndef INSTALL
36 INSTALL = install
37 endif
38
38 -RM_F ?= rm -f
39 +RM_RF ?= rm -rf
40 RMDIR ?= rmdir
41
42 INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
@@ -44,6 +45,8 @@ INSTALL_R0 = $(INSTALL) -m644 # space is required here
45 INSTALL_R1 =
46 INSTALL_X0 = $(INSTALL) -m755 # space is required here
47 INSTALL_X1 =
48 +INSTALL_A0 = find # space is required here
49 +INSTALL_A1 = | cpio -pud
50 INSTALL_L0 = rm -f # space is required here
51 INSTALL_L1 = && ln # space is required here
52 INSTALL_L2 =
@@ -51,14 +54,13 @@ INSTALL_L3 =
54
55 REMOVE_D0 = $(RMDIR) # space is required here
56 REMOVE_D1 = || true
54 -REMOVE_F0 = $(RM_F) # space is required here
57 +REMOVE_F0 = $(RM_RF) # space is required here
58 REMOVE_F1 =
59 CLEAN_DST = true
60
61 ifndef V
62 QUIET = @
60 - QUIET_GEN = $(QUIET)echo ' ' GEN $@ &&
61 - QUIET_BUILT_IN = $(QUIET)echo ' ' BUILTIN $@ &&
63 + QUIET_GEN = $(QUIET)echo ' ' GEN '$@' &&
64 QUIET_INDEX = $(QUIET)echo ' ' INDEX $(dir $@) &&
65 QUIET_MSGFMT0 = $(QUIET)printf ' MSGFMT %12s ' $@ && v=`
66 QUIET_MSGFMT1 = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages//g'
@@ -70,6 +72,8 @@ ifndef V
72 INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src
73 INSTALL_X0 = src=
74 INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src
75 + INSTALL_A0 = src=
76 + INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud
77
78 INSTALL_L0 = dst=
79 INSTALL_L1 = && src=
@@ -80,15 +84,15 @@ ifndef V
84 REMOVE_D0 = dir=
85 REMOVE_D1 = && echo ' ' REMOVE $$dir && test -d "$$dir" && $(RMDIR) "$$dir" || true
86 REMOVE_F0 = dst=
83 - REMOVE_F1 = && echo ' ' REMOVE `basename "$$dst"` && $(RM_F) "$$dst"
87 + REMOVE_F1 = && echo ' ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst"
88 endif
89
90 TCL_PATH ?= tclsh
91 TCLTK_PATH ?= wish
92 +TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
93
94 ifeq ($(findstring $(MAKEFLAGS),s),s)
95 QUIET_GEN =
91 -QUIET_BUILT_IN =
96 endif
97
98 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
@@ -105,6 +109,7 @@ exedir = $(dir $(gitexecdir))share/git-gui/lib
109
110 GITGUI_SCRIPT := $$0
111 GITGUI_RELATIVE :=
112 +GITGUI_MACOSXAPP :=
113
114 ifeq ($(exedir),$(gg_libdir))
115 GITGUI_RELATIVE := 1
@@ -116,8 +121,51 @@ ifeq ($(uname_O),Cygwin)
121 gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
122 endif
123 endif
124 +ifeq ($(uname_S),Darwin)
125 + ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
126 + GITGUI_MACOSXAPP := YesPlease
127 + endif
128 +endif
129
120 -$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
130 +ifdef GITGUI_MACOSXAPP
131 +GITGUI_MAIN := git-gui.tcl
132 +
133 +git-gui: GIT-VERSION-FILE GIT-GUI-VARS
134 + $(QUIET_GEN)rm -f $@ $@+ && \
135 + echo '#!$(SHELL_PATH_SQ)' >$@+ && \
136 + echo 'if test "z$$*" = zversion ||' >>$@+ && \
137 + echo ' test "z$$*" = z--version' >>$@+ && \
138 + echo then >>$@+ && \
139 + echo ' 'echo \'git-gui version '$(GITGUI_VERSION)'\' >>$@+ && \
140 + echo else >>$@+ && \
141 + echo ' 'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/Wish'\' \
142 + '"$$0" "$$@"' >>$@+ && \
143 + echo fi >>$@+ && \
144 + chmod +x $@+ && \
145 + mv $@+ $@
146 +
147 +Git\ Gui.app: GIT-VERSION-FILE GIT-GUI-VARS \
148 + macosx/Info.plist \
149 + macosx/git-gui.icns \
150 + macosx/AppMain.tcl \
151 + $(TKFRAMEWORK)/Contents/MacOS/Wish
152 + $(QUIET_GEN)rm -rf '$@' '$@'+ && \
153 + mkdir -p '$@'+/Contents/MacOS && \
154 + mkdir -p '$@'+/Contents/Resources/Scripts && \
155 + cp '$(subst ','\'',$(TKFRAMEWORK))/Contents/MacOS/Wish' \
156 + '$@'+/Contents/MacOS && \
157 + cp macosx/git-gui.icns '$@'+/Contents/Resources && \
158 + sed -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
159 + macosx/Info.plist \
160 + >'$@'+/Contents/Info.plist && \
161 + sed -e 's|@@gitexecdir@@|$(gitexecdir_SQ)|' \
162 + -e 's|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \
163 + macosx/AppMain.tcl \
164 + >'$@'+/Contents/Resources/Scripts/AppMain.tcl && \
165 + mv '$@'+ '$@'
166 +endif
167 +
168 +$(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS
169 $(QUIET_GEN)rm -f $@ $@+ && \
170 sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
171 -e '1,30s|^ argv0=$$0| argv0=$(GITGUI_SCRIPT)|' \
@@ -125,13 +173,10 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
173 -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
174 -e 's|@@GITGUI_RELATIVE@@|$(GITGUI_RELATIVE)|' \
175 -e '$(GITGUI_RELATIVE)s|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \
128 - $@.sh >$@+ && \
176 + git-gui.sh >$@+ && \
177 chmod +x $@+ && \
178 mv $@+ $@
179
132 -$(GITGUI_BUILT_INS): git-gui
133 - $(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
134 -
180 XGETTEXT ?= xgettext
181 ifdef NO_MSGFMT
182 MSGFMT ?= $(TCL_PATH) po/po2msg.sh
@@ -152,7 +197,7 @@ update-po:: $(PO_TEMPLATE)
197 $(ALL_MSGFILES): %.msg : %.po
198 $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) $(QUIET_MSGFMT1)
199
155 -lib/tclIndex: $(ALL_LIBFILES)
200 +lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
201 $(QUIET_INDEX)if echo \
202 $(foreach p,$(PRELOAD_FILES),source $p\;) \
203 auto_mkindex lib '*.tcl' \
@@ -166,16 +211,13 @@ lib/tclIndex: $(ALL_LIBFILES)
211 echo >>$@ ; \
212 fi
213
169 -# These can record GITGUI_VERSION
170 -$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE GIT-GUI-VARS
171 -lib/tclIndex: GIT-GUI-VARS
172 -
214 TRACK_VARS = \
215 $(subst ','\'',SHELL_PATH='$(SHELL_PATH_SQ)') \
216 $(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \
217 $(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
218 $(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \
219 $(subst ','\'',gg_libdir='$(libdir_SQ)') \
220 + GITGUI_MACOSXAPP=$(GITGUI_MACOSXAPP) \
221 #end TRACK_VARS
222
223 GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
@@ -185,7 +227,10 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
227 echo 1>$@ "$$VARS"; \
228 fi
229
188 -all:: $(ALL_PROGRAMS) lib/tclIndex $(ALL_MSGFILES)
230 +ifdef GITGUI_MACOSXAPP
231 +all:: git-gui Git\ Gui.app
232 +endif
233 +all:: $(GITGUI_MAIN) lib/tclIndex $(ALL_MSGFILES)
234
235 install: all
236 $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)
@@ -194,6 +239,10 @@ install: all
239 $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
240 $(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
241 $(QUIET)$(INSTALL_R0)lib/git-gui.ico $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
242 +ifdef GITGUI_MACOSXAPP
243 + $(QUIET)$(INSTALL_A0)'Git Gui.app' $(INSTALL_A1) '$(DESTDIR_SQ)$(libdir_SQ)'
244 + $(QUIET)$(INSTALL_X0)git-gui.tcl $(INSTALL_X1) '$(DESTDIR_SQ)$(libdir_SQ)'
245 +endif
246 $(QUIET)$(foreach p,$(ALL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
247 $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
248 $(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
@@ -205,6 +254,10 @@ uninstall:
254 $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
255 $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
256 $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.ico $(REMOVE_F1)
257 +ifdef GITGUI_MACOSXAPP
258 + $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)/Git Gui.app' $(REMOVE_F1)
259 + $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.tcl $(REMOVE_F1)
260 +endif
261 $(QUIET)$(foreach p,$(ALL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
262 $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(msgsdir_SQ)'
263 $(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
@@ -218,8 +271,11 @@ dist-version:
271 @echo $(GITGUI_VERSION) > $(TARDIR)/version
272
273 clean::
221 - rm -f $(ALL_PROGRAMS) lib/tclIndex po/*.msg
222 - rm -f GIT-VERSION-FILE GIT-GUI-VARS
274 + $(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg
275 + $(RM_RF) GIT-VERSION-FILE GIT-GUI-VARS
276 +ifdef GITGUI_MACOSXAPP
277 + $(RM_RF) 'Git Gui.app'* git-gui
278 +endif
279
280 .PHONY: all install uninstall dist-version clean
281 .PHONY: .FORCE-GIT-VERSION-FILE
macosx/AppMain.tcl new
+22
@@ -0,0 +1,22 @@
1 +set gitexecdir {@@gitexecdir@@}
2 +set gitguilib {@@GITGUI_LIBDIR@@}
3 +set env(PATH) "$gitexecdir:$env(PATH)"
4 +
5 +if {[string first -psn [lindex $argv 0]] == 0} {
6 + lset argv 0 [file join $gitexecdir git-gui]
7 +}
8 +
9 +if {[file tail [lindex $argv 0]] eq {gitk}} {
10 + set argv0 [file join $gitexecdir gitk]
11 + set AppMain_source $argv0
12 +} else {
13 + set argv0 [file join $gitexecdir [file tail [lindex $argv 0]]]
14 + set AppMain_source [file join $gitguilib git-gui.tcl]
15 + if {[pwd] eq {/}} {
16 + cd $env(HOME)
17 + }
18 +}
19 +
20 +unset gitexecdir gitguilib
21 +set argv [lrange $argv 1 end]
22 +source $AppMain_source
macosx/Info.plist new
+28
@@ -0,0 +1,28 @@
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 +<plist version="1.0">
4 +<dict>
5 + <key>CFBundleDevelopmentRegion</key>
6 + <string>English</string>
7 + <key>CFBundleExecutable</key>
8 + <string>Wish</string>
9 + <key>CFBundleGetInfoString</key>
10 + <string>Git Gui @@GITGUI_VERSION@@ © 2006-2007 Shawn Pearce, et. al.</string>
11 + <key>CFBundleIconFile</key>
12 + <string>git-gui.icns</string>
13 + <key>CFBundleIdentifier</key>
14 + <string>cz.or.repo.git-gui</string>
15 + <key>CFBundleInfoDictionaryVersion</key>
16 + <string>6.0</string>
17 + <key>CFBundleName</key>
18 + <string>Git Gui</string>
19 + <key>CFBundlePackageType</key>
20 + <string>APPL</string>
21 + <key>CFBundleShortVersionString</key>
22 + <string>@@GITGUI_VERSION@@</string>
23 + <key>CFBundleSignature</key>
24 + <string>GITg</string>
25 + <key>CFBundleVersion</key>
26 + <string>@@GITGUI_VERSION@@</string>
27 +</dict>
28 +</plist>
macosx/git-gui.icns
Binary files /dev/null and b/macosx/git-gui.icns differ