com web/rmtools: fix the way it fetches the sources: client/include/PickleJob.php client/include/PickleWeb.php client/script/pickle.php

Commit: 9b13c80bc00a19f9769fbb9d87148184df32c78f Author: Anatol Belski <ab@php.net> Tue, 12 May 2015 19:04:28 +0200 Parents: c86affbafd5fa7b55bba161f70a13b2c9abfcbbb Branches: master pecl_legacy Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=9b13c80bc00a19f9769fbb9d87148184df32c78f Log: fix the way it fetches the sources Changed paths: M client/include/PickleJob.php M client/include/PickleWeb.php M client/script/pickle.php Diff: diff --git a/client/include/PickleJob.php b/client/include/PickleJob.php index 09f62b1..5bf6c4c 100644 --- a/client/include/PickleJob.php +++ b/client/include/PickleJob.php @@ -32,14 +32,14 @@ class PickleJob public function add(array $tag) { - if (!isset($tag["support"]["source"])) { - throw new \Exception("Tag source location isn't set, no jub created for '$tag[name]-$tag[version]'"); + if (!isset($tag["source"]["url"])) { + throw new \Exception("Tag source location isn't set, no job created for '$tag[name]-$tag[version]'"); } $data = array( "name" => $tag["name"], "version" => $tag["version"], - "src" => $tag["support"]["source"], + "src" => $tag["source"]["url"] . "#" . $tag["version"], "status" => "new", ); diff --git a/client/include/PickleWeb.php b/client/include/PickleWeb.php index 2eace71...dec83a5 100644 --- a/client/include/PickleWeb.php +++ b/client/include/PickleWeb.php @@ -149,8 +149,8 @@ class PickleWeb !empty($tag["name"]) && isset($tag["version"]) && !empty($tag["version"]) && - isset($tag["support"]["source"]) && - !empty($tag["support"]["source"]) /* XXX might check at least the URL format */; + isset($tag["source"]["url"]) && + !empty($tag["source"]["url"]) /* XXX might check at least the URL format */; } public function diffTags(array $remote, array $local) diff --git a/client/script/pickle.php b/client/script/pickle.php index 563c858..dcb55e1 100644 --- a/client/script/pickle.php +++ b/client/script/pickle..php @@ -98,9 +98,12 @@ foreach ($builds as $build_name) { continue; } - echo "Running pickle build" . PHP_EOL; + echo "Starting pickle build" . PHP_EOL; try { + $cmd = $build->getPickleCmdToRun($ext); + echo "Pickle command is " . PHP_EOL . " $cmd" . PHP_EOL; + $ret = $build->build($ext); } catch (Exception $e) { echo 'Error: ' . $e->getMessage() . PHP_EOL;