Skip to content
This repository was archived by the owner on Jun 3, 2021. It is now read-only.

Commit 4866487

Browse files
author
qianyuan.wqy
committed
Update license declaration.
1 parent 482db5b commit 4866487

File tree

3 files changed

+28
-36
lines changed

3 files changed

+28
-36
lines changed

LICENSE

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ This product bundles vuejs v1.0.12, which is available under a
246246
This product bundles Guava v20.0, which is available under a "Apache" license. For details, see https://github.com/google/guava/blob/v20.0/COPYING and following files:
247247
android_sdk/src/main/java/org/apache/taobao/weex/utils/WXDataStructureUtil.java
248248

249-
This product bundles json11 v1.0.0, which is available under a "MIT" license.For details, see https://github.com/dropbox/json11/tree/v1.0.0 and following files:
249+
This product bundles json11 v1.0.0, which is available under a "MIT" license. For details, see https://github.com/dropbox/json11/tree/v1.0.0 and following files:
250250
weex_core/Source/third_party/json11/CMakeLists.txt
251251
weex_core/Source/third_party/json11/json11.cc
252252
weex_core/Source/third_party/json11/json11.hpp
@@ -275,8 +275,6 @@ This product bundles json11 v1.0.0, which is available under a "MIT" license.For
275275
This product bundles chromium v66.0.3344.2, which is available under a "BSD-style" license. For details, see https://github.com/chromium/chromium/blob/66.0.3344.2/ and following files:
276276
modp_b64:
277277
The following files are copied from https://github.com/chromium/chromium/tree/master/third_party/modp_b64 and their names are listed below:
278-
weex_core/Source/base/base64/base64.cpp
279-
weex_core/Source/base/base64/base64.h
280278
weex_core/Source/base/base64/modp_base64/modp_b64_data.h
281279
weex_core/Source/base/base64/modp_base64/modp_b64.cc
282280
weex_core/Source/base/base64/modp_base64/modp_b64.h
@@ -707,4 +705,14 @@ This product bundles Webkit 2.17.4, which is available under a "BSD-style" licen
707705
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
708706
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
709707
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
710-
*/
708+
*/
709+
710+
This product bundles files from Boost under "Boost Software License". For more details, reference http://www.boost.org/LICENSE_1_0.txt
711+
weex_core/Source/js_runtime/utils/base64.hpp
712+
713+
//
714+
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
715+
//
716+
// Distributed under the Boost Software License, Version 1.0. (See accompanying
717+
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
718+
//

weex_core/Source/base/base64/modp_base64/modp_b64.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
/**
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
18-
*/
191
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4 -*- */
202
/* vi: set expandtab shiftwidth=4 tabstop=4: */
213

weex_core/Source/base/base64/modp_base64/modp_b64_data.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
/**
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* \file
3+
* <PRE>
4+
* High performance base64 encoder / decoder
5+
* Version 1.3 -- 17-Mar-2006
96
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
7+
* Copyright &copy; 2005, 2006, Nick Galbreath -- nickg [at] modp [dot] com
8+
* All rights reserved.
9+
*
10+
* http://modp.com/release/base64
11+
*
12+
* Released under bsd license. See modp_b64.c for details.
13+
* </pre>
14+
*
15+
* The default implementation is the standard b64 encoding with padding.
16+
* It's easy to change this to use "URL safe" characters and to remove
17+
* padding. See the modp_b64.c source code for details.
1118
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
1819
*/
20+
1921
// VC8 doesn't have stdint.h. On the other hand, some compilers don't like
2022
// the below code, because basictypes.h itself includes stdint.h and the
2123
// typedefs below can cause conflicts.

0 commit comments

Comments
 (0)