From: Steph Fox Date: Sat, 22 Mar 2008 09:33:31 +0000 (+0000) Subject: Allow Stas his "1.0.0RC1-dev" X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~492 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc2eed70ef00b9ceb8b04c94b3fff6cd90cb189f;p=php Allow Stas his "1.0.0RC1-dev" --- diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 31c7a16414..e30ffa09d4 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -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;