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

Commit

Permalink
Update license header and build script for apache release.
Browse files Browse the repository at this point in the history
  • Loading branch information
YorkShen committed May 6, 2019
1 parent ab1d292 commit 1c42410
Show file tree
Hide file tree
Showing 11 changed files with 116 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ android/sdk/.externalNativeBuild/ndkBuild/
# release
apache_release_temp
RELEASE_NOTE.md
RELEASE_AUDIT.LOG

android/commons/bin/
android/playground/app/bin/
25 changes: 12 additions & 13 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -246,19 +246,18 @@ This product bundles Guava v20.0, which is available under a "Apache" license. F
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/WXDebugJsBridge_jni.h
weex_core/Source/android/jniprebuild/jniheader/WXParams_jni.h
weex_core/Source/android/jniprebuild/jni_generator.py
weex_core/Source/base/base64/base64.cpp
weex_core/Source/base/base64/base64.h
weex_core/Source/base/base64/modp_base64/modp_b64_data.h
weex_core/Source/base/base64/modp_base64/modp_b64.cc
weex_core/Source/base/base64/modp_base64/modp_b64.h
weex_core/Source/base/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
weex_core/Source/base/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h
weex_core/Source/base/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
weex_core/Source/base/android/jniprebuild/jniheader/WXBridge_jni.h
weex_core/Source/base/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h
weex_core/Source/base/android/jniprebuild/jniheader/WXParams_jni.h
weex_core/Source/base/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
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache Weex
Copyright 2018 The Apache Software Foundation
Copyright 2019 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
5 changes: 4 additions & 1 deletion scripts/apache_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ sed -i '' -e '1i \
cat CHANGELOG.md commit-history.log > RELEASE_NOTE.md

sh scripts/generate_apache_source.sh
tar -czf "apache-weex-incubating-$1-src.tar.gz" apache_release_temp/
java -jar ./scripts/apache-rat-0.12.jar apache_release_temp > RELEASE_AUDIT.LOG
cp -r apache_release_temp apache-weex-incubating-$1-src
tar -czf "apache-weex-incubating-$1-src.tar.gz" apache-weex-incubating-$1-src/
rm -f "apache-weex-incubating-$1-src.tar.gz.asc"
gpg --armor --output "apache-weex-incubating-$1-src.tar.gz.asc" --detach-sig "apache-weex-incubating-$1-src.tar.gz"
gpg --print-md SHA512 "apache-weex-incubating-$1-src.tar.gz" > "apache-weex-incubating-$1-src.tar.gz.sha512"
rm -rf apache-weex-incubating-$1-src

# cd apache_release_temp
# sh scripts/build_from_source.sh $2 $3
2 changes: 2 additions & 0 deletions scripts/build_from_source.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ then

gradle wrapper --gradle-version 4.4
echo 'include ":android_sdk"'>settings.gradle
echo "ndk.dir=$2">local.properties

./gradlew :android_sdk:clean :android_sdk:assembleRelease

cp android_sdk/.externalNativeBuild/cmake/release/armeabi/Source/android/jsengine/libweexjsb.so android_sdk/libs/armeabi
Expand Down
3 changes: 3 additions & 0 deletions scripts/release_files.rules
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
- /weex_core/Source/.idea
- /weex_core/Source/cmake-build-debug
- /weex_core/Source/libs
- weex_core/Source/CMakeFiles/**
+ /weex_core
+ /weex_core/CMakeLists.txt
+ /weex_core/Source
Expand Down Expand Up @@ -76,6 +77,8 @@
- /ios/sdk/NOTICE
- /ios/sdk/WeexSDK/Resources/main.js
- ios/sdk/Products
- /ios/sdk/WeexSDK.xcodeproj/project.xcworkspace/xcuserdata
- /ios/sdk/WeexSDK.xcodeproj/xcuserdata
+ /ios/sdk/**

##### Others #######
Expand Down
18 changes: 18 additions & 0 deletions weex_core/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
18 changes: 18 additions & 0 deletions weex_core/Source/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
set(WEEX_CORE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
Expand Down
19 changes: 19 additions & 0 deletions weex_core/Source/android/jsengine/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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.3)
#if (POLICY CMP0042)
# cmake_policy(SET CMP0042 NEW)
Expand Down
19 changes: 19 additions & 0 deletions weex_core/Source/base/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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(BASE_LIBRARY_NAME weexbase)
Expand Down
19 changes: 19 additions & 0 deletions weex_core/Source/weexjsc_version_script.txt
Original file line number Diff line number Diff line change
@@ -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.
#

{
global: *Inject_GCanvasFunc*; CallT3dFunc; CallGCanvasFun; Java_com*; JNI_OnLoad; JNI_OnUnload;
local: *;
Expand Down

0 comments on commit 1c42410

Please sign in to comment.