CliArgs::REQUIRED|CliArgs::SINGLE|CliArgs::REQARG],
["g", "git", "Use `git ls-tree` to determine file list",
CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+ ["b", "branch", "Checkout this tag/branch",
+ CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG],
["p", "pecl", "Use PECL package.xml to determine file list, name and release",
CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
["d", "dest", "Destination directory",
* @return string local source
*/
private function download($source) {
- $this->info("Fetching remote source %s ...\n", $source);
-
if ($this->args->git) {
- $task = new Task\GitClone($source);
+ $task = new Task\GitClone($source, $this->args->branch);
} else {
- $task = new Task\StreamFetch($source, function($bytes_pct) {
- $this->info(" %3d%% [%s>%s] \r%s",
- floor($bytes_pct*100),
- str_repeat("=", round(50*$bytes_pct)),
- str_repeat(" ", round(50*(1-$bytes_pct))),
- $bytes_pct == 1 ? "\n":""
- );
+ /* print newline only once */
+ $done = false;
+ $task = new Task\StreamFetch($source, function($bytes_pct) use(&$done) {
+ if (!$done) {
+ $this->info(" %3d%% [%s>%s] \r",
+ floor($bytes_pct*100),
+ str_repeat("=", round(50*$bytes_pct)),
+ str_repeat(" ", round(50*(1-$bytes_pct)))
+ );
+ if ($bytes_pct == 1) {
+ $done = true;
+ $this->info("\n");
+ }
+ }
});
}
$local = $task->run($this->verbosity());
* @return string extracted directory
*/
private function extract($source) {
- $this->debug("Extracting %s ...\n", $source);
-
- $task = new Task\Extract($source);
- $dest = $task->run($this->verbosity());
+ try {
+ $task = new Task\Extract($source);
+ $dest = $task->run($this->verbosity());
+ } catch (\Exception $e) {
+ if (false === strpos($e->getMessage(), "checksum mismatch")) {
+ throw $e;
+ }
+ $dest = (new Task\PaxFixup($source))->run($this->verbosity());
+ }
$this->cleanup[] = new Task\Cleanup($dest);
return $dest;
* @return string local source directory
*/
private function localize($source) {
- if (!stream_is_local($source)) {
+ if (!stream_is_local($source) || ($this->args->git && isset($this->args->branch))) {
$source = $this->download($source);
$this->cleanup[] = new Task\Cleanup($source);
}
$source = $this->extract($source);
$this->cleanup[] = new Task\Cleanup($source);
- if ($this->args->pecl) {
- $this->debug("Sanitizing PECL dir ...\n");
+ if (!$this->args->git) {
$source = (new Task\PeclFixup($source))->run($this->verbosity());
}
}
$this->source = new SourceDir\Pecl($source);
} elseif ($this->args["git"]) {
$this->source = new SourceDir\Git($source);
- } elseif (is_file("$source/parext_package.php")) {
+ } elseif (is_file("$source/pharext_package.php")) {
$this->source = include "$source/pharext_package.php";
+ } else {
+ $this->source = new SourceDir\Basic($source);
}
if (!$this->source instanceof SourceDir) {
*/
private function createPackage() {
try {
- $meta = array_merge($this->metadata(), [
- "date" => date("Y-m-d"),
+ $meta = array_merge(Metadata::all(), [
"name" => $this->args->name,
"release" => $this->args->release,
- "license" => @file_get_contents(current(glob($this->source->getBaseDir()."/LICENSE*"))),
- "stub" => "pharext_installer.php",
+ "license" => $this->source->getLicense(),
"type" => $this->args->zend ? "zend_extension" : "extension",
]);
- $file = (new Task\PharBuild($this->source, $meta))->run();
+ $file = (new Task\PharBuild($this->source, __DIR__."/../pharext_installer.php", $meta))->run($this->verbosity());
} catch (\Exception $e) {
$this->error("%s\n", $e->getMessage());
exit(self::EBUILD);