File tree Expand file tree Collapse file tree 3 files changed +18
-6
lines changed Expand file tree Collapse file tree 3 files changed +18
-6
lines changed Original file line number Diff line number Diff line change 5
5
- Core:
6
6
. Fixed bug #74558 (Can't rebind closure returned by Closure::fromCallable()).
7
7
(cmb)
8
+ . Fixed bug #80345 (PHPIZE configuration has outdated PHP_RELEASE_VERSION).
9
+ (cmb)
8
10
9
11
26 Nov 2020, PHP 7.4.13
10
12
Original file line number Diff line number Diff line change @@ -94,12 +94,14 @@ if (typeof(CWD) == "undefined") {
94
94
CWD = FSO . GetParentFolderName ( FSO . GetParentFolderName ( FSO . GetAbsolutePathName ( "main\\php_version.h" ) ) ) ;
95
95
}
96
96
97
- /* defaults; we pick up the precise versions from configure.ac */
98
- var PHP_VERSION = 7 ;
99
- var PHP_MINOR_VERSION = 4 ;
100
- var PHP_RELEASE_VERSION = 0 ;
101
- var PHP_EXTRA_VERSION = "" ;
102
- var PHP_VERSION_STRING = "7.4.0" ;
97
+ if ( ! MODE_PHPIZE ) {
98
+ /* defaults; we pick up the precise versions from configure.ac */
99
+ var PHP_VERSION = 7 ;
100
+ var PHP_MINOR_VERSION = 4 ;
101
+ var PHP_RELEASE_VERSION = 0 ;
102
+ var PHP_EXTRA_VERSION = "" ;
103
+ var PHP_VERSION_STRING = "7.4.0" ;
104
+ }
103
105
104
106
/* Get version numbers and DEFINE as a string */
105
107
function get_version_numbers ( )
@@ -2340,6 +2342,8 @@ function generate_phpize()
2340
2342
MF . WriteLine ( "var PHP_VERSION=" + PHP_VERSION ) ;
2341
2343
MF . WriteLine ( "var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION ) ;
2342
2344
MF . WriteLine ( "var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION ) ;
2345
+ MF . WriteLine ( "var PHP_EXTRA_VERSION=\"" + PHP_EXTRA_VERSION + "\"" ) ;
2346
+ MF . WriteLine ( "var PHP_VERSION_STRING=\"" + PHP_VERSION_STRING + "\"" ) ;
2343
2347
MF . WriteBlankLines ( 1 ) ;
2344
2348
MF . WriteLine ( "/* Genereted extensions list with mode (static/shared) */" ) ;
2345
2349
Original file line number Diff line number Diff line change @@ -217,6 +217,12 @@ C.WriteLine("var PHP_ANALYZER = 'disabled';");
217
217
C.WriteLine("var PHP_PGO = 'no';");
218
218
C.WriteLine("var PHP_PGI = 'no';");
219
219
220
+ C.WriteLine("var PHP_VERSION=" + PHP_VERSION);
221
+ C.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION);
222
+ C.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION);
223
+ C.WriteLine("var PHP_EXTRA_VERSION=\"" + PHP_EXTRA_VERSION + "\"");
224
+ C.WriteLine("var PHP_VERSION_STRING=\"" + PHP_VERSION_STRING + "\"");
225
+
220
226
C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js"));
221
227
if (FSO.FileExists(PHP_DIR + "/script/ext_pickle.js")) {
222
228
C.Write(file_get_contents(PHP_DIR + "//script//ext_pickle.js"));
You can’t perform that action at this time.
0 commit comments