Organizing the Pecl version into just one variable

lukaszkujawa · Sep 26, 2012 · 8759c85 · 8759c85
1 parent 128bb30
commit 8759c85
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 74 deletions.
diff --git a/TECH_NOTES b/TECH_NOTES
@@ -59,7 +59,7 @@ zend_hash_init() is setting up the HashTable pointer to use.
 ==================================================================
 Release Checklist
 ==================================================================
-0. Make sure version information is updated in php_solr_version.h and package.xml
+0. Make sure version information is updated in solr_constants.h and package.xml
 
 1. Checkout release candidate source code from SVN, then compile and install.
       svn co http://svn.php.net/repository/pecl/solr/trunk pecl-solr

diff --git a/package.xml b/package.xml
@@ -70,7 +70,6 @@
 			<file role="src" name="solr.dsp"/>
 			<file role="src" name="php_solr.h"/>
 			<file role="src" name="php_solr_api.h"/>
-			<file role="src" name="php_solr_version.h"/>
 			<file role="src" name="php_solr_bc_macros.h"/>
 			<file role="src" name="solr_constants.h"/>
 			<file role="src" name="solr_macros.h"/>

diff --git a/php_solr_version.h b/php_solr_version.h
diff --git a/solr_constants.h b/solr_constants.h
@@ -21,7 +21,9 @@
 #ifndef SOLR_CONSTANTS_H
 #define SOLR_CONSTANTS_H
 
-#include "php_solr_version.h"
+/* {{{ Current version of Solr extension */
+#define PHP_SOLR_DOTTED_VERSION "1.0.1"
+#define SOLR_CLIENT_USER_AGENT "PHP Solr Client " PHP_SOLR_DOTTED_VERSION
 
 #define SOLR_SPACE_STRING " "
 

diff --git a/solr_functions_helpers.c b/solr_functions_helpers.c
@@ -31,10 +31,6 @@
 /* {{{ void solr_extension_register_constants(int type, int module_number TSRMLS_DC) */
 PHP_SOLR_API void solr_extension_register_constants(int type, int module_number TSRMLS_DC)
 {
-	REGISTER_LONG_CONSTANT("SOLR_MAJOR_VERSION", PHP_SOLR_MAJOR_VERSION, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SOLR_MINOR_VERSION", PHP_SOLR_MINOR_VERSION, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SOLR_PATCH_VERSION", PHP_SOLR_PATCH_VERSION, CONST_CS | CONST_PERSISTENT);
-
 	REGISTER_STRING_CONSTANT("SOLR_EXTENSION_VERSION", PHP_SOLR_DOTTED_VERSION, CONST_CS | CONST_PERSISTENT);
 }
 /* }}} */