You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2018/06/21 11:05:50 UTC
incubator-weex git commit: [WEEX-393][Core] Add LICENSE
Repository: incubator-weex
Updated Branches:
refs/heads/release f1b5a4065 -> 5e9a4d7b4
[WEEX-393][Core] Add LICENSE
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5e9a4d7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e9a4d7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e9a4d7b
Branch: refs/heads/release
Commit: 5e9a4d7b43256427beb9df6768b3eeb834e2bcd4
Parents: f1b5a40
Author: miomin <mi...@foxmail.com>
Authored: Thu Jun 21 17:32:15 2018 +0800
Committer: Adam Feng <cx...@gmail.com>
Committed: Thu Jun 21 19:05:08 2018 +0800
----------------------------------------------------------------------
LICENSE | 28 +++++++++++++++++--
POSSIBLE-NOTICES-FOR-BIN-DIST | 6 ++++
android/gradle/wrapper/gradle-wrapper.jar | Bin 52266 -> 0 bytes
android/sdk/build.gradle | 4 +--
.../Source/android/jniprebuild/jni_generator.py | 2 +-
.../Source/android/jniprebuild/prebuild.sh | 19 +++++++++++++
weex_core/Source/wson/wson.c | 18 ++++++++++++
7 files changed, 72 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e9a4d7b/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index a595ac8..422d450 100644
--- a/LICENSE
+++ b/LICENSE
@@ -319,7 +319,6 @@ android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java
For IPC
weex_core/Source/IPC
- weex_core/Source/base
/*
* Copyright (C) 2008 The Android Open Source Project
* All rights reserved.
@@ -349,9 +348,34 @@ android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java
*/
For JNI
- weex_core/Source/android/jniprebuild
+ weex_core/Source/android/jniprebuild/jniheader
/*
* 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.
*/
+
+ For modp
+ weex_core/Source/android/base
+ /*
+ * Copyright © 2005, 2006, Nick Galbreath -- nickg [at] modp [dot] com
+ * All rights reserved.
+ *
+ * http://modp.com/release/base64
+ *
+ * Released under bsd license. See modp_b64.c for details.
+ *
+ * The default implementation is the standard b64 encoding with padding.
+ * It's easy to change this to use "URL safe" characters and to remove
+ * padding. See the modp_b64.c source code for details.
+ *
+ */
+
+ For jni_generator
+ weex_core/Source/android/jniprebuild/jni_generator.py
+ /*
+ * !/usr/bin/env python
+ * 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.
+ */
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e9a4d7b/POSSIBLE-NOTICES-FOR-BIN-DIST
----------------------------------------------------------------------
diff --git a/POSSIBLE-NOTICES-FOR-BIN-DIST b/POSSIBLE-NOTICES-FOR-BIN-DIST
index 16b694b..0f65131 100644
--- a/POSSIBLE-NOTICES-FOR-BIN-DIST
+++ b/POSSIBLE-NOTICES-FOR-BIN-DIST
@@ -93,3 +93,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.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e9a4d7b/android/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index b5166da..0000000
Binary files a/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e9a4d7b/android/sdk/build.gradle
----------------------------------------------------------------------
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index d8ce3bc..2338a2d 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -214,12 +214,12 @@ if(file('../license/LICENSE').exists()){
}
task weex_core_license(type: com.hierynomus.gradle.license.tasks.LicenseFormat){
- source = fileTree(dir:"../../weex_core").include(['**/*.h','**/*.cpp', '**/*.cc']).
+ source = fileTree(dir:"../../weex_core").include(['**/*.h','**/*.cpp', '**/*.cc', '**/*.c']).
exclude(['Source/rapidjson/**/*.h','Source/rapidjson/**/*.cpp',
'Source/android/base/base64/**/*.h','Source/android/base/base64/**/*.cpp',
'Source/android/jniprebuild/jniheader/*.h',
'Source/base/Compatible.cpp',
- 'Source/IPC/**/*.h','Source/IPC/**/*.cpp'])
+ 'Source/IPC/**/*.h','Source/IPC/**/*.cpp', 'Source/IPC/**/*.c'])
}
preBuild.dependsOn licenseFormat
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e9a4d7b/weex_core/Source/android/jniprebuild/jni_generator.py
----------------------------------------------------------------------
diff --git a/weex_core/Source/android/jniprebuild/jni_generator.py b/weex_core/Source/android/jniprebuild/jni_generator.py
index 43a8a43..f7c52ef 100644
--- a/weex_core/Source/android/jniprebuild/jni_generator.py
+++ b/weex_core/Source/android/jniprebuild/jni_generator.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# !/usr/bin/env python
# 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.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e9a4d7b/weex_core/Source/android/jniprebuild/prebuild.sh
----------------------------------------------------------------------
diff --git a/weex_core/Source/android/jniprebuild/prebuild.sh b/weex_core/Source/android/jniprebuild/prebuild.sh
index c7db1fe..8eed73e 100755
--- a/weex_core/Source/android/jniprebuild/prebuild.sh
+++ b/weex_core/Source/android/jniprebuild/prebuild.sh
@@ -1,3 +1,22 @@
+/**
+ * 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.
+ */
+
#!/bin/bash
CURRENT_PATH=$(cd `dirname $0`; pwd)
ROOT_WEEX_JAVA_PATH=$CURRENT_PATH"/../../../../android/sdk/src/main/java/"
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e9a4d7b/weex_core/Source/wson/wson.c
----------------------------------------------------------------------
diff --git a/weex_core/Source/wson/wson.c b/weex_core/Source/wson/wson.c
index f0e7f67..3b1e8ac 100644
--- a/weex_core/Source/wson/wson.c
+++ b/weex_core/Source/wson/wson.c
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
//
// Created by furture on 2017/8/4.
//