]> granicus.if.org Git - php/commitdiff
Allow Stas his "1.0.0RC1-dev"
authorSteph Fox <sfox@php.net>
Sat, 22 Mar 2008 09:33:31 +0000 (09:33 +0000)
committerSteph Fox <sfox@php.net>
Sat, 22 Mar 2008 09:33:31 +0000 (09:33 +0000)
win32/build/confutils.js

index 31c7a164145632e85431f9ed1d74e30a16b0f0dd..e30ffa09d4cf6e5466c3f85bceea7bc7ec47bbc7 100644 (file)
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.4 2008-03-22 09:07:59 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.5 2008-03-22 09:33:31 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -877,7 +877,7 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s
                        if (header = FSO.OpenTextFile(project_header, 1)) {
                                contents = header.ReadAll();
                                /* allowed: x.x.x[-dev|-alpha|-beta][RCx] */
-                               if (contents.match(new RegExp('PHP_' + basename.toUpperCase() + '_VERSION(\\s+)"((\\d+\.\\d+(\.\\d+)?)(\-[a-z]{3,5})?(RC\\d+)?)'))) {
+                               if (contents.match(new RegExp('PHP_' + basename.toUpperCase() + '_VERSION(\\s+)"((\\d+\.\\d+(\.\\d+)?)(\-[a-z]{3,5})?(RC\\d+)?(\-dev)?)'))) {
                                        project_version = RegExp.$2;
                                        file_version = RegExp.$3.split('.');
                                        versioning = '\\"" /d EXT_FILE_VERSION=' + file_version[0] + ',' + file_version[1] + ',' + file_version[2] + ' /d EXT_VERSION="\\"' + project_version;