mturk 2002/11/27 23:36:31
Modified: jk/native2/include jk_global.h
Log:
Change the versioning scheme.
If the JK_VERISRELEASE is 0, then the '-dev' suffix will be added.
If the JK_VERBETA is greater then 0, the '-beta-X' suffix will be added.
So for example:
JK_VERISRELEASE 0, JK_VERBETA 1 -> mod_jk2/2.0.3-dev-beta-1
JK_VERISRELEASE 0, JK_VERBETA 0 -> mod_jk2/2.0.3-dev
JK_VERISRELEASE 1, JK_VERBETA 1 -> mod_jk2/2.0.3-beta-1
JK_VERISRELEASE 0, JK_VERBETA 0 -> mod_jk2/2.0.3
Revision Changes Path
1.17 +22 -8 jakarta-tomcat-connectors/jk/native2/include/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_global.h 27 Nov 2002 17:12:05 -0000 1.16
+++ jk_global.h 28 Nov 2002 07:36:31 -0000 1.17
@@ -90,7 +90,7 @@
#define JK_VERSTRING "2.0.3"
/* Beta number */
-#define JK_VERBETA 1
+#define JK_VERBETA 0
#define JK_BETASTRING "1"
/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
#define JK_VERISRELEASE 0
@@ -100,12 +100,19 @@
/* Build JK_EXPOSED_VERSION and JK_VERSION */
#define JK_EXPOSED_VERSION_INT PACKAGE JK_VERSTRING
+
#if ( JK_VERISRELEASE == 1 )
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
-#undef JK_VERBETA
-#define JK_VERBETA 255
+ #define JK_RELEASE_STR JK_EXPOSED_VERSION_INT
+#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
#else
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-beta-" JK_BETASTRING
+ #define JK_EXPOSED_VERSION JK_RELEASE_STR "-beta-" JK_BETASTRING
#endif
#define JK_MAKEVERSION(major, minor, fix, beta) (((major) << 24) + ((minor) << 16)
+ ((fix) << 8) + (beta))
@@ -193,7 +200,14 @@
/* Some compileers support 'inline'. How to guess ?
#define INLINE inline
*/
-#define INLINE
+
+/* For VC the __inline keyword is available in both C and C++.*/
+#if defined(_WIN32) && defined(_MSC_VER)
+#define INLINE __inline
+#else
+/* XXX: Other compilers? */
+#define INLINE
+#endif
#define JK_WORKER_FILE_TAG ("worker_file")
#define JK_MOUNT_FILE_TAG ("worker_mount_file")
@@ -201,7 +215,7 @@
#define JK_LOG_FILE_TAG ("log_file")
#define JK_WORKER_NAME_TAG ("worker")
-#define JK_WORKER_FILE_DEF ("workers.properties")
+#define JK_WORKER_FILE_DEF ("${serverRoot}/conf/workers2.properties")
#define JK_LOG_LEVEL_DEF ("emerg")
#define JK_TRUE (1)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
