Skip to content

Commit

Permalink
Merge pull request #9090 from kiko/license/add-licenses-master/OTP-19…
Browse files Browse the repository at this point in the history
…363/PR-9090

otp: adds licenses to files that require it

OTP-19363
  • Loading branch information
kikofernandez authored Nov 26, 2024
2 parents c7df5c7 + 6586cfe commit a83f774
Show file tree
Hide file tree
Showing 9 changed files with 142 additions and 1 deletion.
20 changes: 20 additions & 0 deletions .github/workflows/upload-windows-zip.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
##
## %CopyrightBegin%
##
## Copyright 2024 Wojtek Mach <[email protected]>
##
## 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:
Expand Down
3 changes: 3 additions & 0 deletions erts/etc/win32/INSTALL.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
%% SPDX-License-Identifier: Apache-2.0
%% Copyright 2024 Ericsson and the Erlang/OTP contributors

Welcome to Erlang/OTP!

This Erlang installation requires "Microsoft Visual C++ Redistributable". Unless it is already
Expand Down
19 changes: 19 additions & 0 deletions lib/asn1/test/asn1_SUITE_data/SwCDR.asn1config
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
%%
%% %CopyrightBegin%
%%
%% Copyright 2024 Vance Shipley <[email protected]>
%%
%% 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,
Expand Down
2 changes: 1 addition & 1 deletion lib/asn1/test/test_exclusive_decode_rest.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 2003-2024. All Rights Reserved.
%% Copyright 2024 Vance Shipley <[email protected]>
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand Down
20 changes: 20 additions & 0 deletions lib/compiler/test/beam_doc_SUITE_data/behaviours.erl
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
%%
%% %CopyrightBegin%
%%
%% Copyright 2024 Jonatan Kłosko <[email protected]>
%%
%% 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([]).
Expand Down
19 changes: 19 additions & 0 deletions lib/compiler/test/beam_doc_SUITE_data/source_annotations.erl
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
%%
%% %CopyrightBegin%
%%
%% Copyright 2024 Jonatan Kłosko <[email protected]>
%%
%% 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,
Expand Down
20 changes: 20 additions & 0 deletions lib/compiler/test/beam_doc_SUITE_data/source_path.erl
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
%%
%% %CopyrightBegin%
%%
%% Copyright 2024 Jonatan Kłosko <[email protected]>
%%
%% 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([]).
Expand Down
20 changes: 20 additions & 0 deletions lib/stdlib/test/erl_lint_SUITE_data/bad_behaviour3.erl
Original file line number Diff line number Diff line change
@@ -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]).

Expand Down
20 changes: 20 additions & 0 deletions lib/stdlib/test/escript_SUITE_data/bypass_unicode_conversion
Original file line number Diff line number Diff line change
@@ -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)}]),
Expand Down

0 comments on commit a83f774

Please sign in to comment.