com web/rmtools: make sure we exit with some non zero status on errors: client/include/Tools.php client/script/pecl.php
| From: | Stephen A. Zarkos | Date: | Sun, 01 Sep 2013 17:23:24 +0000 |
| Subject: | com web/rmtools: make sure we exit with some non zero status on errors: client/include/Tools.php client/script/pecl.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-16714@lists.php.net to get a copy of this message | ||
Commit: 55e7ad7ad9debd1a9da7f223d9768fb5afcfdc91
Author: Anatol Belski <ab@php.net> Sun, 1 Sep 2013 19:23:24 +0200
Parents: 943e4c489478c1e52e19ad9951b2797b7cda90dd
Branches: master
Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=55e7ad7ad9debd1a9da7f223d9768fb5afcfdc91
Log:
make sure we exit with some non zero status on errors
Changed paths:
M client/include/Tools.php
M client/script/pecl.php
Diff:
diff --git a/client/include/Tools.php b/client/include/Tools.php
index 5084793..d86ac0b 100644
--- a/client/include/Tools.php
+++ b/client/include/Tools.php
@@ -331,3 +331,13 @@ function copy_r($from, $to)
return false;
}
+function xmail($from, $to, $subject, $text, array $attachment = array())
+{
+ $header = array();
+ $boundary = '-----=' . md5(uniqid(mt_rand(), 1));
+
+ $header[] = "MIME-Version: 1.0";
+ $header[] = "Content-Type: multipart/mixed;";
+ $header[] = "boundary=\"$boundary\"";
+}
+
diff --git a/client/script/pecl.php b/client/script/pecl.php
index 310fcd3..74ac385 100644
--- a/client/script/pecl.php
+++ b/client/script/pecl.php
@@ -47,6 +47,9 @@ if (!is_dir($build_dir_parent)) {
$builds = $branch->getBuildList('windows');
+/* be optimistic */
+$build_error = 0;
+
echo "Using <$ext_tgz>\n";
/* Each windows configuration from the ini for the given PHP version will be built */
@@ -65,6 +68,7 @@ foreach ($builds as $build_name) {
} catch (Exception $e) {
echo $e->getMessage() . "\n";
$build->clean();
+ $build_error++;
/* XXX mail the ext dev what the error was, if it's something in the check
phase like missing config.w32, it's interesting for sure.
@@ -109,6 +113,7 @@ foreach ($builds as $build_name) {
//$html_make_log = $build->getMakeLogParsed();
} catch (Exception $e) {
echo $e->getMessage() . "\n";
+ $build_error++;
}
/* XXX PGO stuff would come here */
@@ -128,6 +133,7 @@ foreach ($builds as $build_name) {
$pkg_file = $ext->preparePackage();
} catch (Exception $e) {
echo $e->getMessage() . "\n";
+ $build_error++;
}
/*rm\upload_build_result_ftp_curl($toupload_dir, $branch_name . '/r' . $last_rev);*/
@@ -142,3 +148,5 @@ foreach ($builds as $build_name) {
echo "Done.\n";
+exit($build_error);
+