diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-02 21:05:13 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-02 21:05:13 -0400 |
| commit | 22faa032cae39b6758c5a83778bf9bd87305bbd4 (patch) | |
| tree | b96635fa06b8fc955c09c33b063ad2dafdd05608 | |
| parent | f7e1d2d4ac53e93fb2c79bd65c9f3dbfbc9c2024 (diff) | |
| parent | cb8773d16c8619901f46a96ecfc5c2b11c2e82a2 (diff) | |
| download | git-22faa032cae39b6758c5a83778bf9bd87305bbd4.tar.gz git-22faa032cae39b6758c5a83778bf9bd87305bbd4.tar.xz | |
Merge branch 'maint'
* maint:
Revert "Make the installation target of git-gui a little less chatty"
git-gui: Verify Tcl/Tk is new enough for our needs
git-gui: Attach font_ui to all spinbox widgets
| -rw-r--r-- | Makefile | 20 | ||||
| -rwxr-xr-x | git-gui.sh | 18 |
2 files changed, 23 insertions, 15 deletions
@@ -2,12 +2,6 @@ all:: # Define V=1 to have a more verbose compile. # -QUIET = -QUIET_MSG = : -ifndef V - QUIET = @ - QUIET_MSG = echo ' ' -endif GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE @$(SHELL_PATH) ./GIT-VERSION-GEN @@ -115,14 +109,12 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS all:: $(ALL_PROGRAMS) lib/tclIndex install: all - $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' - $(QUIET)$(QUIET_MSG)INSTALL git-gui; $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)' - $(QUIET)$(foreach p,$(GITGUI_BUILT_INS),$(QUIET_MSG)INSTALL $p;\ - rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && \ - ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) - $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)' - $(QUIET)$(foreach p,lib/tclIndex $(ALL_LIBFILES), $(QUIET_MSG)INSTALL $p;\ - $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;) + $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) + $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)' + $(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)' + $(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;) dist-version: @mkdir -p $(TARDIR) diff --git a/git-gui.sh b/git-gui.sh index 264d9ff04..7488a397a 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -22,6 +22,22 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA} ###################################################################### ## +## Tcl/Tk sanity check + +if {[catch {package require Tcl 8.4} err] + || [catch {package require Tk 8.4} err] +} { + catch {wm withdraw .} + tk_messageBox \ + -icon error \ + -type ok \ + -title "git-gui: fatal error" \ + -message $err + exit 1 +} + +###################################################################### +## ## enable verbose loading? if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} { @@ -1228,7 +1244,7 @@ font create font_diffbold foreach class {Button Checkbutton Entry Label Labelframe Listbox Menu Message - Radiobutton Text} { + Radiobutton Spinbox Text} { option add *$class.font font_ui } unset class |