Author: metze Date: 2007-07-03 15:44:58 +0000 (Tue, 03 Jul 2007) New Revision: 23686
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23686 Log: merge from SAMBA_4_0: Only use the bzr and git information when there's a .bzr or .git in the top branch directory I use bzr for my home directory and bzr version-info in ~/devel/samba/4.0/samba4-git gives the info about the ~/.bzr branch metze Modified: branches/SAMBA_3_0_26/source/script/mkversion.sh Changeset: Modified: branches/SAMBA_3_0_26/source/script/mkversion.sh =================================================================== --- branches/SAMBA_3_0_26/source/script/mkversion.sh 2007-07-03 14:46:06 UTC (rev 23685) +++ branches/SAMBA_3_0_26/source/script/mkversion.sh 2007-07-03 15:44:58 UTC (rev 23686) @@ -91,7 +91,7 @@ TMP_MIRRORED_REVISION=`echo -e "${SVK_INFO}" | grep 'Mirrored From:.*samba\.org.*' |sed -e 's/Mirrored From: .* Rev\..* \([0-9]*\).*/\1/'` fi - if test x"${HAVEVER}" != x"yes";then + if test x"${HAVEVER}" != x"yes" -a -d "${SOURCE_DIR}../.bzr";then HAVEBZR=no BZR_INFO=`bzr version-info --check-clean ${SOURCE_DIR} 2>/dev/null` TMP_REVISION=`echo -e "${BZR_INFO}" | grep 'revno:' |sed -e 's/revno: \([0-9]*\).*/\1/'` @@ -104,7 +104,7 @@ TMP_CLEAN_TREE=`echo -e "${BZR_INFO}" | grep 'clean:' |sed -e 's/clean: \([a-zA-Z]*\).*/\1/'` fi - if test x"${HAVEVER}" != x"yes";then + if test x"${HAVEVER}" != x"yes" -a -d "${SOURCE_DIR}../.git";then HAVEGIT=no GIT_INFO=`git show --abbrev-commit HEAD 2>/dev/null` TMP_REVISION=`echo -e "${GIT_INFO}" | grep 'commit ' | sed 1q |sed -e 's/commit \([0-9a-f]*\).*/\1/'`
