Changeset 923

Timestamp:

06/24/2012 05:16:05 AM (11 months ago)

Author:

moo

Message:

fix version stuff

Location:

trunk

Files:

• xcache.c (modified) (3 diffs)
• xcache.h (modified) (1 diff)

trunk/xcache.c

@@ -3407 +3407 @@
        (e.g. Windows 2000) */
     char dbghelpPath[_MAX_PATH];
-    const char *phpVersion;
 
     if (GetModuleFileName(NULL, dbghelpPath, _MAX_PATH)) {
@@ -3432 +3431 @@
     }
 
-    phpVersion = zend_get_module_version("core");
-    if (!phpVersion) {
-        phpVersion = zend_get_module_version("standard");
-        if (!phpVersion) {
-            phpVersion = "unknown";
-        }
-    }
-    sprintf(crash_dumpPath, "%s\\php-%s-xcache-%s-%lu-%lu.dmp", xc_coredump_dir, phpVersion, XCACHE_VERSION, (unsigned long) time(NULL), (unsigned long) GetCurrentProcessId());
+#ifdef XCACHE_VERSION_REVISION
+#define REVISION "r" XCACHE_VERSION_REVISION
+#else
+#define REVISION ""
+#endif
+    sprintf(crash_dumpPath, "%s\\php-%s-xcache-%s%s-%lu-%lu.dmp", xc_coredump_dir, zend_get_module_version("standard"), XCACHE_VERSION, REVISION , (unsigned long) time(NULL), (unsigned long) GetCurrentProcessId());
+#undef REVISION
 
     oldFilter = SetUnhandledExceptionFilter(&miniDumperFilter);
@@ -3583 +3581 @@
     php_info_print_table_header(2, "XCache Support", "enabled");
     php_info_print_table_row(2, "Version", XCACHE_VERSION);
+#ifdef XCACHE_VERSION_REVISION
+    php_info_print_table_row(2, "Revision", "r" XCACHE_VERSION_REVISION);
+#endif
     php_info_print_table_row(2, "Modules Built", XCACHE_MODULES);
     php_info_print_table_row(2, "Readonly Protection", xc_readonly_protection ? "enabled" : "N/A");

trunk/xcache.h

@@ -2 +2 @@
 #define __XCACHE_H
 #define XCACHE_NAME       "XCache"
-#define XCACHE_VERSION    "2.0.0"
+#ifndef XCACHE_VERSION
+#   define XCACHE_VERSION "2.0.1-dev"
+#endif
 #define XCACHE_AUTHOR     "mOo"
 #define XCACHE_COPYRIGHT  "Copyright (c) 2005-2012"