Merge remote-tracking branch 'github/master' into develop-data-render…

…-script
gubaojian · Nov 29, 2018 · 0f21755 · 0f21755
2 parents 5cf90a9 + a49f83a
commit 0f21755
Show file tree

Hide file tree

Showing 217 changed files with 9,940 additions and 2,676 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,11 @@
+* @YorkShen @wqyfavor
+
+/android/ @gubaojian @YorkShen @Darin726
+
+/ios/ @wqyfavor
+
+/runtime/ @Hanks10100
+
+/weex_core/ @YorkShen @Darin726 @alwaysfight
+
+/weex_core/Source/core/ @YorkShen
diff --git a/HOW-TO-BUILD.md b/HOW-TO-BUILD.md
@@ -1,5 +1,5 @@
-# Weex Apache Source Release   
-Weex produce SDKs to integrate to iOS/Android/Mobile web applications. This file will cover how to build Weex from source. You can either use the script we provided or manually build from source step by step.   
+# Weex Apache Source Release
+Weex produce SDKs to integrate to iOS/Android/Mobile web applications. This file will cover how to build Weex from source. You can either use the script we provided or manually build from source step by step.
 See `README.md` for further information about Weex Framework.
 
 Weex SDK includes 3 different SDKs to use in corresponding system/browser:
@@ -15,8 +15,9 @@ The environment required to build weex as follow:
     * NodeJS 4.0+
     * JDK 1.6+
     * Android SDK(`$ANDROID_HOME` must be set properly)
-    * Android NDK(`$ANDROID_NDK` must be set properly)
     * Gradle 2.0+
+    * NDK r16
+    * CMake 3.9.0+
 * iOS SDK:
     * NodeJS 4.0+
     * XCode & Command Tools 8.0+
@@ -27,7 +28,7 @@ This article was tested in MacOSX system.
 
 # Build All by Script
 
-This script will build Android and iOS SDKs:   
+This script will build Android and iOS SDKs:
 > `$ bash scripts/build_from_source.sh`
 
 This's may take a while. After that, you can look into `dist/`, `android/sdk/build/output/` and `ios/sdk/Products` for Web/Android/iOS SDK artifacts.
@@ -48,14 +49,14 @@ Build the javascript libraries:
 > `$ npm run build:source`
 
 ### Before build Native SDK
-Move `min` version to Native SDK folder, which will be used by native SDK build.   
-> `cp packages/weex-js-framework/index.min.js ios_sdk/WeexSDK/Resources/main.js`   
+Move `min` version to Native SDK folder, which will be used by native SDK build.
+> `cp packages/weex-js-framework/index.min.js ios_sdk/WeexSDK/Resources/main.js`
 > `cp packages/weex-js-framework/index.min.js android_sdk/assets/main.js`
 
-## Build Android SDK    
-Make sure you have install gradle, see more details about 'how to install gradle' in [gradle website](https://gradle.org/install).   
-execute root folder of project   
-> `$ gradle wrapper --gradle-version 2.14.1`   
+## Build Android SDK
+Make sure you have install gradle, see more details about 'how to install gradle' in [gradle website](https://gradle.org/install).
+execute root folder of project
+> `$ gradle wrapper --gradle-version 2.14.1`
 
 Create a Gradle setting file
 > `$ echo 'include ":android_sdk"'>settings.gradle`

diff --git a/LICENSE b/LICENSE
@@ -202,156 +202,63 @@
    limitations under the License.
 
 
-*/
-
-For the vuejs components:
-html5/frameworks/legacy/core/array.js
-html5/frameworks/legacy/core/dep.js
-html5/frameworks/legacy/core/object.js
-html5/frameworks/legacy/core/observer.js
-html5/frameworks/legacy/core/state.js
-html5/frameworks/legacy/core/watcher.js
-/*
-The MIT License (MIT)
-
-Copyright (c) 2013-2015 Yuxi Evan You
-
-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.
-*/
-
-For Guava
-android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java
-/*
- * Copyright (C) 2007 The Guava Authors
- *
- * 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.
- */
-
- For fpconv
- weex_core/Source/core/parser/dom_parser.cpp
- /*
-  * Copyright (c) 2013 Andreas Samoljuk
-  *
-  * 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.
-  */
-
- For rapidjson
- weex_core/Source/core/parser/dom_parser.cpp
- /*
-  * Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  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, 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.
-  */
-
- For flexbox-layout
- weex_core/Source/core/layout
- /*
-  * Copyright (C) 2016 The flexbox-layout Authors
-  *
-  * 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.
-  */
-
- For IPC
- weex_core/Source/IPC
- weex_core/Source/base
- /*
-  * Copyright (C) 2008 The Android Open Source Project
-  * All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-  * are met:
-  *  * Redistributions of source code must retain the above copyright
-  *    notice, this list of conditions and the following disclaimer.
-  *  * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  * "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 THE
-  * COPYRIGHT OWNER 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.
-  */
-
- For JNI
- weex_core/Source/android/jniprebuild
- /*
-  * 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.
-  */
+==============================================================================
+
+Apache Weex Submodules:
+
+Apache Weex includes a number of submodules with separate copyright notices
+and license terms. Your use of these submodules is subject to the terms and
+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:
+  runtime/frameworks/legacy/core/array.js
+  runtime/frameworks/legacy/core/dep.js
+  runtime/frameworks/legacy/core/object.js
+  runtime/frameworks/legacy/core/observer.js
+  runtime/frameworks/legacy/core/state.js
+  runtime/frameworks/legacy/core/watcher.js
+
+  The MIT License (MIT)
+
+  Copyright (c) 2013-2014 Yuxi Evan You
+
+  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 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:
+  android_sdk/src/main/java/org/apache/taobao/weex/utils/WXDataStructureUtil.java
+
+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/android/base/base64/base64.cpp
+  weex_core/Source/android/base/base64/base64.h
+  weex_core/Source/android/base/base64/modp_base64/modp_b64_data.h
+  weex_core/Source/android/base/base64/modp_base64/modp_b64.cc
+  weex_core/Source/android/base/base64/modp_base64/modp_b64.h
+  weex_core/Source/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
+  weex_core/Source/android/jniprebuild/jniheader/MeasureMode_jni.h
+  weex_core/Source/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h
+  weex_core/Source/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
+  weex_core/Source/android/jniprebuild/jniheader/WXBridge_jni.h
+  weex_core/Source/android/jniprebuild/jniheader/WXJsFunctions_jni.h
+  weex_core/Source/android/jniprebuild/jni_generator.py
+
+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
+
diff --git a/POSSIBLE-NOTICES-FOR-BIN-DIST b/POSSIBLE-NOTICES-FOR-BIN-DIST
@@ -84,3 +84,9 @@ by google  , licensed under the Apache License.
 
 This product contains software JNI(https://chromium.googlesource.com/) developed
 by google, licensed under the BSD-style License.
+
+This product contains software modp(http://modp.com/release/base64) developed
+by modp, licensed under the BSD-style License.
+
+This product contains software jni_generator(https://chromium.googlesource.com/) developed
+by google, licensed under the BSD-style License.