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/19 09:40:55 UTC
[08/50] [abbrv] incubator-weex git commit: * [Script] release
preparing:
* [Script] release preparing:
1. add missing modules in package.json
2. move html5 folder to runtime folder in release_file.rules
3. modify js-framework path in build_from_source.sh
4. add NDK environment setup to HOW-TO-BUILD.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e110f0a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e110f0a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e110f0a3
Branch: refs/heads/release
Commit: e110f0a32b6cfe6d0adb006a931f6d7fd9de7c01
Parents: 65688e7
Author: Adam Feng <cx...@gmail.com>
Authored: Mon Jun 11 18:34:26 2018 +0800
Committer: Adam Feng <cx...@gmail.com>
Committed: Mon Jun 11 18:34:26 2018 +0800
----------------------------------------------------------------------
HOW-TO-BUILD.md | 1 +
package.json | 2 +-
scripts/build_from_source.sh | 4 ++--
scripts/release_files.rules | 15 +++++----------
4 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e110f0a3/HOW-TO-BUILD.md
----------------------------------------------------------------------
diff --git a/HOW-TO-BUILD.md b/HOW-TO-BUILD.md
index eb5ae65..416c2bc 100644
--- a/HOW-TO-BUILD.md
+++ b/HOW-TO-BUILD.md
@@ -15,6 +15,7 @@ The environment required to build weex as follow:
* NodeJS 4.0+
* JDK 1.6+
* Android SDK(`$ANDROID_HOME` must be set properly)
+ * Android NDK(`$ANDROID_NDK` must be set properly)
* Gradle 2.0+
* iOS SDK:
* NodeJS 4.0+
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e110f0a3/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 0b90fb8..200f2f9 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"build:runtime": "node build/build.js runtime",
"build:legacy": "node build/build.js legacy",
"build:vanilla": "node build/build.js vanilla",
- "install:buildtools": "npm i webpack@^1.0 rollup rollup-watch rollup-plugin-buble rollup-plugin-json rollup-plugin-eslint rollup-plugin-commonjs rollup-plugin-postcss rollup-plugin-replace rollup-plugin-uglify rollup-plugin-node-resolve babel-core babel-eslint babel-istanbul babel-loader babel-plugin-coverage babel-preset-es2015 babel-runtime",
+ "install:buildtools": "npm i webpack@^1.0 rollup rollup-watch rollup-plugin-buble rollup-plugin-json rollup-plugin-eslint rollup-plugin-commonjs rollup-plugin-postcss rollup-plugin-replace rollup-plugin-uglify rollup-plugin-node-resolve babel-core babel-eslint babel-istanbul babel-loader babel-plugin-coverage babel-preset-es2015 babel-runtime uglify-es eslint-plugin-flowtype eslint",
"build:source": "npm run build:native",
"build:examples": "npm run build:examples:native && npm run build:examples:web",
"build:examples:native": "webpack --config build/webpack.examples.config.js",
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e110f0a3/scripts/build_from_source.sh
----------------------------------------------------------------------
diff --git a/scripts/build_from_source.sh b/scripts/build_from_source.sh
index 132efb0..060f5a2 100644
--- a/scripts/build_from_source.sh
+++ b/scripts/build_from_source.sh
@@ -31,8 +31,8 @@ npm run build:source
echo "Javascript Framework and HTML5 SDK build completed."
sleep 2
-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 pre-build/weex-js-framework.min.js ios_sdk/WeexSDK/Resources/main.js
+cp pre-build/weex-js-framework.min.js android_sdk/assets/main.js
gradle wrapper --gradle-version 3.3
echo 'include ":android_sdk"'>settings.gradle
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e110f0a3/scripts/release_files.rules
----------------------------------------------------------------------
diff --git a/scripts/release_files.rules b/scripts/release_files.rules
index 01ba712..9d37139 100644
--- a/scripts/release_files.rules
+++ b/scripts/release_files.rules
@@ -33,17 +33,12 @@
- /src/h5-render/node_modules
- /src/js-framework/node_modules
+ /src/**
-+ /html5
-- /html5/**.output.js
-- /html5/render/browser/extend/packer.js
-- /html5/test/render/**
-+ /html5/**
++ /runtime
+- /runtime/**.output.js
+- /runtime/render/browser/extend/packer.js
+- /runtime/test/render/**
++ /runtime/**
+ /packages
-+ /packages/weex-html5
-+ /packages/weex-html5/package.json
-+ /packages/weex-vue-render
-+ /packages/weex-vue-render/src/**
-+ /packages/weex-vue-render/package.json
+ /build
+ /build/**