fmk Mon Aug 2 13:54:50 2004 EDT Modified files: /php-src/win32/build confutils.js Log: Search in PATH before explicit_path. This resolves conflict between Microsoft and cygwin tools with the same name. http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.42&r2=1.43&ty=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.42 php-src/win32/build/confutils.js:1.43 --- php-src/win32/build/confutils.js:1.42 Wed Jul 7 08:25:10 2004 +++ php-src/win32/build/confutils.js Mon Aug 2 13:54:49 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.42 2004/07/07 12:25:10 edink Exp $ +// $Id: confutils.js,v 1.43 2004/08/02 17:54:49 fmk Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -456,7 +456,20 @@ thing_to_find = thing_to_find.replace(new RegExp("/", "g"), "\\"); - if (explicit_path != null) { + if (env_name != null) { + env = WshShell.Environment("Process").Item(env_name); + env = env.split(";"); + for (i = 0; i < env.length; i++) { + file = glob(env[i] + "\\" + thing_to_find); + if (file) { + found = true; + place = true; + break; + } + } + } + + if (!found && explicit_path != null) { if (typeof(explicit_path) == "string") { explicit_path = explicit_path.split(";"); } @@ -467,19 +480,6 @@ found = true; place = file[0]; place = place.substr(0, place.length - thing_to_find.length - 1); - break; - } - } - } - - if (!found && env_name != null) { - env = WshShell.Environment("Process").Item(env_name); - env = env.split(";"); - for (i = 0; i < env.length; i++) { - file = glob(env[i] + "\\" + thing_to_find); - if (file) { - found = true; - place = true; break; } }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php