From: Shawn O. Pearce Date: Mon, 12 Feb 2007 21:12:04 +0000 (-0500) Subject: git-gui: Rename GIT_VERSION to GITGUI_VERSION. X-Git-Tag: gitgui-0.6.0~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7e81d4eead48c189d52406379150b09fd4096987;p=git.git git-gui: Rename GIT_VERSION to GITGUI_VERSION. Now that the decision has been made to treat git-gui as a subproject, rather than merging it directly into git, we should use a different substitution for our version value to avoid any possible confusion. Signed-off-by: Shawn O. Pearce --- diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 79f1c527f..79558f39c 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -34,13 +34,13 @@ esac if test -r $GVF then - VC=$(sed -e 's/^GIT_VERSION = //' <$GVF) + VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF) else VC=unset fi test "$VN" = "$VC" || { - echo >&2 "GIT_VERSION = $VN" - echo "GIT_VERSION = $VN" >$GVF + echo >&2 "GITGUI_VERSION = $VN" + echo "GITGUI_VERSION = $VN" >$GVF } diff --git a/Makefile b/Makefile index f1668bbd1..71ae7edb4 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh rm -f $@ $@+ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ $@.sh >$@+ chmod +x $@+ mv $@+ $@ @@ -35,7 +35,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(GITGUI_BUILT_INS): git-gui rm -f $@ && ln git-gui $@ -# These can record GIT_VERSION +# These can record GITGUI_VERSION $(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE all:: $(ALL_PROGRAMS) diff --git a/git-gui.sh b/git-gui.sh index ea16be43a..f5010dd47 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2,7 +2,7 @@ # Tcl ignores the next line -*- tcl -*- \ exec wish "$0" -- "$@" -set appvers {@@GIT_VERSION@@} +set appvers {@@GITGUI_VERSION@@} set copyright { Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.