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

Show file tree
Hide file tree
Changes from all commits
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
19 changes: 10 additions & 9 deletions .mailmap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Björn Schießle <[email protected]> Björn Schießle <schiesbn@potato.(none)
Björn Schießle <[email protected]> Björn Schiessle <[email protected]>
Björn Schießle <[email protected]> Bjoern Schießle <[email protected]>
Björn Schießle <[email protected]> Bjoern Schiessle <[email protected]>
Björn Schießle <[email protected]> Björn Schießle <[email protected]>
BlackEagle <[email protected]>
Boris Rybalkin <[email protected]>
Borjan Tchakaloff <[email protected]>
Expand Down Expand Up @@ -302,18 +303,18 @@ Riccardo Iaconelli <[email protected]>
Richard Clarkson <[email protected]>
rnveach <[email protected]>
Robert Jäckel <[email protected]>
Robin Appelman <[email protected]> icewind1991 <[email protected]>
Robin Appelman <[email protected]> icewind1991 <[email protected]>
Robin Appelman <[email protected]> Robin <Robin Appelman [email protected]>
Robin Appelman <[email protected]> Robin <robin@Amaya.(none)>
Robin Appelman <[email protected]> Robin Appelman <[email protected]>
Robin Appelman <[email protected]> Robin Appelman <icewind1991@gmail>
Robin Appelman <[email protected]> Robin Appelman <robin@icewind.nl>
Robin Appelman <[email protected]> icewind1991 <[email protected]>
Robin Appelman <[email protected]> icewind1991 <[email protected]>
Robin Appelman <[email protected]> Robin <Robin Appelman [email protected]>
Robin Appelman <[email protected]> Robin <robin@Amaya.(none)>
Robin Appelman <[email protected]> Robin Appelman <[email protected]>
Robin Appelman <[email protected]> Robin Appelman <icewind1991@gmail>
Robin Appelman <[email protected]> Robin Appelman <icewind@owncloud.com>
Robin McCorkell <[email protected]> Robin McCorkell <[email protected]>
Robin McCorkell <[email protected]> Robin McCorkell <[email protected]>
Rodrigo Hjort <[email protected]>
Roeland Jago Douma <[email protected]> Roeland Jago Douma <[email protected]>
Roeland Jago Douma <[email protected]> Roeland Douma <[email protected]>
Roeland Jago Douma <[email protected]> Roeland Jago Douma <[email protected]>
Roeland Jago Douma <[email protected]> Roeland Douma <[email protected]>
rok <[email protected]>
Roland Hager <[email protected]>
Roland van Laar <[email protected]>
Expand Down
12 changes: 8 additions & 4 deletions build/license.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function exec($folder, $gitRoot = false) {

function writeAuthorsFile() {
ksort($this->authors);
$template = "ownCloud is written by:
$template = "Nextcloud is written by:
@AUTHORS@

With help from many libraries and frameworks including:
Expand Down 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 Expand Up @@ -277,7 +278,7 @@ private function checkCopyrightState($path, $gitRoot) {
private function printFilesToCheck() {
if (!empty($this->checkFiles)) {
print "\n";
print "For following files all lines changes since the Nextcloud fork." . PHP_EOL;
print "For following files all lines changed since the Nextcloud fork." . PHP_EOL;
print "Please check if these files can be moved over to AGPLv3 or later" . PHP_EOL;
print "\n";
foreach ($this->checkFiles as $file) {
Expand Down Expand Up @@ -349,6 +350,7 @@ private function checkCoreMailMap($author) {
$licenses->exec($argv[1], isset($argv[2]) ? $argv[1] : false);
} else {
$licenses->exec([
'../apps/admin_audit',
'../apps/comments',
'../apps/dav',
'../apps/encryption',
Expand All @@ -362,8 +364,10 @@ private function checkCoreMailMap($author) {
'../apps/provisioning_api',
'../apps/systemtags',
'../apps/testing',
'../apps/theming',
'../apps/updatenotification',
'../apps/user_ldap',
'../build/integration/features/bootstrap',
'../core',
'../lib',
'../ocs',
Expand Down