Skip to content

Commit 6dc6ef8

Browse files
kikofernandezkikofernandez
committed
Merge branch 'fix-license-wx' into maint
* fix-license-wx: fix wxwidget code gen for wxwindows-free license add wxwindows-free license add missing license header OTP-19735
2 parents bd1fd82 + 1b0da67 commit 6dc6ef8

237 files changed

Lines changed: 8281 additions & 4 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎FILE-HEADERS/Apache-2.0-AND-SGI-B-2.0.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Licensed under the Apache License, Version 2.0 (the "License");
2+
you may not use this file except in compliance with the License.
3+
You may obtain a copy of the License at
4+
5+
http://www.apache.org/licenses/LICENSE-2.0
6+
7+
Unless required by applicable law or agreed to in writing, software
8+
distributed under the License is distributed on an "AS IS" BASIS,
9+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
See the License for the specific language governing permissions and
11+
limitations under the License.

‎lib/wx/api_gen/gen_util.erl‎

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,17 @@ erl_gl_copyright() ->
225225
erl_copyright_template("Apache-2.0 AND SGI-B-2.0").
226226

227227
erl_copyright() ->
228-
erl_copyright("Apache-2.0").
228+
erl_copyright_template("Apache-2.0").
229229

230230
erl_wx_copyright() ->
231-
erl_copyright("Apache-2.0 AND LicenseRef-scancode-wxwindows-free-doc-3").
231+
erl_copyright_template("Apache-2.0 AND LicenseRef-scancode-wxwindows-free-doc-3").
232232

233233
erl_copyright_template(License) ->
234234
StartYear = start_year(get(current_class)),
235235
{CurrentYear,_,_} = erlang:date(),
236236
w("%%~n",[]),
237-
w("%% %CopyrightBegin%
238-
w("%%
237+
w("%% %CopyrightBegin%~n",[]),
238+
w("%%~n",[]),
239239
w("%% SPDX-License-Identifier: ~n",[License]),
240240
w("%%~n",[]),
241241
w("%% Copyright Ericsson AB ~p-~p. All Rights Reserved.~n",
@@ -253,8 +253,49 @@ erl_copyright_template(License) ->
253253
w("%% See the License for the specific language governing permissions and~n",[]),
254254
w("%% limitations under the License.~n",[]),
255255
w("%%~n",[]),
256+
append_license(License),
256257
w("%% %CopyrightEnd%~n",[]).
257258

259+
append_license("Apache-2.0 AND LicenseRef-scancode-wxwindows-free-doc-3") ->
260+
w("%% For documentation, wxWindow Free Documentation License, Version 3 applies.~n",[]),
261+
w("%% wxWindows Free Documentation Licence, Version 3, as follows.~n",[]),
262+
w("%% ===============================================~n",[]),
263+
w("%%~n",[]),
264+
w("%% Everyone is permitted to copy and distribute verbatim copies~n",[]),
265+
w("%% of this licence document, but changing it is not allowed.~n",[]),
266+
w("%%~n",[]),
267+
w("%% WXWINDOWS FREE DOCUMENTATION LICENCE~n",[]),
268+
w("%% TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION~n",[]),
269+
w("%%~n",[]),
270+
w("%% 1. Permission is granted to make and distribute verbatim copies of this~n",[]),
271+
w("%% manual or piece of documentation provided any copyright notice and this~n",[]),
272+
w("%% permission notice are preserved on all copies.~n",[]),
273+
w("%%~n",[]),
274+
w("%% 2. Permission is granted to process this file or document through a~n",[]),
275+
w("%% document processing system and, at your option and the option of any third~n",[]),
276+
w("%% party, print the results, provided a printed document carries a copying~n",[]),
277+
w("%% permission notice identical to this one.~n",[]),
278+
w("%%~n",[]),
279+
w("%% 3. Permission is granted to copy and distribute modified versions of this~n",[]),
280+
w("%% manual or piece of documentation under the conditions for verbatim copying,~n",[]),
281+
w("%% provided also that any sections describing licensing conditions for this~n",[]),
282+
w("%% manual, such as, in particular, the GNU General Public Licence, the GNU~n",[]),
283+
w("%% Library General Public Licence, and any wxWindows Licence are included~n",[]),
284+
w("%% exactly as in the original, and provided that the entire resulting derived~n",[]),
285+
w("%% work is distributed under the terms of a permission notice identical to~n",[]),
286+
w("%% this one.~n",[]),
287+
w("%%~n",[]),
288+
w("%% 4. Permission is granted to copy and distribute translations of this manual~n",[]),
289+
w("%% or piece of documentation into another language, under the above conditions~n",[]),
290+
w("%% for modified versions, except that sections related to licensing, including~n",[]),
291+
w("%% this paragraph, may also be included in translations approved by the~n",[]),
292+
w("%% copyright holders of the respective licence documents in addition to the~n",[]),
293+
w("%% original English.~n",[]),
294+
w("%%~n",[]);
295+
append_license(_) ->
296+
ok.
297+
298+
258299
c_copyright() ->
259300
{CurrentYear,_,_} = erlang:date(),
260301
w("/*~n",[]),

‎lib/wx/src/gen/wxAcceleratorEntry.erl‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,41 @@
1717
%% See the License for the specific language governing permissions and
1818
%% limitations under the License.
1919
%%
20+
%% For documentation, wxWindow Free Documentation License, Version 3 applies.
21+
%% wxWindows Free Documentation Licence, Version 3, as follows.
22+
%% ===============================================
23+
%%
24+
%% Everyone is permitted to copy and distribute verbatim copies
25+
%% of this licence document, but changing it is not allowed.
26+
%%
27+
%% WXWINDOWS FREE DOCUMENTATION LICENCE
28+
%% TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
29+
%%
30+
%% 1. Permission is granted to make and distribute verbatim copies of this
31+
%% manual or piece of documentation provided any copyright notice and this
32+
%% permission notice are preserved on all copies.
33+
%%
34+
%% 2. Permission is granted to process this file or document through a
35+
%% document processing system and, at your option and the option of any third
36+
%% party, print the results, provided a printed document carries a copying
37+
%% permission notice identical to this one.
38+
%%
39+
%% 3. Permission is granted to copy and distribute modified versions of this
40+
%% manual or piece of documentation under the conditions for verbatim copying,
41+
%% provided also that any sections describing licensing conditions for this
42+
%% manual, such as, in particular, the GNU General Public Licence, the GNU
43+
%% Library General Public Licence, and any wxWindows Licence are included
44+
%% exactly as in the original, and provided that the entire resulting derived
45+
%% work is distributed under the terms of a permission notice identical to
46+
%% this one.
47+
%%
48+
%% 4. Permission is granted to copy and distribute translations of this manual
49+
%% or piece of documentation into another language, under the above conditions
50+
%% for modified versions, except that sections related to licensing, including
51+
%% this paragraph, may also be included in translations approved by the
52+
%% copyright holders of the respective licence documents in addition to the
53+
%% original English.
54+
%%
2055
%% %CopyrightEnd%
2156
%% This file is generated DO NOT EDIT
2257

‎lib/wx/src/gen/wxAcceleratorTable.erl‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,41 @@
1717
%% See the License for the specific language governing permissions and
1818
%% limitations under the License.
1919
%%
20+
%% For documentation, wxWindow Free Documentation License, Version 3 applies.
21+
%% wxWindows Free Documentation Licence, Version 3, as follows.
22+
%% ===============================================
23+
%%
24+
%% Everyone is permitted to copy and distribute verbatim copies
25+
%% of this licence document, but changing it is not allowed.
26+
%%
27+
%% WXWINDOWS FREE DOCUMENTATION LICENCE
28+
%% TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
29+
%%
30+
%% 1. Permission is granted to make and distribute verbatim copies of this
31+
%% manual or piece of documentation provided any copyright notice and this
32+
%% permission notice are preserved on all copies.
33+
%%
34+
%% 2. Permission is granted to process this file or document through a
35+
%% document processing system and, at your option and the option of any third
36+
%% party, print the results, provided a printed document carries a copying
37+
%% permission notice identical to this one.
38+
%%
39+
%% 3. Permission is granted to copy and distribute modified versions of this
40+
%% manual or piece of documentation under the conditions for verbatim copying,
41+
%% provided also that any sections describing licensing conditions for this
42+
%% manual, such as, in particular, the GNU General Public Licence, the GNU
43+
%% Library General Public Licence, and any wxWindows Licence are included
44+
%% exactly as in the original, and provided that the entire resulting derived
45+
%% work is distributed under the terms of a permission notice identical to
46+
%% this one.
47+
%%
48+
%% 4. Permission is granted to copy and distribute translations of this manual
49+
%% or piece of documentation into another language, under the above conditions
50+
%% for modified versions, except that sections related to licensing, including
51+
%% this paragraph, may also be included in translations approved by the
52+
%% copyright holders of the respective licence documents in addition to the
53+
%% original English.
54+
%%
2055
%% %CopyrightEnd%
2156
%% This file is generated DO NOT EDIT
2257

‎lib/wx/src/gen/wxActivateEvent.erl‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,41 @@
1717
%% See the License for the specific language governing permissions and
1818
%% limitations under the License.
1919
%%
20+
%% For documentation, wxWindow Free Documentation License, Version 3 applies.
21+
%% wxWindows Free Documentation Licence, Version 3, as follows.
22+
%% ===============================================
23+
%%
24+
%% Everyone is permitted to copy and distribute verbatim copies
25+
%% of this licence document, but changing it is not allowed.
26+
%%
27+
%% WXWINDOWS FREE DOCUMENTATION LICENCE
28+
%% TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
29+
%%
30+
%% 1. Permission is granted to make and distribute verbatim copies of this
31+
%% manual or piece of documentation provided any copyright notice and this
32+
%% permission notice are preserved on all copies.
33+
%%
34+
%% 2. Permission is granted to process this file or document through a
35+
%% document processing system and, at your option and the option of any third
36+
%% party, print the results, provided a printed document carries a copying
37+
%% permission notice identical to this one.
38+
%%
39+
%% 3. Permission is granted to copy and distribute modified versions of this
40+
%% manual or piece of documentation under the conditions for verbatim copying,
41+
%% provided also that any sections describing licensing conditions for this
42+
%% manual, such as, in particular, the GNU General Public Licence, the GNU
43+
%% Library General Public Licence, and any wxWindows Licence are included
44+
%% exactly as in the original, and provided that the entire resulting derived
45+
%% work is distributed under the terms of a permission notice identical to
46+
%% this one.
47+
%%
48+
%% 4. Permission is granted to copy and distribute translations of this manual
49+
%% or piece of documentation into another language, under the above conditions
50+
%% for modified versions, except that sections related to licensing, including
51+
%% this paragraph, may also be included in translations approved by the
52+
%% copyright holders of the respective licence documents in addition to the
53+
%% original English.
54+
%%
2055
%% %CopyrightEnd%
2156
%% This file is generated DO NOT EDIT
2257

‎lib/wx/src/gen/wxArtProvider.erl‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,41 @@
1717
%% See the License for the specific language governing permissions and
1818
%% limitations under the License.
1919
%%
20+
%% For documentation, wxWindow Free Documentation License, Version 3 applies.
21+
%% wxWindows Free Documentation Licence, Version 3, as follows.
22+
%% ===============================================
23+
%%
24+
%% Everyone is permitted to copy and distribute verbatim copies
25+
%% of this licence document, but changing it is not allowed.
26+
%%
27+
%% WXWINDOWS FREE DOCUMENTATION LICENCE
28+
%% TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
29+
%%
30+
%% 1. Permission is granted to make and distribute verbatim copies of this
31+
%% manual or piece of documentation provided any copyright notice and this
32+
%% permission notice are preserved on all copies.
33+
%%
34+
%% 2. Permission is granted to process this file or document through a
35+
%% document processing system and, at your option and the option of any third
36+
%% party, print the results, provided a printed document carries a copying
37+
%% permission notice identical to this one.
38+
%%
39+
%% 3. Permission is granted to copy and distribute modified versions of this
40+
%% manual or piece of documentation under the conditions for verbatim copying,
41+
%% provided also that any sections describing licensing conditions for this
42+
%% manual, such as, in particular, the GNU General Public Licence, the GNU
43+
%% Library General Public Licence, and any wxWindows Licence are included
44+
%% exactly as in the original, and provided that the entire resulting derived
45+
%% work is distributed under the terms of a permission notice identical to
46+
%% this one.
47+
%%
48+
%% 4. Permission is granted to copy and distribute translations of this manual
49+
%% or piece of documentation into another language, under the above conditions
50+
%% for modified versions, except that sections related to licensing, including
51+
%% this paragraph, may also be included in translations approved by the
52+
%% copyright holders of the respective licence documents in addition to the
53+
%% original English.
54+
%%
2055
%% %CopyrightEnd%
2156
%% This file is generated DO NOT EDIT
2257

‎lib/wx/src/gen/wxAuiDockArt.erl‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,41 @@
1717
%% See the License for the specific language governing permissions and
1818
%% limitations under the License.
1919
%%
20+
%% For documentation, wxWindow Free Documentation License, Version 3 applies.
21+
%% wxWindows Free Documentation Licence, Version 3, as follows.
22+
%% ===============================================
23+
%%
24+
%% Everyone is permitted to copy and distribute verbatim copies
25+
%% of this licence document, but changing it is not allowed.
26+
%%
27+
%% WXWINDOWS FREE DOCUMENTATION LICENCE
28+
%% TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
29+
%%
30+
%% 1. Permission is granted to make and distribute verbatim copies of this
31+
%% manual or piece of documentation provided any copyright notice and this
32+
%% permission notice are preserved on all copies.
33+
%%
34+
%% 2. Permission is granted to process this file or document through a
35+
%% document processing system and, at your option and the option of any third
36+
%% party, print the results, provided a printed document carries a copying
37+
%% permission notice identical to this one.
38+
%%
39+
%% 3. Permission is granted to copy and distribute modified versions of this
40+
%% manual or piece of documentation under the conditions for verbatim copying,
41+
%% provided also that any sections describing licensing conditions for this
42+
%% manual, such as, in particular, the GNU General Public Licence, the GNU
43+
%% Library General Public Licence, and any wxWindows Licence are included
44+
%% exactly as in the original, and provided that the entire resulting derived
45+
%% work is distributed under the terms of a permission notice identical to
46+
%% this one.
47+
%%
48+
%% 4. Permission is granted to copy and distribute translations of this manual
49+
%% or piece of documentation into another language, under the above conditions
50+
%% for modified versions, except that sections related to licensing, including
51+
%% this paragraph, may also be included in translations approved by the
52+
%% copyright holders of the respective licence documents in addition to the
53+
%% original English.
54+
%%
2055
%% %CopyrightEnd%
2156
%% This file is generated DO NOT EDIT
2257

‎lib/wx/src/gen/wxAuiManager.erl‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,41 @@
1717
%% See the License for the specific language governing permissions and
1818
%% limitations under the License.
1919
%%
20+
%% For documentation, wxWindow Free Documentation License, Version 3 applies.
21+
%% wxWindows Free Documentation Licence, Version 3, as follows.
22+
%% ===============================================
23+
%%
24+
%% Everyone is permitted to copy and distribute verbatim copies
25+
%% of this licence document, but changing it is not allowed.
26+
%%
27+
%% WXWINDOWS FREE DOCUMENTATION LICENCE
28+
%% TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
29+
%%
30+
%% 1. Permission is granted to make and distribute verbatim copies of this
31+
%% manual or piece of documentation provided any copyright notice and this
32+
%% permission notice are preserved on all copies.
33+
%%
34+
%% 2. Permission is granted to process this file or document through a
35+
%% document processing system and, at your option and the option of any third
36+
%% party, print the results, provided a printed document carries a copying
37+
%% permission notice identical to this one.
38+
%%
39+
%% 3. Permission is granted to copy and distribute modified versions of this
40+
%% manual or piece of documentation under the conditions for verbatim copying,
41+
%% provided also that any sections describing licensing conditions for this
42+
%% manual, such as, in particular, the GNU General Public Licence, the GNU
43+
%% Library General Public Licence, and any wxWindows Licence are included
44+
%% exactly as in the original, and provided that the entire resulting derived
45+
%% work is distributed under the terms of a permission notice identical to
46+
%% this one.
47+
%%
48+
%% 4. Permission is granted to copy and distribute translations of this manual
49+
%% or piece of documentation into another language, under the above conditions
50+
%% for modified versions, except that sections related to licensing, including
51+
%% this paragraph, may also be included in translations approved by the
52+
%% copyright holders of the respective licence documents in addition to the
53+
%% original English.
54+
%%
2055
%% %CopyrightEnd%
2156
%% This file is generated DO NOT EDIT
2257

‎lib/wx/src/gen/wxAuiManagerEvent.erl‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,41 @@
1717
%% See the License for the specific language governing permissions and
1818
%% limitations under the License.
1919
%%
20+
%% For documentation, wxWindow Free Documentation License, Version 3 applies.
21+
%% wxWindows Free Documentation Licence, Version 3, as follows.
22+
%% ===============================================
23+
%%
24+
%% Everyone is permitted to copy and distribute verbatim copies
25+
%% of this licence document, but changing it is not allowed.
26+
%%
27+
%% WXWINDOWS FREE DOCUMENTATION LICENCE
28+
%% TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
29+
%%
30+
%% 1. Permission is granted to make and distribute verbatim copies of this
31+
%% manual or piece of documentation provided any copyright notice and this
32+
%% permission notice are preserved on all copies.
33+
%%
34+
%% 2. Permission is granted to process this file or document through a
35+
%% document processing system and, at your option and the option of any third
36+
%% party, print the results, provided a printed document carries a copying
37+
%% permission notice identical to this one.
38+
%%
39+
%% 3. Permission is granted to copy and distribute modified versions of this
40+
%% manual or piece of documentation under the conditions for verbatim copying,
41+
%% provided also that any sections describing licensing conditions for this
42+
%% manual, such as, in particular, the GNU General Public Licence, the GNU
43+
%% Library General Public Licence, and any wxWindows Licence are included
44+
%% exactly as in the original, and provided that the entire resulting derived
45+
%% work is distributed under the terms of a permission notice identical to
46+
%% this one.
47+
%%
48+
%% 4. Permission is granted to copy and distribute translations of this manual
49+
%% or piece of documentation into another language, under the above conditions
50+
%% for modified versions, except that sections related to licensing, including
51+
%% this paragraph, may also be included in translations approved by the
52+
%% copyright holders of the respective licence documents in addition to the
53+
%% original English.
54+
%%
2055
%% %CopyrightEnd%
2156
%% This file is generated DO NOT EDIT
2257

0 commit comments

Comments
 (0)