sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-30 17:49:30 +03:00
Code Activity

r212: fix the svk stuff

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher
2004-04-14 13:45:51 +00:00
committed by Gerald (Jerry) Carter
parent a99e31d10f
commit 995f54b208
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/script/mkversion.sh
View File

@ -51,17 +51,18 @@ fi
if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
HAVESVN=yes HAVESVN=no
TMP_SVN_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || HAVESVN=no) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'` svn info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVN=yes
TMP_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info ${SOURCE_DIR} 2>/dev/null) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'`
if test x"${HAVESVN}" = x"no";then if test x"${HAVESVN}" = x"no";then
HAVESVK=yes HAVESVK=no
TMP_SVK_REVISION=`(svk info ${SOURCE_DIR} 2>/dev/null || HAVESVK=no) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'` svk info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVK=yes
TMP_SVK_REVISION_STR="${TMP_SVK_REVISION}-${USER}@${HOSTNAME}" TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}"
fi fi
if test x"${HAVESVN}" = x"yes";then if test x"${HAVESVN}" = x"yes";then
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build-${TMP_SVN_REVISION}" SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build-${TMP_REVISION}"
echo "#define SAMBA_VERSION_SVN_REVISION ${TMP_SVN_REVISION}" >> $OUTPUT_FILE echo "#define SAMBA_VERSION_SVN_REVISION ${TMP_REVISION}" >> $OUTPUT_FILE
elif test x"${HAVESVK}" = x"yes";then elif test x"${HAVESVK}" = x"yes";then
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVK-build-${TMP_SVK_REVISION_STR}" SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVK-build-${TMP_SVK_REVISION_STR}"
else else