Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION
This commit is contained in:
Christoph M. Becker 2020-11-19 16:28:27 +01:00
commit dc8fb9dc8b
2 changed files with 16 additions and 6 deletions

View file

@ -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 = 1;
var PHP_RELEASE_VERSION = 0;
var PHP_EXTRA_VERSION = "";
var PHP_VERSION_STRING = "8.1.0";
if (!MODE_PHPIZE) {
/* defaults; we pick up the precise versions from configure.ac */
var PHP_VERSION = 8;
var PHP_MINOR_VERSION = 1;
var PHP_RELEASE_VERSION = 0;
var PHP_EXTRA_VERSION = "";
var PHP_VERSION_STRING = "8.1.0";
}
/* Get version numbers and DEFINE as a string */
function get_version_numbers()
@ -2339,6 +2341,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) */");