You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/04/24 09:23:22 UTC
[1/4] incubator-weex git commit: Merge branch
'0.12-dev-feature-jsfm0.20.5' into 0.12-dev
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev c2ab58191 -> a1095ae95
Merge branch '0.12-dev-feature-jsfm0.20.5' into 0.12-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/60b7010b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/60b7010b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/60b7010b
Branch: refs/heads/0.12-dev
Commit: 60b7010bfa57a5c574bb4dbe73543faaf3111a93
Parents: 6fcc81a 8a56e2f
Author: atomtong <to...@qq.com>
Authored: Mon Apr 24 17:04:35 2017 +0800
Committer: atomtong <to...@qq.com>
Committed: Mon Apr 24 17:04:35 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 16 ++++++++--------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7816288 -> 7815820 bytes
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 2 +-
ios/sdk/WeexSDK/Resources/main.js | 16 ++++++++--------
4 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-weex git commit: * [android] x86 rename to weexjsc
Posted by zs...@apache.org.
* [android] x86 rename to weexjsc
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/528cf7b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/528cf7b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/528cf7b7
Branch: refs/heads/0.12-dev
Commit: 528cf7b79c327ce4ca357418cde6bf380f0cafe6
Parents: 73995da
Author: zshshr <zh...@gmail.com>
Authored: Mon Apr 24 17:20:41 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Mon Apr 24 17:20:41 2017 +0800
----------------------------------------------------------------------
android/sdk/build.gradle | 2 +-
android/sdk/libs/x86/libweexjsc.so | Bin 0 -> 4545544 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4545544 -> 0 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/528cf7b7/android/sdk/build.gradle
----------------------------------------------------------------------
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 60753d8..9e76745 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -62,7 +62,7 @@ android {
def ARMEABI_Size = new File(projectDir,"libs/armeabi/libweexjsc.so").length();
- def X86_Size = new File(projectDir,"libs/x86/libweexv8.so").length();
+ def X86_Size = new File(projectDir,"libs/x86/libweexjsc.so").length();
println "ARMEABI_Size: "+ARMEABI_Size;
println "X86_Size:" + X86_Size;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/528cf7b7/android/sdk/libs/x86/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/x86/libweexjsc.so b/android/sdk/libs/x86/libweexjsc.so
new file mode 100755
index 0000000..d60dce1
Binary files /dev/null and b/android/sdk/libs/x86/libweexjsc.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/528cf7b7/android/sdk/libs/x86/libweexv8.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/x86/libweexv8.so b/android/sdk/libs/x86/libweexv8.so
deleted file mode 100755
index d60dce1..0000000
Binary files a/android/sdk/libs/x86/libweexv8.so and /dev/null differ
[3/4] incubator-weex git commit: Merge branch '0.12-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
Posted by zs...@apache.org.
Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
* '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex:
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/18ecaeab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/18ecaeab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/18ecaeab
Branch: refs/heads/0.12-dev
Commit: 18ecaeab2951360c87c13f7d66098ecabcfd2f27
Parents: 528cf7b c2ab581
Author: zshshr <zh...@gmail.com>
Authored: Mon Apr 24 17:22:41 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Mon Apr 24 17:22:41 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/4] incubator-weex git commit: Merge branch '0.12-dev' of
http://gitlab.alibaba-inc.com/weex/weex into 0.12-dev
Posted by zs...@apache.org.
Merge branch '0.12-dev' of http://gitlab.alibaba-inc.com/weex/weex into 0.12-dev
* '0.12-dev' of http://gitlab.alibaba-inc.com/weex/weex:
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a1095ae9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a1095ae9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a1095ae9
Branch: refs/heads/0.12-dev
Commit: a1095ae950d528192b003d73a437f85ed4e7759f
Parents: 18ecaea 60b7010
Author: zshshr <zh...@gmail.com>
Authored: Mon Apr 24 17:23:07 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Mon Apr 24 17:23:07 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------