Skip to content

Commit b0b0789

Browse files
joshtriplettxwang98
authored andcommitted
Relicense to Apache-2.0 with the LLVM-exception (#137)
With agreement from contributors.
1 parent 49127ef commit b0b0789

File tree

360 files changed

+387
-4290
lines changed

Some content is hidden

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

360 files changed

+387
-4290
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ We want to make contributing to this project as easy and transparent as possible
88
- Proposing new features
99

1010
License
11-
=====================
12-
WAMR uses the permissive open source `Apache 2.0 license`_ that allows you to freely use, modify, distribute and sell your own products that include Apache 2.0 licensed software.
13-
Any contributions you make will be under the same license. Feel free to contact the maintainers if that's a concern.
11+
=======
12+
WAMR uses the same license as LLVM: the `Apache 2.0 license` with the LLVM
13+
exception. See the LICENSE file for details. This license allows you to freely
14+
use, modify, distribute and sell your own products based on WAMR.
15+
Any contributions you make will be under the same license.
1416

1517
Code changes
1618
===================

LICENSE

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,20 @@
200200
See the License for the specific language governing permissions and
201201
limitations under the License.
202202

203+
204+
--- LLVM Exceptions to the Apache 2.0 License ----
205+
206+
As an exception, if, as a result of your compiling your source code, portions
207+
of this Software are embedded into an Object form of such source code, you
208+
may redistribute such embedded portions in such Object form without complying
209+
with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
210+
211+
In addition, if you combine or link compiled forms of this Software with
212+
software that is licensed under the GPLv2 ("Combined Software") and if a
213+
court of competent jurisdiction determines that the patent provision (Section
214+
3), the indemnity provision (Section 9) or other Section of the License
215+
conflicts with the conditions of the GPLv2, you may retroactively and
216+
prospectively choose to deem waived or otherwise exclude such Section(s) of
217+
the License, but only in their entirety and only with respect to the Combined
218+
Software.
219+

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,12 @@ See the [roadmap](./doc/roadmap.md) to understand what major features are planed
117117
Please submit issues for any new feature request, or your plan for contributing new features.
118118

119119

120-
120+
License
121+
=======
122+
WAMR uses the same license as LLVM: the `Apache 2.0 license` with the LLVM
123+
exception. See the LICENSE file for details. This license allows you to freely
124+
use, modify, distribute and sell your own products based on WAMR.
125+
Any contributions you make will be under the same license.
121126

122127

123128
Submit issues and contact the maintainers

core/app-mgr/app-manager/CMakeLists.txt

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

154
include_directories (.
165
include

core/app-mgr/app-manager/app_manager.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
/*
22
* Copyright (C) 2019 Intel Corporation. All rights reserved.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
3+
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
154
*/
165

176
#include "app_manager.h"

core/app-mgr/app-manager/app_manager.h

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
/*
22
* Copyright (C) 2019 Intel Corporation. All rights reserved.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
3+
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
154
*/
165

176
#ifndef APP_MANAGER_H

core/app-mgr/app-manager/app_manager_host.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
/*
22
* Copyright (C) 2019 Intel Corporation. All rights reserved.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
3+
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
154
*/
165

176
#include "bh_common.h"

core/app-mgr/app-manager/app_manager_host.h

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
/*
22
* Copyright (C) 2019 Intel Corporation. All rights reserved.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
3+
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
154
*/
165

176
#ifndef _APP_MANAGER_HOST_H_

core/app-mgr/app-manager/app_mgr.cmake

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

154
set (__APP_MGR_DIR ${CMAKE_CURRENT_LIST_DIR})
165

core/app-mgr/app-manager/ble_msg.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
/*
22
* Copyright (C) 2019 Intel Corporation. All rights reserved.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
3+
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
154
*/
165

176
#if 0

0 commit comments

Comments
 (0)