mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Merge branch 'PHP-7.4'
* PHP-7.4: Fix #79146: cscript can fail to run on some systems
This commit is contained in:
commit
5a6f3de8ac
@ -1,5 +1,5 @@
|
||||
@echo off
|
||||
cscript /nologo win32\build\buildconf.js %*
|
||||
cscript /nologo /e:jscript win32\build\buildconf.js %*
|
||||
SET PHP_BUILDCONF_PATH=%~dp0
|
||||
copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul
|
||||
SET PHP_SDK_SCRIPT_PATH=
|
||||
|
@ -256,4 +256,4 @@ C.WriteBlankLines(1);
|
||||
C.Write(file_get_contents("win32/build/configure.tail"));
|
||||
|
||||
B.WriteLine("@echo off");
|
||||
B.WriteLine("cscript /nologo configure.js %*");
|
||||
B.WriteLine("cscript /nologo /e:jscript configure.js %*");
|
||||
|
@ -1,2 +1,2 @@
|
||||
@echo off
|
||||
cscript /nologo configure.js %*
|
||||
cscript /nologo /e:jscript configure.js %*
|
||||
|
@ -319,7 +319,7 @@ function conf_process_args()
|
||||
var i, j;
|
||||
var configure_help_mode = false;
|
||||
var analyzed = false;
|
||||
var nice = "cscript /nologo configure.js ";
|
||||
var nice = "cscript /nologo /e:jscript configure.js ";
|
||||
var disable_all = false;
|
||||
|
||||
args = WScript.Arguments;
|
||||
|
@ -1,6 +1,6 @@
|
||||
@echo off
|
||||
SET PHP_BUILDCONF_PATH=%~dp0
|
||||
cscript /nologo %PHP_BUILDCONF_PATH%\script\phpize.js %*
|
||||
cscript /nologo /e:jscript %PHP_BUILDCONF_PATH%\script\phpize.js %*
|
||||
IF NOT EXIST configure.bat (
|
||||
echo Error generating configure script, configure script was not copied
|
||||
exit /b 3
|
||||
|
@ -258,6 +258,6 @@ C.WriteBlankLines(1);
|
||||
C.Write(file_get_contents(PHP_DIR + "\\script\\configure.tail"));
|
||||
|
||||
B.WriteLine("@echo off");
|
||||
B.WriteLine("cscript /nologo configure.js %*");
|
||||
B.WriteLine("cscript /nologo /e:jscript configure.js %*");
|
||||
|
||||
FSO.CopyFile(PHP_DIR + "\\script\\run-tests.php", "run-tests.php", true);
|
||||
|
Loading…
Reference in New Issue
Block a user