undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Rename GIT_VERSION to GITGUI_VERSION.

Browse Source 
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 <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2007-02-12 16:12:04 -05:00
parent 663e7cf81d
commit 7e81d4eead
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GIT-VERSION-GEN
View File

@ -34,13 +34,13 @@ esac
if test -r $GVF if test -r $GVF
then then
VC=$(sed -e 's/^GIT_VERSION = //' <$GVF) VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF)
else else
VC=unset VC=unset
fi fi
test "$VN" = "$VC" || { test "$VN" = "$VC" || {
echo >&2 "GIT_VERSION = $VN" echo >&2 "GITGUI_VERSION = $VN"
echo "GIT_VERSION = $VN" >$GVF echo "GITGUI_VERSION = $VN" >$GVF
} }

4
Makefile
View File

@ -27,7 +27,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
rm -f $@ $@+ rm -f $@ $@+
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
$@.sh >$@+ $@.sh >$@+
chmod +x $@+ chmod +x $@+
mv $@+ $@ mv $@+ $@
@ -35,7 +35,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
$(GITGUI_BUILT_INS): git-gui $(GITGUI_BUILT_INS): git-gui
rm -f $@ && ln git-gui $@ rm -f $@ && ln git-gui $@
# These can record GIT_VERSION # These can record GITGUI_VERSION
$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE $(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE
all:: $(ALL_PROGRAMS) all:: $(ALL_PROGRAMS)

2
git-gui.sh
View File

@ -2,7 +2,7 @@
# Tcl ignores the next line -*- tcl -*- \ # Tcl ignores the next line -*- tcl -*- \
exec wish "$0" -- "$@" exec wish "$0" -- "$@"
set appvers {@@GIT_VERSION@@} set appvers {@@GITGUI_VERSION@@}
set copyright { set copyright {
Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras. Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.