Skip to content

Commit 02b60a2

Browse files
committed
Tweaks for 7.1
1 parent 711558f commit 02b60a2

File tree

2 files changed

+31
-10
lines changed

2 files changed

+31
-10
lines changed

makephp

+30-10
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ switch($argv[1]) {
2727
case '55': $build[55]=true; break;
2828
case '54': $build[54]=true; break;
2929
case '5': $build = [56=>true,55=>true,54=>true]; break;
30-
case 'all': $build = [7=>true, 56=>true,55=>true,54=>true]; break;
30+
case 'all': $build = [71=>true, 7=>true, 56=>true,55=>true,54=>true]; break;
3131
case 'world': $build = [71=>true, 7=>true, 56=>true,55=>true,54=>true]; $world=true; break;
3232
}
3333

@@ -309,7 +309,7 @@ function build_it($branch, $conf_flags) {
309309
"git reset --hard origin/$branch 2>&1 1> /dev/null",
310310
"git pull -r",
311311
"./vcsclean 2>&1 1> /dev/null",
312-
"./buildconf -f",
312+
"./buildconf --force",
313313
"=configuring...",
314314
"./configure $conf_flags 2>&1 1>> /tmp/build.log",
315315
"=\ncompiling...",
@@ -331,24 +331,44 @@ echo "Build log in /tmp/build.log\n";
331331

332332
foreach($build as $v=>$b) {
333333
switch($v) {
334+
case 72:
335+
if(!$zts || $world) {
336+
echo "Building PHP 7.2\n";
337+
$conf_flags = implode(' ', $conf[$v]) . ' --disable-debug --prefix=/usr/local/php72';
338+
build_it('master', $conf_flags);
339+
echo "Building PHP 7.2-debug\n";
340+
$conf_flags = implode(' ', $conf[$v]) . ' --enable-debug --prefix=/usr/local/php72-debug';
341+
build_it('master', $conf_flags);
342+
}
343+
if($zts || $world) {
344+
echo "Building PHP 7.2-zts\n";
345+
$conf_flags = implode(' ', $conf[$v]) . ' --disable-debug --enable-maintainer-zts --prefix=/usr/local/php72-zts';
346+
build_it('master', $conf_flags);
347+
echo "Building PHP 7.2-debug-zts\n";
348+
$conf_flags = implode(' ', $conf[$v]) . ' --enable-debug --enable-maintainer-zts --prefix=/usr/local/php72-debug-zts';
349+
build_it('master', $conf_flags);
350+
}
351+
break;
352+
334353
case 71:
335354
if(!$zts || $world) {
336355
echo "Building PHP 7.1\n";
337356
$conf_flags = implode(' ', $conf[$v]) . ' --disable-debug --prefix=/usr/local/php71';
338-
build_it('master', $conf_flags);
357+
build_it('PHP-7.1', $conf_flags);
339358
echo "Building PHP 7.1-debug\n";
340359
$conf_flags = implode(' ', $conf[$v]) . ' --enable-debug --prefix=/usr/local/php71-debug';
341-
build_it('master', $conf_flags);
360+
build_it('PHP-7.1', $conf_flags);
342361
}
343362
if($zts || $world) {
344363
echo "Building PHP 7.1-zts\n";
345364
$conf_flags = implode(' ', $conf[$v]) . ' --disable-debug --enable-maintainer-zts --prefix=/usr/local/php71-zts';
346-
build_it('master', $conf_flags);
365+
build_it('PHP-7.1', $conf_flags);
347366
echo "Building PHP 7.1-debug-zts\n";
348367
$conf_flags = implode(' ', $conf[$v]) . ' --enable-debug --enable-maintainer-zts --prefix=/usr/local/php71-debug-zts';
349-
build_it('master', $conf_flags);
368+
build_it('PHP-7.1', $conf_flags);
350369
}
351370
break;
371+
352372
case 7:
353373
if(!$zts || $world) {
354374
echo "Building PHP 7.0\n";
@@ -357,7 +377,7 @@ foreach($build as $v=>$b) {
357377
echo "Building PHP 7.0-debug\n";
358378
$conf_flags = implode(' ', $conf[$v]) . ' --enable-debug --prefix=/usr/local/php70-debug';
359379
build_it('PHP-7.0', $conf_flags);
360-
}
380+
}
361381
if($zts || $world) {
362382
echo "Building PHP 7.0-zts\n";
363383
$conf_flags = implode(' ', $conf[$v]) . ' --disable-debug --enable-maintainer-zts --prefix=/usr/local/php70-zts';
@@ -376,7 +396,7 @@ foreach($build as $v=>$b) {
376396
echo "Building PHP 5.6-debug\n";
377397
$conf_flags = implode(' ', $conf[$v]) . ' --enable-debug --prefix=/usr/local/php56-debug';
378398
build_it('PHP-5.6', $conf_flags);
379-
}
399+
}
380400
if($zts || $world) {
381401
echo "Building PHP 5.6-zts\n";
382402
$conf_flags = implode(' ', $conf[$v]) . ' --disable-debug --enable-maintainer-zts --prefix=/usr/local/php56-zts';
@@ -395,7 +415,7 @@ foreach($build as $v=>$b) {
395415
echo "Building PHP 5.5-debug\n";
396416
$conf_flags = implode(' ', $conf[$v]) . ' --enable-debug --prefix=/usr/local/php55-debug';
397417
build_it('PHP-5.5', $conf_flags);
398-
}
418+
}
399419
if($zts || $world) {
400420
echo "Building PHP 5.5-zts\n";
401421
$conf_flags = implode(' ', $conf[$v]) . ' --disable-debug --enable-maintainer-zts --prefix=/usr/local/php55-zts';
@@ -414,7 +434,7 @@ foreach($build as $v=>$b) {
414434
echo "Building PHP 5.4-debug\n";
415435
$conf_flags = implode(' ', $conf[$v]) . ' --enable-debug --prefix=/usr/local/php54-debug --with-config-file-path=/etc/php54-debug --with-config-file-scan-dir=/etc/php54-debug/conf.d';
416436
build_it('PHP-5.4', $conf_flags);
417-
}
437+
}
418438
if($zts || $world) {
419439
echo "Building PHP 5.4-zts\n";
420440
$conf_flags = implode(' ', $conf[$v]) . ' --disable-debug --enable-maintainer-zts --prefix=/usr/local/php54-zts --with-config-file-path=/etc/php54-zts --with-config-file-scan-dir=/etc/php54-zts/conf.d';

newphp

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ $map = [
1515
'sbin/php-fpm'=>'sbin/php-fpm',
1616
'bin/phpdbg'=>'bin/phpdbg',
1717
'bin/pear'=>'bin/pear',
18+
'bin/peardev'=>'bin/peardev',
1819
'bin/pecl'=>'bin/pecl'
1920
];
2021

0 commit comments

Comments
 (0)