Changeset 7725

Timestamp:

Jan 16, 2009, 9:29:48 PM (12 years ago)

Author:

charles

Message:

(1.5x) sync xcode & autoconf idioms for determining if a build is stable, beta, or nightly

Location:

branches/1.5x

Files:

• configure.ac (modified) (1 diff)
• macosx/version.sh (modified) (1 diff)

branches/1.5x/configure.ac

@@ -20 +20 @@
 AC_PROG_LIBTOOL
 
-if test m4_substr(peer_id_prefix,6,1) = "Z"; then
-  AC_DEFINE(TR_UNSTABLE, 1, [Define to 1 if this is an unstable version of Transmission])
-  TR_UNSTABLE=yes
-  enable_debug=yes
+if test m4_substr(peer_id_prefix,6,1) = "X"; then
+  AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
+  supported_build=no
+elif test m4_substr(peer_id_prefix,6,1) = "Z"; then
+  AC_DEFINE(TR_NIGHTLY_RELEASE, 1, [Define to 1 if this is a nightly release of Transmission])
+  supported_build=no
 else
-  enable_debug=no
-fi
-AM_CONDITIONAL(TR_UNSTABLE, test "x$TR_UNSTABLE" = "xyes")
+  AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
+  supported_build=yes
+fi
+AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
 
 OPENSSL_MINIMUM=0.9.4

branches/1.5x/macosx/version.sh

@@ -49 +49 @@
 #define BUNDLE_VERSION_INFOPLIST  $SVN_REVISION
 EOF
+
+# add a release definition
+if [ ${PEERID_PREFIX:6:1} = X ]; then
+    line='#define TR_BETA_RELEASE     "BETA"'
+elif [ ${PEERID_PREFIX:6:1} = Z ]; then
+    line='#define TR_NIGHTLY_RELEASE  "NIGHTLY"'
+else
+    line='#define TR_STABLE_RELEASE   "STABLE"'
+fi  
+echo $line >> libtransmission/version.h.new
+
 replace_if_differs libtransmission/version.h.new libtransmission/version.h