From 20c42b71eddd25dc75eae3f0c9b11e7266de20c2 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Sat, 22 Apr 2023 17:42:19 +0900 Subject: [PATCH] Add MPL headers to files that didn't have an explicit license Also relicense the cinnabarclone extension for mercurial to MPL. --- CI/decision.py | 4 ++++ CI/docker.py | 4 ++++ CI/hg-serve-exec.py | 4 ++++ CI/msys.py | 4 ++++ CI/osx.py | 4 ++++ CI/package.mk | 4 ++++ CI/start-worker.sh | 3 +++ CI/tasks.py | 4 ++++ CI/tests.mk | 4 ++++ CI/tools.py | 4 ++++ CI/util.py | 4 ++++ CI/variables.py | 4 ++++ Makefile | 4 ++++ download.py | 4 ++++ mercurial/cinnabarclone.py | 5 +++-- src/build.mk | 4 ++++ 16 files changed, 62 insertions(+), 2 deletions(-) diff --git a/CI/decision.py b/CI/decision.py index ac31caccb..b99be00e0 100644 --- a/CI/decision.py +++ b/CI/decision.py @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + import hashlib import json import os diff --git a/CI/docker.py b/CI/docker.py index 5270213de..7f0988336 100644 --- a/CI/docker.py +++ b/CI/docker.py @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + import hashlib import json diff --git a/CI/hg-serve-exec.py b/CI/hg-serve-exec.py index 54dc77b5f..b6e26c3b7 100644 --- a/CI/hg-serve-exec.py +++ b/CI/hg-serve-exec.py @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + from __future__ import print_function import base64 import os diff --git a/CI/msys.py b/CI/msys.py index 02c1b99d1..7d980d9ff 100644 --- a/CI/msys.py +++ b/CI/msys.py @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + import hashlib import re diff --git a/CI/osx.py b/CI/osx.py index 4030784f3..951fe32ad 100644 --- a/CI/osx.py +++ b/CI/osx.py @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + import hashlib from tasks import ( diff --git a/CI/package.mk b/CI/package.mk index 8e1fffa4d..f5c64e69b 100644 --- a/CI/package.mk +++ b/CI/package.mk @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + TOPDIR = $(abspath $(or $(dir $(firstword $(MAKEFILE_LIST))),$(CURDIR))/..) ifeq (a,$(firstword a$(subst /, ,$(abspath .)))) diff --git a/CI/start-worker.sh b/CI/start-worker.sh index 78af81f9d..ee1c8bf80 100755 --- a/CI/start-worker.sh +++ b/CI/start-worker.sh @@ -1,4 +1,7 @@ #!/bin/sh +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. where=$(dirname $0) clientId=$1 diff --git a/CI/tasks.py b/CI/tasks.py index 6d8bb4747..9de3b1e65 100644 --- a/CI/tasks.py +++ b/CI/tasks.py @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + import base64 import datetime import json diff --git a/CI/tests.mk b/CI/tests.mk index 9888d24b9..21c67a858 100644 --- a/CI/tests.mk +++ b/CI/tests.mk @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + TOPDIR = $(abspath $(or $(dir $(firstword $(MAKEFILE_LIST))),$(CURDIR))/..) ifeq (a,$(firstword a$(subst /, ,$(abspath .)))) diff --git a/CI/tools.py b/CI/tools.py index e33a5669f..d67c994b7 100644 --- a/CI/tools.py +++ b/CI/tools.py @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + import hashlib import os diff --git a/CI/util.py b/CI/util.py index 0b5a6458c..2d714e408 100644 --- a/CI/util.py +++ b/CI/util.py @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + import os import subprocess diff --git a/CI/variables.py b/CI/variables.py index 243d39b7e..39d8b8d25 100644 --- a/CI/variables.py +++ b/CI/variables.py @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + import json import os diff --git a/Makefile b/Makefile index d69a18223..e84ecd70c 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + .PHONY: all all: diff --git a/download.py b/download.py index 15dbe4ff9..1bfd44409 100755 --- a/download.py +++ b/download.py @@ -1,4 +1,8 @@ #!/bin/sh +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + ''':' if command -v python3 > /dev/null; then PYTHON=python3 diff --git a/mercurial/cinnabarclone.py b/mercurial/cinnabarclone.py index df21e435b..75ab62fd9 100644 --- a/mercurial/cinnabarclone.py +++ b/mercurial/cinnabarclone.py @@ -1,5 +1,6 @@ -# This software may be used and distributed according to the terms of the -# GNU General Public License version 2 or any later version. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. """Advertize pre-generated git-cinnabar clones diff --git a/src/build.mk b/src/build.mk index 917123e52..b4a8c28ae 100644 --- a/src/build.mk +++ b/src/build.mk @@ -1,3 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + ifdef NO_CURL $(error Cannot build without curl) endif