diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-21 11:53:36 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-21 11:54:11 +0100 |
| commit | b0f8d38f4acd790100ece0bc6e33818d13fd44a2 (patch) | |
| tree | f4e3fe1a2a6cfbec9b1b195a867f99f699769754 /win32 | |
| parent | 54d9f2bb370ac053755f6775e235d8ebce1f0de9 (diff) | |
| parent | 3046e35718e4980a8cf7785fa6ecea51d02ebee8 (diff) | |
| download | php-git-b0f8d38f4acd790100ece0bc6e33818d13fd44a2.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79146: cscript can fail to run on some systems
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/buildconf.js | 2 | ||||
| -rw-r--r-- | win32/build/configure.bat | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 2 | ||||
| -rw-r--r-- | win32/build/phpize.bat | 2 | ||||
| -rw-r--r-- | win32/build/phpize.js.in | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js index 7bbb800249..5a45e481fc 100644 --- a/win32/build/buildconf.js +++ b/win32/build/buildconf.js @@ -258,4 +258,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 %*"); diff --git a/win32/build/configure.bat b/win32/build/configure.bat index 45d273dc6b..8adefd8c96 100644 --- a/win32/build/configure.bat +++ b/win32/build/configure.bat @@ -1,2 +1,2 @@ @echo off -cscript /nologo configure.js %* +cscript /nologo /e:jscript configure.js %* diff --git a/win32/build/confutils.js b/win32/build/confutils.js index e7193a6102..190fa8e287 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -321,7 +321,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; diff --git a/win32/build/phpize.bat b/win32/build/phpize.bat index a79885f008..2664733258 100644 --- a/win32/build/phpize.bat +++ b/win32/build/phpize.bat @@ -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 diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index 032559b371..5a4a973e19 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -260,6 +260,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); |