This is an automated email from the ASF dual-hosted git repository.
luckychen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new 01adab8 Update scripts for apache release.
new bf02df0 Merge pull request #2955 from YorkShen/feature/update
01adab8 is described below
commit 01adab8c17bd90fa922cd46b1ec11ba6429d4184
Author: YorkShen <[email protected]>
AuthorDate: Thu Oct 10 11:48:12 2019 +0800
Update scripts for apache release.
---
.gitignore | 1 +
CHANGELOG.md | 1 +
HOW-TO-BUILD.md | 79 ++++++++++------------
LICENSE | 2 +-
README.md | 51 ++++++--------
android/sdk/build.gradle | 2 +-
android/sdk/buildSrc/unstripped.gradle | 6 +-
.../org/apache/weex/utils/WXDataStructureUtil.java | 27 ++++----
dangerfile.js | 1 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 13 ++--
ios/sdk/WeexSDK/Sources/Utility/WXVersion.m | 38 +++++------
scripts/build_from_source.sh | 60 +++-------------
scripts/generate_apache_source.sh | 31 +--------
scripts/release_files.rules | 19 ++++--
14 files changed, 121 insertions(+), 210 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4a9783d..1c5e235 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ android/sdk/.externalNativeBuild/ndkBuild/
android/HeronAndroid/.externalNativeBuild/
# release
+apache-weex-incubating-*
apache_release_temp
RELEASE_NOTE.md
RELEASE_AUDIT.LOG
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91976e4..b0aebf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,5 +6,6 @@
### Android
* Upgrade targetsdk & compilesdk to 28
* Change Android package name from `com.taobao.weex` to `org.apache.weex`. Ref
[link](https://github.com/apache/incubator-weex/tree/master/android) for detail.
+* Switch to BSD-Licensed
[android-jsc](https://www.npmjs.com/package/jsc-android) as the default
JavaScript Interpreter.
## Main Bugfix
diff --git a/HOW-TO-BUILD.md b/HOW-TO-BUILD.md
index a07099f..2e80002 100644
--- a/HOW-TO-BUILD.md
+++ b/HOW-TO-BUILD.md
@@ -1,5 +1,5 @@
# Weex Apache Source Release
-Weex produce SDKs to integrate with 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 produce SDKs to integrate with iOS/Android/Mobile web applications. This
file will cover how to build Weex from command line. You can either use the
script we provided or manually build from source step by step.
See `README.md` for further information about the Weex Framework.
Weex SDK includes 3 different SDKs to use in corresponding system/browser:
@@ -9,32 +9,36 @@ Weex SDK includes 3 different SDKs to use in corresponding
system/browser:
See our [guide in our
website](http://weex.apache.org/guide/integrate-to-your-app.html) to learn more
about how to integrate Weex SDK into your app.
-## Build Environment
-The environment required to build weex is:
-* Android SDK:
- * NodeJS 4.0+
- * JDK 1.6+
- * Android SDK(`$ANDROID_HOME` must be set properly)
- * Gradle 2.0+
- * NDK r18 and ndk 13 (**Both of them are needed**)
- * [Ninja 1.8.2+](https://ninja-build.org/)
- * CMake 3.9.0+
-* iOS SDK:
- * NodeJS 4.0+
- * XCode & Command Tools 8.0+
-* Mobile web SDK:
- * NodeJS 4.0+
+# Build Environment
+The environment required to build weex is categorized by platforms.
+
+## Android
+* JDK `1.8+`
+* Android SDK Platform 28
+ * `$ANDROID_HOME` must be configured by using `export
ANDROID_HOME=/path_to_ndk`
+ * Normally, you should install [Android
Studio](https://developer.android.com/studio) to get Android SDK Platform 28
installed.
+* Gradle 4.10+
+* NDK `r18`
+ * `ANDROID_NDK_HOME` must be configured by using `export
ANDROID_NDK_HOME=/path_to_ndk`
+ * Higher version of NDK than `r18` isn't not tested yet.
+* CMake 3.4.1+
+
+## iOS
+* Install [iOS
Environment](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppStoreDistributionTutorial/Setup/Setup.html)
+* Install [CocoaPods](https://guides.cocoapods.org/using/getting-started.html)
+* XCode Command Tools 8.0+
+
+## Mobile
+* NodeJS 4.0+
This article was tested in MacOSX system.
# Build All by Script
This script will build Android and iOS SDKs:
-> `$ bash scripts/build_from_source.sh $NDK13_dir $NDK_16dir`
+> `$ bash scripts/build_from_source.sh `
-The `$NDK18_dir` should be the directory of NDK 18, otherwise the Android
build would failed.
-
-This may take a while. After that, you can look in `dist/`,
`android/sdk/build/output/` and `ios/sdk/Products` for Web/Android/iOS SDK
artifacts.
+This may take a while. After that, you can look in `dist/`,
`android/sdk/build/outputs/aar` and `ios/sdk/Products` for Web / Android / iOS
SDK artifacts.
# Build for Platforms
@@ -53,37 +57,22 @@ Build the javascript libraries:
### 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`
-> `cp packages/weex-js-framework/index.min.js android_sdk/assets/main.js`
+> `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
+1. Install the [Android environment](#android).
+2. Execute the following command
-check env
-
-- you have gradle installed, see more details about 'how to install gradle' on
the [gradle website](https://gradle.org/install).
-- [NDK r18](https://developer.android.com/ndk/downloads/older_releases.html)
-- edit local.propteries (in `Android` dir)
-
- ```
- ndk.dir=/Users/{user}/Library/Android/sdk/ndk-bundle-r18
- sdk.dir=/Users/{user}/Library/Android/sdk
- ```
-
-then do buid
-
-> cd Android/sdk
-
-> ../gradlew clean assemble
-
-
-artifacts path:
-
-` android/sdk/build/outputs/aar`
+ ```
+ cd android
+ ./gradlew :weex_sdk:clean :weex_sdk:assembleRelease
+ ```
-You can now import the aar file to your android project.
+3. Output can be found at `android/sdk/build/outputs/aar`
## Build iOS SDK
Execute command below to compile iOS SDK:
-> `$ xcodebuild -project ios_sdk/WeexSDK.xcodeproj -target WeexSDK_MTL`
+> `$ xcodebuild -project ios/sdk/WeexSDK.xcodeproj -target WeexSDK_MTL`
Then you'll find the iOS library(Framework file) under `ios_sdk/Products`.
diff --git a/LICENSE b/LICENSE
index 8cf0003..0f64676 100644
--- a/LICENSE
+++ b/LICENSE
@@ -244,7 +244,7 @@ This product bundles vuejs v1.0.12, which is available
under a
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
+ android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java
This product bundles json11 v1.0.0, which is available under a "MIT" license.
For details, see https://github.com/dropbox/json11/tree/v1.0.0 and following
files:
weex_core/Source/third_party/json11/CMakeLists.txt
diff --git a/README.md b/README.md
index 5ff48fe..fa2f398 100644
--- a/README.md
+++ b/README.md
@@ -32,41 +32,29 @@ Please ***INSTALL [Git for
Windows](https://git-scm.com/download/win)*** and run
* [Documents](http://weex.apache.org/references)
### Android
+**You should install [android environment](./HOW-TO-BUILD.md#android) before
building.**
-* Prerequisites
- * Install [Node.js](http://nodejs.org/) 8.0+
- * Under project root
- * `npm install`, install project
- * `./start`
- * Install [Android
Environment](http://developer.android.com/training/basics/firstapp/index.html)
- * Install [NDK](https://developer.android.com/ndk/) r18
- * Install [Cmake](https://cmake.org/download/) 3.9.0+
-* Run playground, In Android Studio
- * Open `android/playground`
- * In `app/java/com.alibaba.weex/IndexActivity`, modify `CURRENT_IP` to
your local IP
- * Click <img
src="http://gtms04.alicdn.com/tps/i4/TB1wCcqMpXXXXakXpXX3G7tGXXX-34-44.png";
height="16" > (`Run` button)
-* [Add an example](./examples/README.md#add-an-example)
+You can either build Weex from IDE (*Android Studio*) or command line.
-#### Runtime
+#### Build From Android Studio
+1. Open `android` directory in Android Studio.
+2. Run `git submodule update --init --remote` in `android` directory if this
is the first time you try to run Weex.
-On Android Platform , Weex code is executed in
[weex_js_engine](https://github.com/alibaba/weex_js_engine/tree/bridge_branch_mergeTimer)
which is based on JavaScriptCore engine.
+#### Build From Command Line
+Please read [How To Build](./HOW-TO-BUILD.md) for detail.
### iOS
-* run playground
- * Prerequisites
- * Install [Node.js](http://nodejs.org/) 8.0+
- * Under project root
- * `npm install`, install project
- * `./start`
- * Install [iOS
Environment](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppStoreDistributionTutorial/Setup/Setup.html)
- * Install
[CocoaPods](https://guides.cocoapods.org/using/getting-started.html)
- * Run playground
- * `cd ios/playground`
- * `pod install`
- * Open `WeexDemo.xcworkspace` in Xcode
- * Click <img
src="http://img1.tbcdn.cn/L1/461/1/5470b677a2f2eaaecf412cc55eeae062dbc275f9";
height="16" > (`Run` button) or use default shortcut `cmd + r` in Xcode
- * If you want to run the demo on your device, don't need to modify
`CURRENT_IP` manually. ~~In `DemoDefine.h`(you can search this file by Xcode
default shortcut `cmd + shift + o`), modify `CURRENT_IP` to your local IP~~
- * [Add an example](./examples/README.md#add-an-example)
+**You should install [iOS environment](./HOW-TO-BUILD.md#ios) before
building.**
+
+You can either build Weex from IDE (*XCode*) or command line.
+
+#### Build From XCode
+* Run playground
+ * `cd ios/playground`
+ * `pod install`
+ * Open `WeexDemo.xcworkspace` in Xcode
+ * Click <img
src="http://img1.tbcdn.cn/L1/461/1/5470b677a2f2eaaecf412cc55eeae062dbc275f9";
height="16" > (`Run` button) or use default shortcut `cmd + r` in Xcode
+ * If you want to run the demo on your device, don't need to modify
`CURRENT_IP` manually. ~~In `DemoDefine.h`(you can search this file by Xcode
default shortcut `cmd + shift + o`), modify `CURRENT_IP` to your local IP~~
* integrate to your application
- **[CocoaPods](https://cocoapods.org)**
@@ -85,6 +73,9 @@ On Android Platform , Weex code is executed in
[weex_js_engine](https://github.c
```
Run `carthage update`, and you should now have the latest version of
`WeexSDK` in your `Carthage` folder.
+#### Build From Command Line
+Please read [How To Build](./HOW-TO-BUILD.md) for detail.
+
### Mobile Web
see [weex-vue-render](https://github.com/weexteam/weex-vue-render).
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 48b7076..32ce256 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -250,7 +250,7 @@ license {
header = file('../license/LICENSE')
mapping('cpp', 'JAVADOC_STYLE')
mapping('h', 'JAVADOC_STYLE')
- excludes(['com/taobao/weex/utils/WXDataStructureUtil.java'])
+ excludes(['org/apache/weex/utils/WXDataStructureUtil.java'])
}
task weex_core_license(type:
com.hierynomus.gradle.license.tasks.LicenseFormat) {
diff --git a/android/sdk/buildSrc/unstripped.gradle
b/android/sdk/buildSrc/unstripped.gradle
index b195a60..06509b7 100644
--- a/android/sdk/buildSrc/unstripped.gradle
+++ b/android/sdk/buildSrc/unstripped.gradle
@@ -33,17 +33,17 @@ def processNativeLibs = { unstripped, stripped ->
}
afterEvaluate { project ->
- transformNativeLibsWithStripDebugSymbolForRelease << {
+ transformNativeLibsWithStripDebugSymbolForRelease.doLast {
processNativeLibs transformNativeLibsWithMergeJniLibsForRelease,
transformNativeLibsWithStripDebugSymbolForRelease
}
- transformNativeLibsWithStripDebugSymbolForApacheRelease << {
+ transformNativeLibsWithStripDebugSymbolForApacheRelease.doLast {
processNativeLibs transformNativeLibsWithMergeJniLibsForApacheRelease,
transformNativeLibsWithStripDebugSymbolForApacheRelease
}
- transformNativeLibsWithStripDebugSymbolForLegacyRelease << {
+ transformNativeLibsWithStripDebugSymbolForLegacyRelease.doLast {
processNativeLibs transformNativeLibsWithMergeJniLibsForLegacyRelease,
transformNativeLibsWithStripDebugSymbolForLegacyRelease
}
diff --git
a/android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java
b/android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java
index 0d01487..72b45ea 100644
--- a/android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java
+++ b/android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java
@@ -1,20 +1,17 @@
-/**
- * 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
+/*
+ * Copyright (C) 2007 The Guava Authors
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
*
- * 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.
+ * 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.
*/
package org.apache.weex.utils;
diff --git a/dangerfile.js b/dangerfile.js
index 76b2259..8058c8e 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -292,6 +292,7 @@ const ignoreCopyrightVerifyPath = [
'test/js\-framework/case',
'android/playground/app/src/main/assets',
'android/sdk/assets',
+ 'android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java',
'ios/playground/bundlejs',
'ios/sdk/WeexSDK/Resources',
'ios/sdk/WeexSDK/Sources/Layout',
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index feda1d7..e006b27 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -2997,8 +2997,7 @@
};
77D160FC1C02DBE70010B15B = {
CreatedOnToolsVersion = 7.1.1;
- DevelopmentTeam = 5783442933;
- ProvisioningStyle = Automatic;
+ ProvisioningStyle = Manual;
};
DCA445241EFA555400D0CFA8 = {
CreatedOnToolsVersion = 8.3.3;
@@ -3743,10 +3742,10 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
- CODE_SIGN_STYLE = Automatic;
+ CODE_SIGN_STYLE = Manual;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
- DEVELOPMENT_TEAM = 5783442933;
+ DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -3785,6 +3784,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.taobao.WeexSDK;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
+ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" =
"";
SKIP_INSTALL = YES;
VALID_ARCHS = "arm64 armv7 x86_64 i386";
WARNING_CFLAGS = "";
@@ -3802,9 +3802,9 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
- CODE_SIGN_STYLE = Automatic;
+ CODE_SIGN_STYLE = Manual;
DEFINES_MODULE = YES;
- DEVELOPMENT_TEAM = 5783442933;
+ DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -3843,6 +3843,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.taobao.WeexSDK;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
+ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" =
"";
SKIP_INSTALL = YES;
VALID_ARCHS = "arm64 armv7 x86_64 i386";
WARNING_CFLAGS = "";
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m
b/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m
index b283b3a..002b48b 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m
@@ -1,29 +1,27 @@
/*
- * 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.
+* 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 "WXVersion.h"
#import "WXDefine.h"
-
-static const char* WeexSDKBuildTime = "2019-08-26 08:28:24 UTC";
-static const unsigned long WeexSDKBuildTimestamp = 1566808104;
-
+static const char* WeexSDKBuildTime = "2019-10-09 13:07:35 UTC";
+static const unsigned long WeexSDKBuildTimestamp = 1570626455;
NSString* GetWeexSDKVersion(void)
{
diff --git a/scripts/build_from_source.sh b/scripts/build_from_source.sh
index de67740..30b89af 100755
--- a/scripts/build_from_source.sh
+++ b/scripts/build_from_source.sh
@@ -17,7 +17,7 @@
# under the License.
# This script is used to build weex from source, One may invoke this script by
-# scripts/build_from_source.sh $NDK13_dir $NDK_16dir
+# scripts/build_from_source.sh
set -e
if [ ! -f scripts/build_from_source.sh ];then
@@ -43,60 +43,16 @@ cp dist/weex-polyfill.min.js pre-build/weex-polyfill.js
cp dist/weex-rax.min.js pre-build/weex-rax-api.js
# Build android_sdk
-if [ -d "android_sdk" ]
+cd android/
+if [ ! -d "gradle" ]
then
- git clone -b 0.23 --depth=1 [email protected]:alibaba/weex_js_engine.git
- old_path=$PATH
- export ANDROID_NDK=$1
- export PATH=$1:$PATH
- cd weex_js_engine/
-
- sh build.jsc.sh
- cp libWTF.so libJavaScriptCore.so ../android_sdk/libs/armeabi
- cp libWTF.so libJavaScriptCore.so ../android_sdk/libs/armeabi-v7a
-
- mkdir -p ../weex_core/Source/libs/armeabi
- cp libWTF.so libJavaScriptCore.so ../weex_core/Source/libs/armeabi
- mkdir -p ../weex_core/Source/libs/armeabi-v7a
- cp libWTF.so libJavaScriptCore.so ../weex_core/Source/libs/armeabi-v7a
-
- rm -rf build32
- sh build.jsc.sh -t x86
- cp libWTF.so libJavaScriptCore.so ../android_sdk/libs/x86
- mkdir -p ../weex_core/Source/libs/x86
- cp libWTF.so libJavaScriptCore.so ../weex_core/Source/libs/x86
-
- PATH=$old_path
- export ANDROID_NDK=$2
- cd ..
-
- 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
-PignoreVersionCheck="true" -PbuildRuntimeApi=true
-
- cp
android_sdk/.externalNativeBuild/cmake/release/armeabi/Source/android/jsengine/libweexjsb.so
android_sdk/libs/armeabi
- cp
android_sdk/.externalNativeBuild/cmake/release/armeabi/Source/android/jsengine/libweexjst.so
android_sdk/libs/armeabi
- cp
android_sdk/.externalNativeBuild/cmake/release/armeabi-v7a/Source/android/jsengine/libweexjsb.so
android_sdk/libs/armeabi-v7a
- cp
android_sdk/.externalNativeBuild/cmake/release/armeabi-v7a/Source/android/jsengine/libweexjst.so
android_sdk/libs/armeabi-v7a
- cp
android_sdk/.externalNativeBuild/cmake/release/x86/Source/android/jsengine/libweexjsb.so
android_sdk/libs/x86
- cp
android_sdk/.externalNativeBuild/cmake/release/x86/Source/android/jsengine/libweexjst.so
android_sdk/libs/x86
-
-else
- cd android/
- ./gradlew :playground:clean :playground:assemble
- cd ..
+ gradle wrapper --gradle-version 4.10.1
fi
+./gradlew :weex_sdk:clean :weex_sdk:assembleRelease
-PignoreVersionCheck="true" -PbuildRuntimeApi=true -PapachePackageName="true"
+cd ..
+
# Build iOS sdk
-if [ -d "ios_sdk" ]
-then
- xcodebuild -project ios_sdk/WeexSDK.xcodeproj -scheme WeexSDK_MTL
-else
- cd ios
- xcodebuild -project sdk/WeexSDK.xcodeproj -scheme WeexSDK_MTL
- cd ..
-fi
+xcodebuild -project ios/sdk/WeexSDK.xcodeproj -scheme WeexSDK_MTL
echo "Weex SDK Build completed."
diff --git a/scripts/generate_apache_source.sh
b/scripts/generate_apache_source.sh
index d339337..9098be3 100755
--- a/scripts/generate_apache_source.sh
+++ b/scripts/generate_apache_source.sh
@@ -9,33 +9,4 @@ dest='apache_release_temp'
rm -rf $dest
mkdir $dest
-rsync -r --include-from=scripts/release_files.rules ./ $dest
-
-SED_CMD=sed
-if [ $(uname) == 'Darwin' ]; then
- SED_CMD=/usr/bin/sed
-fi
-
-#repackage
-find $dest/android/sdk -type f \( -name '*.java' -o -name
'AndroidManifest.xml' -o -name 'proguard-rules.pro' \) -exec $SED_CMD -i ''
's/com\.taobao\.weex/org\.apache\.weex/g' {} \;
-find $dest/ios/sdk -type f \( -name 'project.pbxproj' -o -name '*.h' -o -name
'*.m' -o -name '*.mm' \) -exec $SED_CMD -i ''
's/com\.taobao\.weex/org\.apache\.weex/g' {} \;
-
-mkdir -p $dest/android/sdk/src/main/java/org
-mkdir -p $dest/android/sdk/src/main/java/org/apache
-mv $dest/android/sdk/src/main/java/com/taobao
$dest/android/sdk/src/main/java/org/apache
-rm -rf $dest/android/sdk/src/main/java/com
-
-mkdir -p $dest/android/sdk/src/test/java/org
-mkdir -p $dest/android/sdk/src/test/java/org/apache
-mv $dest/android/sdk/src/test/java/com/taobao
$dest/android/sdk/src/test/java/org/apache
-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 $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
+rsync -r --include-from=scripts/release_files.rules ./ $dest
\ No newline at end of file
diff --git a/scripts/release_files.rules b/scripts/release_files.rules
index 02e8b0f..35c6987 100644
--- a/scripts/release_files.rules
+++ b/scripts/release_files.rules
@@ -66,9 +66,10 @@
+ /weex_core/Source/**
###### android #######
-+ /android
++ /android/
+ /android/build.gradle
-+ /android/sdk/
++ /android/settings.gradle
++ /android/license/***
- /android/sdk/assets/*.js
- /android/sdk/.gradle
- /android/sdk/build
@@ -79,19 +80,23 @@
- /android/sdk/.classpath
- /android/sdk/.project
- /android/sdk/weex_sdk.iml
-+ /android/sdk/**
+- /android/sdk/.cxx
+- /android/sdk/src/legacyRelease
+- /android/sdk/src/main/jniLibs
++ /android/sdk/***
###### ios ###########
-+ /ios
-+ /ios/sdk/
++ /ios/
- /ios/sdk/LICENSE
- /ios/sdk/NOTICE
- /ios/sdk/WeexSDK/Resources/main.js
-- ios/sdk/Products
+- /ios/sdk/Products
- /ios/sdk/WeexSDK.xcodeproj/project.xcworkspace/xcuserdata
- /ios/sdk/WeexSDK.xcodeproj/xcuserdata
- /ios/sdk/WeexSDKTests/dependency
-+ /ios/sdk/**
+- /ios/sdk/build
+- /ios/playground
++ /ios/sdk/***
##### Others #######
+ /RELEASE_NOTE.md
![http://gtms04.alicdn.com/tps/i4/TB1wCcqMpXXXXakXpXX3G7tGXXX-34-44.png"](http://gtms04.alicdn.com/tps/i4/TB1wCcqMpXXXXakXpXX3G7tGXXX-34-44.png"){kind=link}