Skip to content

[stable10] license and mailmap backports #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 4 commits into from
Jul 22, 2016
Merged

[stable10] license and mailmap backports #513

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f4db2d
Fix the license script
nickvergessen Jul 21, 2016
d3a11e9
only search the license header for @copyright statements
schiessle Jul 21, 2016
2d5a854
Fix more mailmap entries
nickvergessen Jul 21, 2016
a08e201
Fix e-mail in mailmap
rullzer Jul 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
only search the license header for @copyright statements
  • Loading branch information
@schiessle @nickvergessen
schiessle authored and nickvergessen committed Jul 22, 2016
commit d3a11e9cf1bd55bc5930863ed3dd2cc29822eb58
5 changes: 3 additions & 2 deletions build/license.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,10 @@ private function eatOldLicense($source) {

private function getCopyrightNotices($path, $file) {
$licenseHeaderEndsAtLine = (int)trim(shell_exec("grep -n '*/' $path | head -n 1 | cut -d ':' -f 1"));
$lineByLine = explode(PHP_EOL, $file, $licenseHeaderEndsAtLine);
$lineByLine = explode(PHP_EOL, $file, $licenseHeaderEndsAtLine + 1);
$copyrightNotice = [];
foreach ($lineByLine as $line) {
$licensePart = array_slice($lineByLine, 0, $licenseHeaderEndsAtLine);
foreach ($licensePart as $line) {
if (strpos($line, '@copyright') !== false) {
$copyrightNotice[] = $line;
}
Expand Down