summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-02-12 21:12:04 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-02-12 21:12:04 (GMT)
commit7e81d4eead48c189d52406379150b09fd4096987 (patch)
tree6f566b70c7960b39513f8ec159847d642bf8cc54
parent663e7cf81d970d8320147d4d58dce37aaebfb09b (diff)
downloadgit-7e81d4eead48c189d52406379150b09fd4096987.zip
git-7e81d4eead48c189d52406379150b09fd4096987.tar.gz
git-7e81d4eead48c189d52406379150b09fd4096987.tar.bz2
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 <spearce@spearce.org>
-rwxr-xr-xGIT-VERSION-GEN6
-rw-r--r--Makefile4
-rwxr-xr-xgit-gui.sh2
3 files changed, 6 insertions, 6 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 79f1c52..79558f3 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 f1668bb..71ae7ed 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 ea16be4..f5010dd 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.