You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2019/05/23 13:02:01 UTC
[incubator-weex] branch release/0.24 updated: Update license
This is an automated email from the ASF dual-hosted git repository.
kyork pushed a commit to branch release/0.24
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/release/0.24 by this push:
new c1bc774 Update license
c1bc774 is described below
commit c1bc774e4fd1e3007ae0f50fade707c759c10c15
Author: YorkShen <sh...@gmail.com>
AuthorDate: Thu May 23 20:57:38 2019 +0800
Update license
---
LICENSE | 89 ++++++++++++++++++++--
android/sdk/build.gradle | 6 +-
.../Source/base/android/jni/scoped_java_ref.h | 1 -
.../jniheader/ContentBoxMeasurement_jni.h | 4 +-
.../jniheader/NativeRenderObjectUtils_jni.h | 3 -
.../jniprebuild/jniheader/RequestHandler_jni.h | 3 -
.../jniheader/SystemMessageHandler_jni.h | 3 -
.../android/jniprebuild/jniheader/WXBridge_jni.h | 3 -
.../jniprebuild/jniheader/WXDebugJsBridge_jni.h | 3 -
.../jniprebuild/jniheader/WXJsFunctions_jni.h | 3 -
.../android/jniprebuild/jniheader/WXParams_jni.h | 3 -
weex_core/Source/include/wtf/Brigand.h | 18 -----
weex_core/Source/include/wtf/Optional.h | 18 -----
weex_core/Source/include/wtf/Variant.h | 18 -----
14 files changed, 90 insertions(+), 85 deletions(-)
diff --git a/LICENSE b/LICENSE
index 5f8eb7e..d404dba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -212,6 +212,7 @@ conditions of the following licenses.
This product bundles vuejs v1.0.12, which is available under a
"MIT" license. For details, see https://github.com/vuejs/vue/blob/v1.0.12/LICENSE and following files:
+ src/js-framework/dist/index.js
runtime/frameworks/legacy/core/array.js
runtime/frameworks/legacy/core/dep.js
runtime/frameworks/legacy/core/object.js
@@ -250,6 +251,27 @@ This product bundles json11 v1.0.0, which is available under a "MIT" license.For
weex_core/Source/third_party/json11/json11.cc
weex_core/Source/third_party/json11/json11.hpp
+ /* Copyright (c) 2013 Dropbox, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
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/third_party/modp_b64/LICENSE and following files:
weex_core/Source/base/base64/base64.cpp
weex_core/Source/base/base64/base64.h
@@ -258,7 +280,14 @@ This product bundles chromium v66.0.3344.2, which is available under a "BSD-styl
weex_core/Source/base/base64/modp_base64/modp_b64.h
weex_core/Source/base/android/jniprebuild/jni_generator.py
-This product bundles Webkit 2.17.4, which is available under a "BSD 2-clause" license. For details, see https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.17.4 and following files:
+ # Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+This product bundles Android Open Source Project vandroid-4.2.2_r1, which is available under a "BSD" license. For details, see https://android.googlesource.com/platform/bionic/+/android-4.2.2_r1/libc/README and following files:
+ weex_core/Source/IPC/futex.h
+
+This product bundles Webkit 2.17.4, which is available under a "BSD 2-clause" license. For details, reference https://webkit.org/licensing-webkit/ for license(Weex only uses the files under BSD license) and see https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.17.4 for following files:
Files under: weex_core/Source/android/jsengine/dependence/
OptionsCommon.cmake
OptionsJSCOnly.cmake
@@ -381,7 +410,57 @@ This product bundles Webkit 2.17.4, which is available under a "BSD 2-clause" li
utypes.h
uvernum.h
uversion.h
-
-This product bundles Android Open Source Project vandroid-4.2.2_r1, which is available under a "BSD" license. For details, see https://android.googlesource.com/platform/bionic/+/android-4.2.2_r1/libc/README and following files:
- weex_core/Source/IPC/futex.h
-
+
+ The copyright for files above is listed below:
+
+ COPYRIGHT AND PERMISSION NOTICE
+
+ Copyright (c) 1995-2006 International Business Machines Corporation and others
+
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ software and associated documentation files (the "Software"), to deal in the Software
+ without restriction, including without limitation the rights to use, copy, modify,
+ merge, publish, distribute, and/or sell copies of the Software, and to permit persons
+ to whom the Software is furnished to do so, provided that the above copyright notice(s)
+ and this permission notice appear in all copies of the Software and that both the above
+ copyright notice(s) and this permission notice appear in supporting documentation.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+ OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
+ CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Except as contained in this notice, the name of a copyright holder shall not be used in
+ advertising or otherwise to promote the sale, use or other dealings in this Software
+ without prior written authorization of the copyright holder.
+
+
+ /*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
\ No newline at end of file
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 8c29d56..9304b8b 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -227,7 +227,11 @@ if(file('../license/LICENSE').exists()){
'Source/android/jniprebuild/jniheader/*.h',
'Source/base/Compatible.cpp',
'Source/IPC/**/*.h','Source/IPC/**/*.cpp', 'Source/IPC/**/*.c',
- 'weex_core/Source/android/jsengine/dependence/**/*.*'])
+ 'weex_core/Source/android/jsengine/dependence/**/*.h',
+ 'weex_core/Source/android/jsengine/dependence/**/*.cpp',
+ 'weex_core/Source/include/wtf/Optional.h',
+ 'weex_core/Source/include/wtf/Brigand.h',
+ 'weex_core/Source/include/wtf/Variant.h'])
}
preBuild.dependsOn licenseFormat
}
diff --git a/weex_core/Source/base/android/jni/scoped_java_ref.h b/weex_core/Source/base/android/jni/scoped_java_ref.h
index caaa60d..408452e 100644
--- a/weex_core/Source/base/android/jni/scoped_java_ref.h
+++ b/weex_core/Source/base/android/jni/scoped_java_ref.h
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Copyright 2017 The WeexCore Authors. All rights reserved.
#ifndef WeexCore_BASE_ANDROID_SCOPED_JAVA_REF_H_
#define WeexCore_BASE_ANDROID_SCOPED_JAVA_REF_H_
diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
index 1076b75..dd92724 100644
--- a/weex_core/Source/base/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
+++ b/weex_core/Source/base/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
@@ -16,9 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+
// This file is autogenerated by
// weex-core2/weex_core/Source/android/jniprebuild/jni_generator.py
diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h
index 4d18cf7..2a71a70 100644
--- a/weex_core/Source/base/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h
+++ b/weex_core/Source/base/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h
@@ -16,9 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
// This file is autogenerated by
// incubator-weex/weex_core/Source/android/jniprebuild/jni_generator.py
diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/RequestHandler_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/RequestHandler_jni.h
index ee9e5c2..581c4c7 100644
--- a/weex_core/Source/base/android/jniprebuild/jniheader/RequestHandler_jni.h
+++ b/weex_core/Source/base/android/jniprebuild/jniheader/RequestHandler_jni.h
@@ -16,9 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
// This file is autogenerated by
// weex/weex_core/Source/android/jniprebuild/jni_generator.py
diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/SystemMessageHandler_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
index 590ff31..3df56e9 100644
--- a/weex_core/Source/base/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
+++ b/weex_core/Source/base/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
@@ -16,9 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
// This file is autogenerated by
// incubator-weex/weex_core/Source/android/jniprebuild/jni_generator.py
diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/WXBridge_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/WXBridge_jni.h
index 58beb18..ab8e084 100644
--- a/weex_core/Source/base/android/jniprebuild/jniheader/WXBridge_jni.h
+++ b/weex_core/Source/base/android/jniprebuild/jniheader/WXBridge_jni.h
@@ -16,9 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
// This file is autogenerated by
// incubator-weex/weex_core/Source/android/jniprebuild/jni_generator.py
diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h
index e95cf72..458f435 100644
--- a/weex_core/Source/base/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h
+++ b/weex_core/Source/base/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h
@@ -16,9 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
// This file is autogenerated by
// weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/WXJsFunctions_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/WXJsFunctions_jni.h
index 97b35af..2a18241 100644
--- a/weex_core/Source/base/android/jniprebuild/jniheader/WXJsFunctions_jni.h
+++ b/weex_core/Source/base/android/jniprebuild/jniheader/WXJsFunctions_jni.h
@@ -16,9 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
// This file is autogenerated by
// weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/WXParams_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/WXParams_jni.h
index 65dd72b..a215be4 100644
--- a/weex_core/Source/base/android/jniprebuild/jniheader/WXParams_jni.h
+++ b/weex_core/Source/base/android/jniprebuild/jniheader/WXParams_jni.h
@@ -16,9 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
// This file is autogenerated by
// incubator-weex/weex_core/Source/android/jniprebuild/jni_generator.py
diff --git a/weex_core/Source/include/wtf/Brigand.h b/weex_core/Source/include/wtf/Brigand.h
index d582882..2000a82 100644
--- a/weex_core/Source/include/wtf/Brigand.h
+++ b/weex_core/Source/include/wtf/Brigand.h
@@ -1,21 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
// Brigand library
//
// Copyright (c) 2015 Edouard Alligand and Joel Falcou
diff --git a/weex_core/Source/include/wtf/Optional.h b/weex_core/Source/include/wtf/Optional.h
index c21d184..2b3c7c1 100644
--- a/weex_core/Source/include/wtf/Optional.h
+++ b/weex_core/Source/include/wtf/Optional.h
@@ -1,21 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
// Copyright (C) 2011 - 2012 Andrzej Krzemienski.
//
// Use, modification, and distribution is subject to the Boost Software
diff --git a/weex_core/Source/include/wtf/Variant.h b/weex_core/Source/include/wtf/Variant.h
index f8fccfd..6d4a739 100644
--- a/weex_core/Source/include/wtf/Variant.h
+++ b/weex_core/Source/include/wtf/Variant.h
@@ -1,21 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
// Copyright (c) 2015, Just Software Solutions Ltd
// All rights reserved.
//