com web/rmtools: implemented ext ignore per config and added some: client/data/config/pecl/exts.ini client/include/PeclExt.php client/script/pecl.php

Commit: a58487748814c2667c51bb40ebbc4e316a38ef85 Author: Anatol Belski <ab@php.net> Thu, 26 Sep 2013 19:47:49 +0200 Parents: a3df4f16c42fb71e72ff18a554b07c09ea23f382 Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=a58487748814c2667c51bb40ebbc4e316a38ef85 Log: implemented ext ignore per config and added some Changed paths: M client/data/config/pecl/exts.ini M client/include/PeclExt.php M client/script/pecl.php Diff: diff --git a/client/data/config/pecl/exts.ini b/client/data/config/pecl/exts..ini index cbc397c..8dd4757 100644 --- a/client/data/config/pecl/exts.ini +++ b/client/data/config/pecl/exts.ini @@ -31,6 +31,7 @@ ; no_mail= - Send no alerts on extension builds ; Value is ignored, just set it. ; mailto= - Mail to send the build alerts to, that will override package.xml. +; ignore= - Do not bother with this ext when it comes in, just fall through ; [ssh2] @@ -418,3 +419,18 @@ libs[]=libswishe exts[]= opts[]= +; they redistribute binary builds themselves +[couchbase] +ignore=1 + +; commercial +[mcve] +ignore=1 + +[ingres] +ignore=1 + +; commercial +[perforce] +ignore=1 + diff --git a/client/include/PeclExt.php b/client/include/PeclExt.php index d116ea3..15edae8 100644 --- a/client/include/PeclExt.php +++ b/client/include/PeclExt.php @@ -844,5 +844,13 @@ if (!function_exists('rmtools\combinations')) { unset($ext); } } + + /* ignore me */ + public function sendToCoventry() + { + $config = $this->getPackageConfig(); + + return $config && isset($config['ignore']); + } } diff --git a/client/script/pecl.php b/client/script/pecl.php index 353cd13..4a68c21 100644 --- a/client/script/pecl.php +++ b/client/script/pecl.php @@ -113,6 +113,13 @@ foreach ($builds as $build_name) { try { $ext->init($force_name, $force_version); + + if ($ext->sendToCoventry()) { + echo "As per config, ignoring <" . $ext->getName() . ">" . PHP_EOL; + goto Coventry; + } + + $ext->setupNonCoreExtDeps(); $ext->putSourcesIntoBranch(); } catch (Exception $e) { @@ -279,6 +286,8 @@ foreach ($builds as $build_name) { } } +Coventry: + try { $db_path = __DIR__ . '/../data/pecl.sqlite'; $db = new rm\PeclDb($db_path); @@ -289,7 +298,9 @@ foreach ($builds as $build_name) { $build->clean(); $ext->cleanup($upload && $upload_success); - rm\rmdir_rf($toupload_dir); + if (isset($toupload_dir)) { + rm\rmdir_rf($toupload_dir); + } unset($ext); unset($build);