s3: Rename GIT_COMMIT_{TIME,DATE} to COMMIT_{TIME,DATE}.

This avoids some special casing in the waf code.

diff --git a/source3/m4/samba_version.m4 b/source3/m4/samba_version.m4
index 4d749e9bb93056f6341768c52323539f73e4fc73..dbea1f3b3a1f60468b043de969b327de8688b542 100644 (file)
--- a/source3/m4/samba_version.m4
+++ b/source3/m4/samba_version.m4
@@ -15,15 +15,15 @@ SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat $srcdir/include/version.h | grep 'SAMBA_VE
 if test -n "${SAMBA_VERSION_GIT_COMMIT_FULLREV}";then
        echo "BUILD COMMIT REVISION: ${SAMBA_VERSION_GIT_COMMIT_FULLREV}"
 fi
-SAMBA_VERSION_GIT_COMMIT_DATE=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_DATE' | cut -d ' ' -f3-`
-if test -n "${SAMBA_VERSION_GIT_COMMIT_DATE}";then
-       echo "BUILD COMMIT DATE: ${SAMBA_VERSION_GIT_COMMIT_DATE}"
+SAMBA_VERSION_COMMIT_DATE=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_COMMIT_DATE' | cut -d ' ' -f3-`
+if test -n "${SAMBA_VERSION_COMMIT_DATE}";then
+       echo "BUILD COMMIT DATE: ${SAMBA_VERSION_COMMIT_DATE}"
 fi
-SAMBA_VERSION_GIT_COMMIT_TIME=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_TIME' | cut -d ' ' -f3-`
-if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then
-       echo "BUILD COMMIT TIME: ${SAMBA_VERSION_GIT_COMMIT_TIME}"
+SAMBA_VERSION_COMMIT_TIME=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_COMMIT_TIME' | cut -d ' ' -f3-`
+if test -n "${SAMBA_VERSION_COMMIT_TIME}";then
+       echo "BUILD COMMIT TIME: ${SAMBA_VERSION_COMMIT_TIME}"
 
        # just to keep the build-farm gui happy for now...
-       echo "BUILD REVISION: ${SAMBA_VERSION_GIT_COMMIT_TIME}"
+       echo "BUILD REVISION: ${SAMBA_VERSION_COMMIT_TIME}"
 fi
 

diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index ce9d2af4c0d17d1cd1143649a91cc7cf61d5ea24..5ad197dd56ae2a0d91f0a1d2080241218e0ffaab 100755 (executable)
--- 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

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 7ca5f5057a37cf7454a9f50da8a75323ffa95875..30794e009e9d07a2e53eabb53038c0a661bc8e1b 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2892,8 +2892,8 @@ static void samba_extended_info_version(struct smb_extended_info *extended_info)
        extended_info->samba_subversion |= (SAMBA_VERSION_VENDOR_PATCH & 0xffff);
 #endif
        extended_info->samba_gitcommitdate = 0;
-#ifdef SAMBA_VERSION_GIT_COMMIT_TIME
-       unix_to_nt_time(&extended_info->samba_gitcommitdate, SAMBA_VERSION_GIT_COMMIT_TIME);
+#ifdef SAMBA_VERSION_COMMIT_TIME
+       unix_to_nt_time(&extended_info->samba_gitcommitdate, SAMBA_VERSION_COMMIT_TIME);
 #endif
 
        memset(extended_info->samba_version_string, 0,