From 0726c79d7e6094121c30e4dc5c9f8bd199dc80ba Mon Sep 17 00:00:00 2001 From: Steph Fox Date: Sun, 23 Mar 2008 21:59:31 +0000 Subject: [PATCH] - Extend that regexp (again) - Revert the changes affecting external template.rc files --- win32/build/confutils.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 9b63cef491..a2b69402ad 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.6 2008-03-22 22:16:55 sfox Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8.2.7 2008-03-23 21:59:31 sfox Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -839,6 +839,7 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s { var resname = makefiletarget + ".res"; var res_desc = makefiletarget; + var res_prod_name = "PHP " + makefiletarget; var credits; var thanks = ""; var logo = ""; @@ -876,8 +877,8 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s if (FSO.FileExists(project_header)) { 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+)?(\-dev)?)'))) { + /* allowed: x.x.x[a|b|-alpha|-beta][RCx][-dev] */ + if (contents.match(new RegExp('PHP_' + basename.toUpperCase() + '_VERSION(\\s+)"((\\d+\.\\d+(\.\\d+)?)((a|b)\\d|\-[a-z]{3,5})?(RC\\d+)?(\-dev)?)'))) { project_version = RegExp.$2; file_version = RegExp.$3.split('.'); if (!file_version[2]) { @@ -903,12 +904,10 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s */ if (FSO.FileExists(creditspath + '\\template.rc')) { MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": " + creditspath + "\\template.rc"); - MFO.WriteLine("\t$(RC) /n /fo $(BUILD_DIR)\\" + resname + logo + debug + - ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' - + makefiletarget + '\\"" /d URL="\\"' + project_url - + '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + - '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" ' + creditspath + - '\\template.rc'); + MFO.WriteLine("\t$(RC) /fo $(BUILD_DIR)\\" + resname + logo + + ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' + makefiletarget + + '\\"" /d PRODUCT_NAME="\\"' + res_prod_name + '\\"" /d THANKS_GUYS="\\"' + + thanks + '\\"" ' + creditspath + '\\template.rc'); return resname; } -- 2.40.0