From cfd13853f3a75eeab28f06fffea2cd7c48678c66 Mon Sep 17 00:00:00 2001 From: Kiko Fernandez-Reyes Date: Wed, 20 Nov 2024 12:56:21 +0100 Subject: [PATCH 1/3] otp: adds licenses to files that require it --- .github/workflows/upload-windows-zip.yaml | 20 +++++++++++++++++++ erts/etc/win32/INSTALL.txt | 2 ++ .../test/beam_doc_SUITE_data/behaviours.erl | 20 +++++++++++++++++++ .../source_annotations.erl | 19 ++++++++++++++++++ .../test/beam_doc_SUITE_data/source_path.erl | 20 +++++++++++++++++++ .../erl_lint_SUITE_data/bad_behaviour3.erl | 20 +++++++++++++++++++ .../bypass_unicode_conversion | 20 +++++++++++++++++++ 7 files changed, 121 insertions(+) diff --git a/.github/workflows/upload-windows-zip.yaml b/.github/workflows/upload-windows-zip.yaml index f8a59569641b..9f7f65092aca 100644 --- a/.github/workflows/upload-windows-zip.yaml +++ b/.github/workflows/upload-windows-zip.yaml @@ -1,3 +1,23 @@ +## +## %CopyrightBegin% +## +## Copyright Ericsson AB 1998-2021. All Rights Reserved. +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## +## %CopyrightEnd% +## + name: Upload windows .zip on: diff --git a/erts/etc/win32/INSTALL.txt b/erts/etc/win32/INSTALL.txt index 2ad9c539294b..c8c0a4e45e36 100644 --- a/erts/etc/win32/INSTALL.txt +++ b/erts/etc/win32/INSTALL.txt @@ -1,3 +1,5 @@ +%% SPDX-License-Identifier: Apache-2.0 + Welcome to Erlang/OTP! This Erlang installation requires "Microsoft Visual C++ Redistributable". Unless it is already diff --git a/lib/compiler/test/beam_doc_SUITE_data/behaviours.erl b/lib/compiler/test/beam_doc_SUITE_data/behaviours.erl index 4c5de47fb3ed..0b64d14132a8 100644 --- a/lib/compiler/test/beam_doc_SUITE_data/behaviours.erl +++ b/lib/compiler/test/beam_doc_SUITE_data/behaviours.erl @@ -1,3 +1,23 @@ +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 1996-2024. All Rights Reserved. +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%% +%% %CopyrightEnd% +%% + -module(behaviours). -export([]). diff --git a/lib/compiler/test/beam_doc_SUITE_data/source_annotations.erl b/lib/compiler/test/beam_doc_SUITE_data/source_annotations.erl index 9d59f1061687..933e46cbb722 100644 --- a/lib/compiler/test/beam_doc_SUITE_data/source_annotations.erl +++ b/lib/compiler/test/beam_doc_SUITE_data/source_annotations.erl @@ -1,3 +1,22 @@ +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 1996-2024. All Rights Reserved. +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%% +%% %CopyrightEnd% +%% -module(source_annotations). -export([main/1, diff --git a/lib/compiler/test/beam_doc_SUITE_data/source_path.erl b/lib/compiler/test/beam_doc_SUITE_data/source_path.erl index 0ca4df4665aa..0f0d30c62f28 100644 --- a/lib/compiler/test/beam_doc_SUITE_data/source_path.erl +++ b/lib/compiler/test/beam_doc_SUITE_data/source_path.erl @@ -1,3 +1,23 @@ +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 1996-2024. All Rights Reserved. +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%% +%% %CopyrightEnd% +%% + -module(source_path). -export([]). diff --git a/lib/stdlib/test/erl_lint_SUITE_data/bad_behaviour3.erl b/lib/stdlib/test/erl_lint_SUITE_data/bad_behaviour3.erl index b156f6184a29..d52be155bd38 100644 --- a/lib/stdlib/test/erl_lint_SUITE_data/bad_behaviour3.erl +++ b/lib/stdlib/test/erl_lint_SUITE_data/bad_behaviour3.erl @@ -1,3 +1,23 @@ +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 1996-2024. All Rights Reserved. +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%% +%% %CopyrightEnd% +%% + -module(bad_behaviour3). -export([behaviour_info/1]). diff --git a/lib/stdlib/test/escript_SUITE_data/bypass_unicode_conversion b/lib/stdlib/test/escript_SUITE_data/bypass_unicode_conversion index 4b08d103c58d..645fc13ed914 100644 --- a/lib/stdlib/test/escript_SUITE_data/bypass_unicode_conversion +++ b/lib/stdlib/test/escript_SUITE_data/bypass_unicode_conversion @@ -1,5 +1,25 @@ #!/usr/bin/env escript +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 1996-2024. All Rights Reserved. +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%% +%% %CopyrightEnd% +%% + main([Enc]) -> Data = {tuple, {list, lists:seq(1,1000000)}}, io:setopts(group_leader(), [{encoding, list_to_atom(Enc)}]), From 8855d7cc2f2aa9c915c13bb6b61d4c57cade5fd0 Mon Sep 17 00:00:00 2001 From: Kiko Fernandez-Reyes Date: Wed, 20 Nov 2024 13:06:28 +0100 Subject: [PATCH 2/3] otp: adds license to asn1 config file --- .../test/asn1_SUITE_data/SwCDR.asn1config | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/asn1/test/asn1_SUITE_data/SwCDR.asn1config b/lib/asn1/test/asn1_SUITE_data/SwCDR.asn1config index a2c96c43e98c..a0419e387f3c 100644 --- a/lib/asn1/test/asn1_SUITE_data/SwCDR.asn1config +++ b/lib/asn1/test/asn1_SUITE_data/SwCDR.asn1config @@ -1,3 +1,22 @@ +-- +-- %CopyrightBegin% +-- +-- Copyright Ericsson AB 1996-2024. All Rights Reserved. +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +-- %CopyrightEnd% + {exclusive_decode, {'SwCDR', [{decode_cdr, From 6586cfe0f247dfc96c089fc15cd218126890dea0 Mon Sep 17 00:00:00 2001 From: Kiko Fernandez-Reyes Date: Thu, 21 Nov 2024 10:28:54 +0100 Subject: [PATCH 3/3] license: adds copyrights to files --- .github/workflows/upload-windows-zip.yaml | 2 +- erts/etc/win32/INSTALL.txt | 1 + .../test/asn1_SUITE_data/SwCDR.asn1config | 36 +++++++++---------- lib/asn1/test/test_exclusive_decode_rest.erl | 2 +- .../test/beam_doc_SUITE_data/behaviours.erl | 2 +- .../source_annotations.erl | 2 +- .../test/beam_doc_SUITE_data/source_path.erl | 2 +- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/upload-windows-zip.yaml b/.github/workflows/upload-windows-zip.yaml index 9f7f65092aca..3ed953227517 100644 --- a/.github/workflows/upload-windows-zip.yaml +++ b/.github/workflows/upload-windows-zip.yaml @@ -1,7 +1,7 @@ ## ## %CopyrightBegin% ## -## Copyright Ericsson AB 1998-2021. All Rights Reserved. +## Copyright 2024 Wojtek Mach ## ## Licensed under the Apache License, Version 2.0 (the "License"); ## you may not use this file except in compliance with the License. diff --git a/erts/etc/win32/INSTALL.txt b/erts/etc/win32/INSTALL.txt index c8c0a4e45e36..2412b2ff489c 100644 --- a/erts/etc/win32/INSTALL.txt +++ b/erts/etc/win32/INSTALL.txt @@ -1,4 +1,5 @@ %% SPDX-License-Identifier: Apache-2.0 +%% Copyright 2024 Ericsson and the Erlang/OTP contributors Welcome to Erlang/OTP! diff --git a/lib/asn1/test/asn1_SUITE_data/SwCDR.asn1config b/lib/asn1/test/asn1_SUITE_data/SwCDR.asn1config index a0419e387f3c..932277fc947a 100644 --- a/lib/asn1/test/asn1_SUITE_data/SwCDR.asn1config +++ b/lib/asn1/test/asn1_SUITE_data/SwCDR.asn1config @@ -1,21 +1,21 @@ --- --- %CopyrightBegin% --- --- Copyright Ericsson AB 1996-2024. All Rights Reserved. --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- --- %CopyrightEnd% +%% +%% %CopyrightBegin% +%% +%% Copyright 2024 Vance Shipley +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%% +%% %CopyrightEnd% {exclusive_decode, {'SwCDR', diff --git a/lib/asn1/test/test_exclusive_decode_rest.erl b/lib/asn1/test/test_exclusive_decode_rest.erl index 2e17643369ce..944c5e461102 100644 --- a/lib/asn1/test/test_exclusive_decode_rest.erl +++ b/lib/asn1/test/test_exclusive_decode_rest.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2024. All Rights Reserved. +%% Copyright 2024 Vance Shipley %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/compiler/test/beam_doc_SUITE_data/behaviours.erl b/lib/compiler/test/beam_doc_SUITE_data/behaviours.erl index 0b64d14132a8..4715e183faf8 100644 --- a/lib/compiler/test/beam_doc_SUITE_data/behaviours.erl +++ b/lib/compiler/test/beam_doc_SUITE_data/behaviours.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2024. All Rights Reserved. +%% Copyright 2024 Jonatan Kłosko %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/compiler/test/beam_doc_SUITE_data/source_annotations.erl b/lib/compiler/test/beam_doc_SUITE_data/source_annotations.erl index 933e46cbb722..e5387ebc838b 100644 --- a/lib/compiler/test/beam_doc_SUITE_data/source_annotations.erl +++ b/lib/compiler/test/beam_doc_SUITE_data/source_annotations.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2024. All Rights Reserved. +%% Copyright 2024 Jonatan Kłosko %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/compiler/test/beam_doc_SUITE_data/source_path.erl b/lib/compiler/test/beam_doc_SUITE_data/source_path.erl index 0f0d30c62f28..093905488b63 100644 --- a/lib/compiler/test/beam_doc_SUITE_data/source_path.erl +++ b/lib/compiler/test/beam_doc_SUITE_data/source_path.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2024. All Rights Reserved. +%% Copyright 2024 Jonatan Kłosko %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License.