svn commit: r704639 - /tomcat/connectors/trunk/jk/native/common/jk_version.h

[rjung]

Author: rjung
Date: Tue Oct 14 12:39:42 2008
New Revision: 704639

URL: http://svn.apache.org/viewvc?rev=704639&view=rev
Log:
Clean up version string determination and
adding an optional revision suffix for
dev versions to the exposed version string.

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_version.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_version.h?rev=704639&r1=704638&r2=704639&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_version.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_version.h Tue Oct 14 12:39:42 
2008
@@ -29,13 +29,16 @@
 #define JK_VERFIX       27
 #define JK_VERSTRING    "1.2.27"
 
+/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
+#define JK_VERISRELEASE 0
 /* Beta number */
 #define JK_VERBETA      0
 #define JK_BETASTRING   "0"
-/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
+/* Release candidate */
 #define JK_VERRC        0
 #define JK_RCSTRING     "0"
+/* Source Control Revision as a suffix, e.g. "-r12345" */
+#define JK_REVISION ""
 
 /************** END OF AREA TO MODIFY BEFORE RELEASING *************/
 
@@ -52,23 +55,18 @@
 /* Build JK_EXPOSED_VERSION and JK_VERSION */
 #define JK_EXPOSED_VERSION_INT PACKAGE "/" JK_VERSTRING
 
-#if ( JK_VERISRELEASE == 1 )
-#define JK_RELEASE_STR  JK_EXPOSED_VERSION_INT
+#if (JK_VERBETA != 0)
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-beta-" JK_BETASTRING
 #else
-#define JK_RELEASE_STR  JK_EXPOSED_VERSION_INT "-dev"
-#endif
-
-#if ( JK_VERBETA == 0 )
-#define JK_EXPOSED_VERSION JK_RELEASE_STR
 #undef JK_VERBETA
 #define JK_VERBETA 255
+#if (JK_VERRC != 0)
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-rc-" JK_RCSTRING
+#elif (JK_VERISRELEASE == 1)
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
 #else
-#define JK_EXPOSED_VERSION JK_RELEASE_STR "-beta-" JK_BETASTRING
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-dev" JK_REVISION
 #endif
-
-#if (JK_VERRC != 0)
-#undef JK_EXPOSED_VERSION
-#define JK_EXPOSED_VERSION JK_RELEASE_STR "-rc-" JK_RCSTRING
 #endif
 
 #define JK_MAKEVERSION(major, minor, fix, beta) (((major) << 24) + ((minor) << 
16) + ((fix) << 8) + (beta))



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]