Changeset 7781

Timestamp:

Jan 23, 2009, 2:42:58 AM (12 years ago)

Author:

livings124

Message:

use trunk's version script in 1.5x

File:

• branches/1.5x/macosx/version.sh (modified) (4 diffs)

branches/1.5x/macosx/version.sh

@@ -4 +4 @@
 
 # convention: -TR MAJOR MINOR MAINT STATUS - (each a single char)
-# STATUS: "X" for prerelease test builds,
+# STATUS: "X" for prerelease beta builds,
 #         "Z" for unsupported trunk builds,
 #         "0" for stable, supported releases
@@ -11 +11 @@
 USERAGENT_PREFIX="1.50b3"
 
-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`
+SVN_REVISION=`find -E ./libtransmission ./macosx                     \
+                  -regex ".*\.([chmp]|cpp|po|sh)"                    \
+                  -exec grep -oh '\$Id: [^ ]\+ [0-9]\+' {} +         \
+                  | awk '{ if ($3 > max) max = $3} END { print max }'`
 
-#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 -gt $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
@@ -50 +39 @@
 EOF
 
-# add a release definition
+# Add a release definition
 if [ ${PEERID_PREFIX:6:1} = X ]; then
     line='#define TR_BETA_RELEASE     "BETA"'
@@ -57 +46 @@
 else
     line='#define TR_STABLE_RELEASE   "STABLE"'
-fi  
+fi
 echo $line >> libtransmission/version.h.new