summaryrefslogtreecommitdiff
path: root/source3/script
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-11-12 18:06:20 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-11-12 17:42:14 +0000
commited22f13e7ead1b1ed2fd9dde51a479b9cfaf67aa (patch)
treee8b53e68924e34450acec4ce4fdff818774b404d /source3/script
parent9ebb55d1cb1280a5b8a4d82ec35568c034898e41 (diff)
downloadsamba-ed22f13e7ead1b1ed2fd9dde51a479b9cfaf67aa.tar.gz
samba-ed22f13e7ead1b1ed2fd9dde51a479b9cfaf67aa.tar.bz2
samba-ed22f13e7ead1b1ed2fd9dde51a479b9cfaf67aa.zip
s3: Rename GIT_COMMIT_{TIME,DATE} to COMMIT_{TIME,DATE}.
This avoids some special casing in the waf code.
Diffstat (limited to 'source3/script')
-rwxr-xr-xsource3/script/mkversion.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index ce9d2af4c0..5ad197dd56 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -76,9 +76,9 @@ if test x"${SAMBA_VERSION_IS_GIT_SNAPSHOT}" = x"yes";then
HAVEGIT=no
GIT_INFO=`git show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD 2>/dev/null`
GIT_COMMIT_ABBREV=`printf "%s" "${GIT_INFO}" | sed -n 1p`
- GIT_COMMIT_TIME=`printf "%s" "${GIT_INFO}" | sed -n 2p`
+ COMMIT_TIME=`printf "%s" "${GIT_INFO}" | sed -n 2p`
GIT_COMMIT_FULLREV=`printf "%s" "${GIT_INFO}" | sed -n 3p`
- GIT_COMMIT_DATE=`printf "%s" "${GIT_INFO}" | sed -n 4p`
+ COMMIT_DATE=`printf "%s" "${GIT_INFO}" | sed -n 4p`
if test -n "${GIT_COMMIT_ABBREV}";then
HAVEGIT=yes
HAVEVER=yes
@@ -89,9 +89,9 @@ if test x"${SAMBA_VERSION_IS_GIT_SNAPSHOT}" = x"yes";then
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-GIT-${GIT_COMMIT_ABBREV}"
echo "#define SAMBA_VERSION_GIT_COMMIT_ABBREV \"${GIT_COMMIT_ABBREV}\"" >> $OUTPUT_FILE
- echo "#define SAMBA_VERSION_GIT_COMMIT_TIME ${GIT_COMMIT_TIME}" >> $OUTPUT_FILE
+ echo "#define SAMBA_VERSION_COMMIT_TIME ${COMMIT_TIME}" >> $OUTPUT_FILE
echo "#define SAMBA_VERSION_GIT_COMMIT_FULLREV \"${GIT_COMMIT_FULLREV}\"" >> $OUTPUT_FILE
- echo "#define SAMBA_VERSION_GIT_COMMIT_DATE \"${GIT_COMMIT_DATE}\"" >> $OUTPUT_FILE
+ echo "#define SAMBA_VERSION_COMMIT_DATE \"${COMMIT_DATE}\"" >> $OUTPUT_FILE
else
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-GIT-UNKNOWN"
fi