com web/rmtools: fix licence packaging: client/include/PeclExt.php

Commit: c87e4835b1e1160153177145fe699edea4ce6691 Author: Anatol Belski <ab@php.net> Tue, 8 Oct 2013 16:52:02 +0200 Parents: 219dd107c0e9840c4a8620c2c8776795ffbe2a56 Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=c87e4835b1e1160153177145fe699edea4ce6691 Log: fix licence packaging Changed paths: M client/include/PeclExt.php Diff: diff --git a/client/include/PeclExt.php b/client/include/PeclExt.php index c6fc127..8f08745 100644 --- a/client/include/PeclExt.php +++ b/client/include/PeclExt.php @@ -615,6 +615,17 @@ if (!function_exists('rmtools\combinations')) { . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . $dll_name; + /* care about the dep libs licenses, the license file should be laying directly + in the corresponding lib dir*/ + $ret = array_merge( + $this->prepareLicenseSimple( + $deps_path . DIRECTORY_SEPARATOR . $lib, + $target, + $lib + ), + $ret + ); + if(file_exists($look_for)) { if (!copy($look_for, $dll_file)) { throw new \Exception("The dependency dll '$dll_name' " @@ -623,15 +634,6 @@ if (!function_exists('rmtools\combinations')) { $ret[] = $dll_file; /* some dep dll might have another dep :) */ $ret = array_merge($this->prepareAllDepDlls($look_for, $target), $ret); - /* care about the dep libs licenses */ - $ret = array_merge( - $this->prepareLicenseSimple( - $deps_path . DIRECTORY_SEPARATOR . $lib, - $target, - $lib - ), - $ret - ); } $look_for = $deps_path