From 501c99b952de70e9e1d241ce8ed2dd6f1443b026 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Wed, 2 Apr 2025 09:24:43 -0400 Subject: [PATCH 1/4] Update the contributors list --- .mailfilter | 3 +++ .mailmap | 3 ++- CONTRIBUTORS.txt | 33 ++++++++++++++++++++++- scripts/generate_contributors_list.sh | 39 ++++++++++++++++++++++++--- 4 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 .mailfilter diff --git a/.mailfilter b/.mailfilter new file mode 100644 index 00000000..d675c816 --- /dev/null +++ b/.mailfilter @@ -0,0 +1,3 @@ +# This is a list of `shasum` hashed email addresses which are filtered from CONTRIBUTORS.txt, typically for privacy. +# Lines can be generated by running `echo -n 'My Name ' | shasum | head -c 40`. + diff --git a/.mailmap b/.mailmap index 253eec62..0c66d6ae 100644 --- a/.mailmap +++ b/.mailmap @@ -1 +1,2 @@ -Patrick Freed \ No newline at end of file +Patrick Freed +Chris McGee <87777443+cmcgee1024@users.noreply.github.com> diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index f317c56f..8353a651 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,9 +1,40 @@ For the purpose of tracking copyright, this is the list of individuals and -organizations who have contributed source code to swiftly. +organizations who have contributed to swiftly. + For employees of an organization/company where the copyright of work done by employees of that company is held by the company itself, only the company needs to be listed here. + ## COPYRIGHT HOLDERS + - Swift Server Work Group +- Apple Inc. (all contributors with '@apple.com') + ### Contributors + +- Adam Fowler +- Alexander <45719053+KeoFoxy@users.noreply.github.com> +- Chris McGee <87777443+cmcgee1024@users.noreply.github.com> +- Danny Mösch +- Danny Pang +- Johannes Weiss +- Joseph Heck +- Joseph Heck +- Kenta Kubo <601636+kkebo@users.noreply.github.com> +- Kenta Kubo <601636+kkk669@users.noreply.github.com> +- Mahdi Bahrami +- Mark O <72238042+MDO190000@users.noreply.github.com> +- Max Desiatov +- Mishal Shah +- Paris - Patrick Freed +- Paul LeMarquand +- Rauhul Varma +- Yuta Saito +- Yutaka +- johnbute +- vsarunas <3808892+vsarunas@users.noreply.github.com> + +**Updating this list** + +Please do not edit this file manually. It is generated using `./Utilities/generate_contributors_list.sh`. If a name is misspelled or appearing multiple times: add an entry in `./.mailmap` diff --git a/scripts/generate_contributors_list.sh b/scripts/generate_contributors_list.sh index 37d4fa6d..4ea78823 100755 --- a/scripts/generate_contributors_list.sh +++ b/scripts/generate_contributors_list.sh @@ -1,19 +1,50 @@ -#!/usr/bin/env bash +#!/bin/bash +##===----------------------------------------------------------------------===## +## +## This source file is part of the Swift open source project +## +## Copyright (c) 2025 Apple Inc. and the Swift project authors +## Licensed under Apache License v2.0 with Runtime Library Exception +## +## See http://swift.org/LICENSE.txt for license information +## See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors +## +##===----------------------------------------------------------------------===## set -eu here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -contributors=$( cd "$here"/.. && git shortlog -es | cut -f2 | sed 's/^/- /' ) +contributor_list=$( cd "$here"/.. && git shortlog -es | cut -f2 ) +filtered_hashes=$( cat "$here/../.mailfilter" | grep -E '^[a-z0-9]+$' | sort ) + +NL=$'\n' + +contributors='' +while IFS= read -r line; do + hashed="$(echo -n "$line" | shasum | head -c 40)" + found_hash=$(comm -12 <(echo "$hashed") <(echo "$filtered_hashes")) + if [ ! -z "$found_hash" ]; then + continue + fi + contributors="${contributors}- $line$NL" +done <<< "$contributor_list" cat > "$here/../CONTRIBUTORS.txt" <<- EOF For the purpose of tracking copyright, this is the list of individuals and - organizations who have contributed source code to swiftly. + organizations who have contributed to swiftly. + For employees of an organization/company where the copyright of work done by employees of that company is held by the company itself, only the company needs to be listed here. + ## COPYRIGHT HOLDERS + - Swift Server Work Group + - Apple Inc. (all contributors with '@apple.com') + ### Contributors + $contributors **Updating this list** - Please do not edit this file manually. It is generated using \`./scripts/generate_contributors_list.sh\`. If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\` + + Please do not edit this file manually. It is generated using \`./Utilities/generate_contributors_list.sh\`. If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\` EOF From dc2a575f27ac8ac2e8e5ba02f3dd1f2c0abd7a7e Mon Sep 17 00:00:00 2001 From: Chris McGee <87777443+cmcgee1024@users.noreply.github.com> Date: Wed, 2 Apr 2025 09:41:55 -0400 Subject: [PATCH 2/4] Update generate_contributors_list.sh --- scripts/generate_contributors_list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate_contributors_list.sh b/scripts/generate_contributors_list.sh index 4ea78823..8b2c4b24 100755 --- a/scripts/generate_contributors_list.sh +++ b/scripts/generate_contributors_list.sh @@ -46,5 +46,5 @@ cat > "$here/../CONTRIBUTORS.txt" <<- EOF $contributors **Updating this list** - Please do not edit this file manually. It is generated using \`./Utilities/generate_contributors_list.sh\`. If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\` + Please do not edit this file manually. It is generated using \`./scripts/generate_contributors_list.sh\`. If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\` EOF From 6b463454445e11eb9f0c3629bd69fd52fa3a48bc Mon Sep 17 00:00:00 2001 From: Chris McGee <87777443+cmcgee1024@users.noreply.github.com> Date: Wed, 2 Apr 2025 09:42:28 -0400 Subject: [PATCH 3/4] Update generate_contributors_list.sh --- scripts/generate_contributors_list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate_contributors_list.sh b/scripts/generate_contributors_list.sh index 8b2c4b24..814923fb 100755 --- a/scripts/generate_contributors_list.sh +++ b/scripts/generate_contributors_list.sh @@ -30,7 +30,7 @@ done <<< "$contributor_list" cat > "$here/../CONTRIBUTORS.txt" <<- EOF For the purpose of tracking copyright, this is the list of individuals and - organizations who have contributed to swiftly. + organizations who have contributed source code to swiftly. For employees of an organization/company where the copyright of work done by employees of that company is held by the company itself, only the company From 70d3836e793ae8187824d5a20bcb06a79e62cb0c Mon Sep 17 00:00:00 2001 From: Chris McGee <87777443+cmcgee1024@users.noreply.github.com> Date: Wed, 2 Apr 2025 09:42:53 -0400 Subject: [PATCH 4/4] Update CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 8353a651..1aabaa6b 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,5 +1,5 @@ For the purpose of tracking copyright, this is the list of individuals and -organizations who have contributed to swiftly. +organizations who have contributed source code to swiftly. For employees of an organization/company where the copyright of work done by employees of that company is held by the company itself, only the company