com php-src: Merge branch 'PHP-7.2' into PHP-7.3: win32/build/confutils.js

From: Date: Mon, 11 Mar 2019 19:59:23 +0000
Subject: com php-src: Merge branch 'PHP-7.2' into PHP-7.3: win32/build/confutils.js
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105088@lists.php.net to get a copy of this message
Commit: 95c8f67a4c678b1fb26dbd2c7b57b14ea46c8ae0 Author: Anatol Belski <ab@php.net> Mon, 11 Mar 2019 20:59:23 +0100 Parents: e7ce7c6bb211011569d8036b663bc4ccd45b9984 6814ba11bc8c2638b7345aaea176fc7c678aa07f Branches: PHP-7.3 PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=95c8f67a4c678b1fb26dbd2c7b57b14ea46c8ae0 Log: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: Die hard if mc.exe or mt.exe not found Changed paths: MM win32/build/confutils.js Diff: diff --cc win32/build/confutils.js index 11fc7d2,d943453..82d1066 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@@ -3016,10 -2934,11 +3016,12 @@@ function toolset_setup_project_tools( } PATH_PROG('zip'); PATH_PROG('lemon'); + PATH_PROG('7za'); // avoid picking up midnight commander from cygwin - PATH_PROG('mc', WshShell.Environment("Process").Item("PATH")); + if (!PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"))) { + ERROR('mc is required') + } // Try locating the manifest tool if (VS_TOOLSET) {

« previous php.cvs (#105088) next »