diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-10-11 12:27:38 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-10 19:34:24 +0100 |
| commit | ef4e5601748b571a40d84608d12e45235987e608 (patch) | |
| tree | bf7aae0d91c51c95385123ec52c462e7f0097778 /source4/build/m4 | |
| parent | 5b8ffcca53d40c8067531f75c658f856886ee095 (diff) | |
| download | samba-ef4e5601748b571a40d84608d12e45235987e608.tar.gz samba-ef4e5601748b571a40d84608d12e45235987e608.tar.bz2 samba-ef4e5601748b571a40d84608d12e45235987e608.zip | |
prepare the mkversion.sh infrastructure for git branches in the build-farm
metze
(cherry-picked from 1bf4c7fb2012a81e0b4e3d601a4df42d1113f5ef)
(This used to be commit 464668b07aded0a299eb49b87b51bb9bf53d2c8d)
Diffstat (limited to 'source4/build/m4')
| -rw-r--r-- | source4/build/m4/env.m4 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4 index 7556f16ce2..9510a8ee0d 100644 --- a/source4/build/m4/env.m4 +++ b/source4/build/m4/env.m4 @@ -19,9 +19,20 @@ AC_SUBST(datarootdir) SMB_VERSION_STRING=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2` echo "SAMBA VERSION: ${SMB_VERSION_STRING}" -SAMBA_VERSION_SVN_REVISION=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_SVN_REVISION' | cut -d ' ' -f3-` -if test -n "${SAMBA_VERSION_SVN_REVISION}";then - echo "BUILD REVISION: ${SAMBA_VERSION_SVN_REVISION}" +SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2` +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}/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}" +fi +SAMBA_VERSION_GIT_COMMIT_TIME=`cat ${srcdir}/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}" + + # just to keep the build-farm gui happy for now... + echo "BUILD REVISION: ${SAMBA_VERSION_GIT_COMMIT_TIME}" fi m4_include(build/m4/check_path.m4) |