Use libv8 version string defined dufing configure step

Author: pinepain

CMakeLists.txt

@@ -12,6 +12,10 @@ include_directories(/usr/local/include/php/sapi)
 
 add_definitions(-DV8_DEPRECATION_WARNINGS)
 
+if(EXISTS "${CMAKE_SOURCE_DIR}/config.h")
+    add_definitions(-DHAVE_CONFIG_H)
+endif()
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 include_directories(./)

config.m4

@@ -132,8 +132,8 @@ if test "$PHP_V8" != "no"; then
     if test "$V8_API_VERSION" -lt 501000 ; then
        AC_MSG_ERROR([libv8 must be version 5.1.0 or greater])
     fi
-    AC_DEFINE_UNQUOTED([PHP_LIBV8_API_VERSION], $V8_API_VERSION, [ ])
-    AC_DEFINE_UNQUOTED([PHP_LIBV8_VERSION], "$ac_cv_v8_version", [ ])
+    AC_DEFINE_UNQUOTED([PHP_V8_LIBV8_API_VERSION], $V8_API_VERSION, [ ])
+    AC_DEFINE_UNQUOTED([PHP_V8_LIBV8_VERSION], "$ac_cv_v8_version", [ ])
   else
     AC_MSG_ERROR([could not determine libv8 version])
   fi

php_v8.h

@@ -15,6 +15,10 @@
 #ifndef PHP_V8_H
 #define PHP_V8_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 extern "C" {
 #include "php.h"
 #include <v8-version.h>
@@ -37,30 +41,10 @@ extern zend_module_entry php_v8_module_entry;
 #endif
 
 
+#define PHP_V8_NS "v8"
 
-#define PHP_V8_NS "v8"  // TODO: move to other header
-#define PHP_V8_EXCEPTIONS_NS PHP_V8_NS . "\\" . "Exceptions"  // TODO: move to other header
-
-
-/* From v8 src/version.cc */
-
-#if V8_IS_CANDIDATE_VERSION
-#define CANDIDATE_STRING " (candidate)"
-#else
-#define CANDIDATE_STRING ""
-#endif
-
-#define SX(x) #x
-#define S(x) SX(x)
-
-#if V8_PATCH_LEVEL > 0
-#define VERSION_STRING                                                      \
-  S(V8_MAJOR_VERSION) "." S(V8_MINOR_VERSION) "." S(V8_BUILD_NUMBER) "." S( \
-      V8_PATCH_LEVEL) CANDIDATE_STRING
-#else
-#define VERSION_STRING                                               \
-  S(V8_MAJOR_VERSION) "." S(V8_MINOR_VERSION) "." S(V8_BUILD_NUMBER) \
-      CANDIDATE_STRING
+#ifndef PHP_V8_LIBV8_VERSION
+#define PHP_V8_LIBV8_VERSION "undefined"
 #endif
 
 

v8.cc

@@ -91,36 +91,6 @@ PHP_INI_END()
 */
 /* }}} */
 
-/* Remove the following function when you have successfully modified config.m4
-   so that your module can be compiled into PHP, it exists only for testing
-   purposes. */
-
-// TODO: remove this function and other stub data
-/* Every user-visible function in PHP should document itself in the source */
-/* {{{ proto string confirm_v8_compiled(string arg)
-   Return a string to confirm that the module is compiled in */
-PHP_FUNCTION(confirm_v8_compiled)
-{
-	char *arg = NULL;
-	size_t arg_len, len;
-	char *strg;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) {
-		return;
-	}
-
-	len = spprintf(&strg, 0, "Congratulations! You have successfully modified ext/%.78s/config.m4. Module %.78s is now compiled into PHP.", "v8", arg);
-
-	RETVAL_STRINGL(strg, len);
-	efree(strg);
-}
-/* }}} */
-/* The previous line is meant for vim and emacs, so it can correctly fold and
-   unfold functions in source code. See the corresponding marks just before
-   function definition, where the functions purpose is also documented. Please
-   follow this convention for the convenience of others editing your code.
-*/
-
 
 /* {{{ PHP_MINIT_FUNCTION
  */
@@ -233,7 +203,7 @@ PHP_MINFO_FUNCTION(v8)
 	php_info_print_table_end();
 
 	php_info_print_table_start();
-	php_info_print_table_row(2, "V8 Engine Compiled Version", VERSION_STRING);
+	php_info_print_table_row(2, "V8 Engine Compiled Version", PHP_V8_LIBV8_VERSION);
 	php_info_print_table_row(2, "V8 Engine Linked Version", v8::V8::GetVersion());
 	php_info_print_table_end();
 
@@ -269,7 +239,6 @@ static PHP_GSHUTDOWN_FUNCTION(v8)
  * Every user visible function must have an entry in php_v8_functions[].
  */
 const zend_function_entry php_v8_functions[] = {
-	PHP_FE(confirm_v8_compiled,	NULL)		/* For testing, remove later. */
 	PHP_FE_END	/* Must be the last line in php_v8_functions[] */
 };
 /* }}} */