You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by GitBox <gi...@apache.org> on 2018/11/13 14:48:49 UTC
[GitHub] jondong closed pull request #1752: [Release] Added missing Apache
license
jondong closed pull request #1752: [Release] Added missing Apache license
URL: https://github.com/apache/incubator-weex/pull/1752
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle
index ba27f35f4f..6870572ef6 100755
--- a/android/playground/app/build.gradle
+++ b/android/playground/app/build.gradle
@@ -13,7 +13,7 @@ android {
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
versionCode 17
- versionName "0.19.0"
+ versionName "0.20.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
ndk{
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 476d6736ac..85a6674f5b 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -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.
+ */
+
buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -36,7 +55,7 @@ checkstyle {
}
-version = "0.19.0.4"
+version = "0.20.0"
android {
diff --git a/android/sdk/gradle.properties b/android/sdk/gradle.properties
index 08b9d65cdf..c621f8c509 100755
--- a/android/sdk/gradle.properties
+++ b/android/sdk/gradle.properties
@@ -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.
+
+
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
diff --git a/android/sdk/proguard-rules.pro b/android/sdk/proguard-rules.pro
index 73247bc730..957227f8c9 100755
--- a/android/sdk/proguard-rules.pro
+++ b/android/sdk/proguard-rules.pro
@@ -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.
+
+
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/ouy/Library/AndroidStudio/sdk/tools/proguard/proguard-android.txt
@@ -19,4 +38,4 @@
-keep class com.taobao.weex.layout.** { *; }
-keep class com.taobao.weex.WXSDKEngine { *; }
-keep class com.taobao.weex.base.SystemMessageHandler { *; }
--dontwarn com.taobao.weex.bridge.**
\ No newline at end of file
+-dontwarn com.taobao.weex.bridge.**
diff --git a/android/sdk/publish.sh b/android/sdk/publish.sh
index 4d70a7ce00..7700dd320b 100755
--- a/android/sdk/publish.sh
+++ b/android/sdk/publish.sh
@@ -1,2 +1,21 @@
#!/usr/bin/env bash
-./gradlew clean assemble publish
\ No newline at end of file
+
+#
+# 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.
+
+./gradlew clean assemble publish
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
index d58bb8318d..4dd1ab9ab6 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
@@ -6,9 +6,9 @@
* 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
@@ -20,7 +20,7 @@
#ifndef __WX_DEFINE_H__
#define __WX_DEFINE_H__
-#define WX_SDK_VERSION @"0.19.0"
+#define WX_SDK_VERSION @"0.20.0"
#if defined(__cplusplus)
#define WX_EXTERN extern "C" __attribute__((visibility("default")))
@@ -125,8 +125,8 @@ parts = [parts subarrayWithRange:(NSRange){0, parts.count - 1}];\
#endif
/**
- * @abstract Compared with system version of current device
- *
+ * @abstract Compared with system version of current device
+ *
* @return YES if greater than or equal to the system verison, otherwise, NO.
*
*/
diff --git a/runtime/frameworks/legacy/core/array.js b/runtime/frameworks/legacy/core/array.js
index 856792fea8..5199a48b15 100644
--- a/runtime/frameworks/legacy/core/array.js
+++ b/runtime/frameworks/legacy/core/array.js
@@ -1,5 +1,22 @@
/* eslint-disable */
-
+/*
+ * 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.
+ */
import { def } from '../util/index'
diff --git a/runtime/frameworks/legacy/core/dep.js b/runtime/frameworks/legacy/core/dep.js
index 6c29bf6020..fca61aaff7 100644
--- a/runtime/frameworks/legacy/core/dep.js
+++ b/runtime/frameworks/legacy/core/dep.js
@@ -1,5 +1,22 @@
/* eslint-disable */
-
+/*
+ * 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.
+ */
import { remove } from '../util/index'
diff --git a/runtime/frameworks/legacy/core/object.js b/runtime/frameworks/legacy/core/object.js
index 86f83e3df9..ffb456eaa0 100644
--- a/runtime/frameworks/legacy/core/object.js
+++ b/runtime/frameworks/legacy/core/object.js
@@ -1,5 +1,22 @@
/* eslint-disable */
-
+/*
+ * 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.
+ */
import * as _ from '../util/index'
var objProto = Object.prototype
diff --git a/runtime/frameworks/legacy/core/observer.js b/runtime/frameworks/legacy/core/observer.js
index 103dd0d23b..fa26e4cb0b 100644
--- a/runtime/frameworks/legacy/core/observer.js
+++ b/runtime/frameworks/legacy/core/observer.js
@@ -1,5 +1,22 @@
/* eslint-disable */
-
+/*
+ * 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.
+ */
import Dep from './dep'
import { arrayMethods } from './array'
diff --git a/runtime/frameworks/legacy/core/state.js b/runtime/frameworks/legacy/core/state.js
index 5300dbfbad..b43b57c31e 100644
--- a/runtime/frameworks/legacy/core/state.js
+++ b/runtime/frameworks/legacy/core/state.js
@@ -1,5 +1,22 @@
/* eslint-disable */
-
+/*
+ * 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.
+ */
import Watcher from './watcher'
import Dep from './dep'
diff --git a/runtime/frameworks/legacy/core/watcher.js b/runtime/frameworks/legacy/core/watcher.js
index cfd637037f..4644315c2d 100644
--- a/runtime/frameworks/legacy/core/watcher.js
+++ b/runtime/frameworks/legacy/core/watcher.js
@@ -1,5 +1,22 @@
/* eslint-disable */
-
+/*
+ * 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.
+ */
import Dep, { pushTarget, popTarget } from './dep'
// import { pushWatcher } from './batcher'
diff --git a/scripts/build_from_source.sh b/scripts/build_from_source.sh
index 0757d9e4ba..da380282c2 100755
--- a/scripts/build_from_source.sh
+++ b/scripts/build_from_source.sh
@@ -18,20 +18,22 @@
set -e
if [ ! -f scripts/build_from_source.sh ];then
- echo "This script must execute in project root"
+ echo "This script must be executed from project root."
exit 1
fi
-echo "Build Weex SDK From Source...."
+echo "Build Weex SDK from source...."
npm install
npm run build:jsfm
npm run build:polyfill
+npm run build:rax
echo "Weex JS Framework build completed."
sleep 2
-mkdir pre-build
+# Copy built JS resources to their destination.
+[ -d pre-build ] || mkdir pre-build
cp dist/weex-js-framework.min.js pre-build/native-bundle-main.js
cp dist/weex-js-framework.min.js android_sdk/assets/native-bundle-main.js
cp dist/weex-js-framework.min.js pre-build/weex-main-jsfm.js
@@ -40,10 +42,12 @@ cp dist/weex-polyfill.min.js pre-build/weex-polyfill.js
cp dist/weex-rax.min.js pre-build/weex-rax-api.js
cp dist/weex-rax.min.js android_sdk/assets/weex-rax-api.js
+# Build android_sdk
gradle wrapper --gradle-version 4.4
echo 'include ":android_sdk"'>settings.gradle
./gradlew :android_sdk:assemble -PasfRelease
-xcodebuild -project ios_sdk/WeexSDK.xcodeproj -target WeexSDK_MTL
+# Build iOS sdk
+xcodebuild -project ios_sdk/WeexSDK.xcodeproj -scheme WeexSDK_MTL
echo "Weex SDK Build completed."
diff --git a/scripts/generate_apache_release.sh b/scripts/generate_apache_release.sh
index 9076513daf..d339337f20 100755
--- a/scripts/generate_apache_release.sh
+++ b/scripts/generate_apache_release.sh
@@ -32,9 +32,10 @@ rm -rf $dest/android/sdk/src/test/java/com
mv $dest/ios/sdk $dest/ios_sdk
mv $dest/android/sdk $dest/android_sdk
-$SED_CMD -i '' 's/\.\.\/\.\.\/weex_core/\.\.\/weex_core/g' $dest/android_sdk/build.gradle
+$SED_CMD -i '' 's/\.\.\/\.\.\/weex_core/\.\.\/weex_core/g' $dest/android_sdk/build.gradle $dest/ios_sdk/WeexSDK.xcodeproj/project.pbxproj
$SED_CMD -i '' 's/\.\.\/\.\.\/pre-build/\.\.\/pre-build/g' $dest/android_sdk/build.gradle $dest/ios_sdk/WeexSDK.xcodeproj/project.pbxproj
+[ -d "$dest/ios_sdk/build" ] && rm -rf "$dest/ios_sdk/build"
mv $dest/android/build.gradle $dest/build.gradle
rm -rf $dest/android $dest/ios
-rm -rf $dest/android_sdk/gradle
\ No newline at end of file
+rm -rf $dest/android_sdk/gradle
diff --git a/weex_core/CMakeLists.txt b/weex_core/CMakeLists.txt
index 2894e59436..b0dfca0dcf 100644
--- a/weex_core/CMakeLists.txt
+++ b/weex_core/CMakeLists.txt
@@ -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.
+#
cmake_minimum_required(VERSION 3.4.1)
project(WeexCore)
add_subdirectory(Source)
diff --git a/weex_core/Source/CMakeLists.txt b/weex_core/Source/CMakeLists.txt
index 8b9df20db5..92b84beec6 100644
--- a/weex_core/Source/CMakeLists.txt
+++ b/weex_core/Source/CMakeLists.txt
@@ -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.
+#
cmake_minimum_required(VERSION 3.4.1)
set(WEEXCORE_LIBRARY_NAME weexcore)
diff --git a/weex_core/Source/IPC/CMakeLists.txt b/weex_core/Source/IPC/CMakeLists.txt
index f95e0b395e..beb1551f58 100644
--- a/weex_core/Source/IPC/CMakeLists.txt
+++ b/weex_core/Source/IPC/CMakeLists.txt
@@ -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.
+#
+
cmake_minimum_required(VERSION 3.4.1)
set(IPC_LIBRARY_NAME weexipc)
diff --git a/weex_core/Source/core/data_render/class_factory.cc b/weex_core/Source/core/data_render/class_factory.cc
index bca5d9e8a8..4dccd81510 100644
--- a/weex_core/Source/core/data_render/class_factory.cc
+++ b/weex_core/Source/core/data_render/class_factory.cc
@@ -1,6 +1,21 @@
-//
-// Created by chad on 2018/7/19.
-//
+/*
+ * 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.
+ */
#include "core/data_render/class_factory.h"
#include "core/data_render/class.h"
@@ -22,7 +37,7 @@ Value ClassFactory::CreateClassDescriptor(ClassDescriptor *p_super) {
descs_.push_back(desc);
return value;
}
-
+
Value ClassFactory::CreateArray() {
Array *array = new Array();
Value value;
@@ -31,7 +46,7 @@ Value ClassFactory::CreateArray() {
arrays_.push_back(array);
return value;
}
-
+
Value ClassFactory::CreateTable() {
Table *table = new Table();
Value value;
@@ -40,7 +55,7 @@ Value ClassFactory::CreateTable() {
tables_.push_back(table);
return value;
}
-
+
Value ClassFactory::ClassString() {
ClassDescriptor *desc = NewClassString();
Value value;
@@ -49,7 +64,7 @@ Value ClassFactory::ClassString() {
descs_.push_back(desc);
return value;
}
-
+
Value ClassFactory::ClassJSON() {
ClassDescriptor *desc = NewClassJSON();
Value value;
@@ -58,7 +73,7 @@ Value ClassFactory::ClassJSON() {
descs_.push_back(desc);
return value;
}
-
+
Value ClassFactory::ClassArray() {
ClassDescriptor *desc = NewClassArray();
Value value;
@@ -67,7 +82,7 @@ Value ClassFactory::ClassArray() {
descs_.push_back(desc);
return value;
}
-
+
Value ClassFactory::ClassObject() {
ClassDescriptor *desc = NewClassOject();
Value value;
@@ -76,7 +91,7 @@ Value ClassFactory::ClassObject() {
descs_.push_back(desc);
return value;
}
-
+
int ClassFactory::findDesc(const ClassDescriptor *desc) {
int index = 0;
for (auto d : descs_) {
@@ -98,7 +113,7 @@ ClassInstance *ClassFactory::CreateClassInstanceFromSuper(ClassDescriptor *p_des
}
return inst;
}
-
+
Value ClassFactory::CreateClassInstance(ClassDescriptor *p_desc) {
ClassInstance *inst = CreateClassInstanceFromSuper(p_desc);
Value value;
diff --git a/weex_core/Source/core/data_render/tokenizer.cc b/weex_core/Source/core/data_render/tokenizer.cc
index a229196032..2d7ceec8e1 100644
--- a/weex_core/Source/core/data_render/tokenizer.cc
+++ b/weex_core/Source/core/data_render/tokenizer.cc
@@ -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.
+ */
+
#include "core/data_render/tokenizer.h"
#include "core/data_render/token.h"
#include "core/data_render/scanner.h"
@@ -16,12 +35,12 @@ namespace data_render {
// TokenizerState implementation
// -------------------------------
-
+
#ifdef __ANDROID__
#undef EOF
static const char EOF = -1;
#endif
-
+
class TokenizerState {
public:
static std::unordered_map<std::string, Token::Type> keywords;
@@ -578,7 +597,7 @@ Token Tokenizer::ParseString(char delim) {
}
Token::Type type = delim == '`' ? Token::TEMPLATE : Token::STRING;
-
+
if (utf8) {
buffer = utf8_decode(buffer);
}
@@ -680,5 +699,5 @@ Token Tokenizer::ParseNumber(char start) {
}
}
-}
+}
diff --git a/weex_core/Source/third_party/json11/CMakeLists.txt b/weex_core/Source/third_party/json11/CMakeLists.txt
index 148c31ffed..0296ab309c 100644
--- a/weex_core/Source/third_party/json11/CMakeLists.txt
+++ b/weex_core/Source/third_party/json11/CMakeLists.txt
@@ -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.
+#
+
cmake_minimum_required(VERSION 3.4.1)
set(JSON11_LIBRARY_NAME json11)
diff --git a/weex_core/Source/weexjsc_version_script.txt b/weex_core/Source/weexjsc_version_script.txt
index c34fbfce6c..69a28ec88e 100644
--- a/weex_core/Source/weexjsc_version_script.txt
+++ b/weex_core/Source/weexjsc_version_script.txt
@@ -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.
+#
{
global: *Inject_GCanvasFunc*; Java_com*; JNI_OnLoad; JNI_OnUnload;
local: *;
diff --git a/weex_core/Source/wson/CMakeLists.txt b/weex_core/Source/wson/CMakeLists.txt
index a331a391dd..e42d6c75c7 100644
--- a/weex_core/Source/wson/CMakeLists.txt
+++ b/weex_core/Source/wson/CMakeLists.txt
@@ -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.
+#
+
cmake_minimum_required(VERSION 3.4.1)
set(WSON_LIBRARY_NAME wson)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services