From 3fe04a34cccbd2b8428b8b0d7a4d8a8b8e9f3de4 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sun, 30 Nov 2008 17:46:19 +0000 Subject: [PATCH] trunk: dirty fix to ensure the right svn number is grabbed --- macosx/version.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/macosx/version.sh b/macosx/version.sh index bae5eb84a..95620d070 100755 --- a/macosx/version.sh +++ b/macosx/version.sh @@ -7,13 +7,23 @@ # "Z" for unsupported trunk builds, # "0" for stable, supported releases # these should be the only two lines you need to change -PEERID_PREFIX="-TR140Z-" -USERAGENT_PREFIX="1.40+" +PEERID_PREFIX="-TR1400-" +USERAGENT_PREFIX="1.40" -SVN_REVISION=`find ./macosx ./libtransmission -name "*\.[chmp]" -o -name "*\.cpp" -o -name "*\.po" -o -name "*\.sh" | \ +SVN_REVISION=`find ./libtransmission -name "*\.[chmp]" -o -name "*\.cpp" -o -name "*\.po" -o -name "*\.sh" | \ xargs grep "\$Id:" | \ grep -v third-party | \ cut -d"$Id:" -f3 | cut -d" " -f3 | sort -n | tail -n 1` + +#dirty fix to ensure the highest version number is found when running release_builder.sh +SVN_REVISION_MAC=`find ./macosx -name "*\.[chmp]" -o -name "*\.cpp" -o -name "*\.po" -o -name "*\.sh" | \ + xargs grep "\$Id:" | \ + grep -v third-party | \ + cut -d"$Id:" -f3 | cut -d" " -f3 | sort -n | tail -n 1` + +if SVN_REVISION_MAC > SVN_REVISION; then + SVN_REVISION = SVN_REVISION_MAC +fi # Generate files to be included: only overwrite them if changed so make # won't rebuild everything unless necessary