diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-19 16:26:14 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-19 16:26:45 +0100 |
| commit | 2e27bb86823313616cf5abd04249e0505d5453d8 (patch) | |
| tree | 0478e621ff1a4594ab2b80ca687132d0de9ed941 /win32 | |
| parent | 3c44e9c080d91bf78061d2d90bb1df3d31dc3d95 (diff) | |
| parent | c2b1182879bf2785245638945851c241b0859cbb (diff) | |
| download | php-git-2e27bb86823313616cf5abd04249e0505d5453d8.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/confutils.js | 16 | ||||
| -rw-r--r-- | win32/build/phpize.js.in | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 857e50acbe..bf88cdae44 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -92,12 +92,14 @@ if (typeof(CWD) == "undefined") { CWD = FSO.GetParentFolderName(FSO.GetParentFolderName(FSO.GetAbsolutePathName("main\\php_version.h"))); } -/* defaults; we pick up the precise versions from configure.ac */ -var PHP_VERSION = 8; -var PHP_MINOR_VERSION = 0; -var PHP_RELEASE_VERSION = 0; -var PHP_EXTRA_VERSION = ""; -var PHP_VERSION_STRING = "8.0.0"; +if (!MODE_PHPIZE) { + /* defaults; we pick up the precise versions from configure.ac */ + var PHP_VERSION = 8; + var PHP_MINOR_VERSION = 0; + var PHP_RELEASE_VERSION = 0; + var PHP_EXTRA_VERSION = ""; + var PHP_VERSION_STRING = "8.0.0"; +} /* Get version numbers and DEFINE as a string */ function get_version_numbers() @@ -2334,6 +2336,8 @@ function generate_phpize() MF.WriteLine("var PHP_VERSION=" + PHP_VERSION); MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION); MF.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION); + MF.WriteLine("var PHP_EXTRA_VERSION=\"" + PHP_EXTRA_VERSION + "\""); + MF.WriteLine("var PHP_VERSION_STRING=\"" + PHP_VERSION_STRING + "\""); MF.WriteBlankLines(1); MF.WriteLine("/* Generated extensions list with mode (static/shared) */"); diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index d12820403e..40308f5fc7 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -215,6 +215,12 @@ C.WriteLine("var PHP_ANALYZER = 'disabled';"); C.WriteLine("var PHP_PGO = 'no';"); C.WriteLine("var PHP_PGI = 'no';"); +C.WriteLine("var PHP_VERSION=" + PHP_VERSION); +C.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION); +C.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION); +C.WriteLine("var PHP_EXTRA_VERSION=\"" + PHP_EXTRA_VERSION + "\""); +C.WriteLine("var PHP_VERSION_STRING=\"" + PHP_VERSION_STRING + "\""); + C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js")); if (FSO.FileExists(PHP_DIR + "/script/ext_pickle.js")) { C.Write(file_get_contents(PHP_DIR + "//script//ext_pickle.js")); |