Changeset 11308

Timestamp:

Oct 13, 2010, 5:09:05 PM (12 years ago)

Author:

Longinus00

Message:

change 'v' field in dht to use major/minor version instead of svn revision

Location:

trunk

Files:

• libtransmission/tr-dht.c (modified) (1 diff)
• update-version-h.sh (modified) (2 diffs)

trunk/libtransmission/tr-dht.c

@@ -390 +390 @@
     v[0] = 'T';
     v[1] = 'R';
-    v[2] = (SVN_REVISION_NUM >> 8) & 0xFF;
-    v[3] = SVN_REVISION_NUM & 0xFF;
+    v[2] = MAJOR_VERSION;
+    v[3] = MINOR_VERSION;
     rc = dht_init( dht_socket, dht6_socket, myid, (const unsigned char*)v );
     if(rc < 0)

trunk/update-version-h.sh

@@ -18 +18 @@
 peer_id_prefix=`grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep peer_id_prefix  | cut -d , -f 6`
 
+major_version=`echo ${user_agent_prefix} | awk -F . '{print $1}'`
+minor_version=`echo ${user_agent_prefix} | awk -F . '{print $2 + 0}'`
+
 # If this is a svn tree, and svnversion is available in PATH, use it to
 # grab the version.
@@ -35 +38 @@
 #define LONG_VERSION_STRING       "${user_agent_prefix} (${svn_revision})"
 #define VERSION_STRING_INFOPLIST  ${user_agent_prefix}
+#define MAJOR_VERSION             ${major_version}
+#define MINOR_VERSION             ${minor_version}
 EOF