diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-20 20:31:09 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-21 02:54:19 -0500 |
| commit | f1cee4e6d19919f6e333f9e671c720003a9a7cec (patch) | |
| tree | bc74537b8aa7e80aae6e6a9e7a5e4a40398ae97a /Makefile | |
| parent | 0499b24ad664d7f6a33d4cfe4a11912ae455b039 (diff) | |
| download | git-f1cee4e6d19919f6e333f9e671c720003a9a7cec.tar.gz git-f1cee4e6d19919f6e333f9e671c720003a9a7cec.tar.xz | |
git-gui: Ensure version number is always current.
I'm stealing the exact logic used by core Git within its own Makefile to
setup the version number within scripts and executables. This way we
can be sure that the version number is always updated after a commit,
and that the version number also reflects when it is coming from a dirty
working directory (and is thus pretty worthless).
I've cleaned up some of the version display code in the about dialog too.
There were simply too many blank lines in the bottom section where we
showed the version data.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -1,9 +1,12 @@ all:: +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE + @$(SHELL_PATH) ./GIT-VERSION-GEN +-include GIT-VERSION-FILE + SCRIPT_SH = git-gui.sh GITGUI_BUILT_INS = git-citool ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH)) -GITGUI_VERSION := $(shell git describe) ifndef SHELL_PATH SHELL_PATH = /bin/sh @@ -20,7 +23,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh rm -f $@ $@+ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ $@.sh >$@+ chmod +x $@+ mv $@+ $@ @@ -28,6 +31,9 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(GITGUI_BUILT_INS): git-gui rm -f $@ && ln git-gui $@ +# These can record GIT_VERSION +$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE + all:: $(ALL_PROGRAMS) install: all @@ -36,4 +42,7 @@ install: all $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) clean:: - rm -f $(ALL_PROGRAMS) + rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE + +.PHONY: all install clean +.PHONY: .FORCE-GIT-VERSION-FILE |