You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by da...@apache.org on 2017/08/17 03:59:51 UTC
[34/43] incubator-weex git commit: * [build] update build scripts to
copy the right path
* [build] update build scripts to copy the right path
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c8e9cdb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c8e9cdb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c8e9cdb6
Branch: refs/heads/0.16-dev
Commit: c8e9cdb6c2fd6c904b0fa99ef6d6be5a4f0b1e3e
Parents: 8d6c0d2
Author: Hanks <zh...@gmail.com>
Authored: Mon Aug 14 14:04:01 2017 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Mon Aug 14 14:04:01 2017 +0800
----------------------------------------------------------------------
HOW-TO-BUILD.md | 17 +++++------------
SCRIPTS.md | 4 ++--
build/config.js | 2 +-
packages/weex-js-runtime/package.json | 4 ----
scripts/build_from_source.sh | 10 +++++-----
5 files changed, 13 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8e9cdb6/HOW-TO-BUILD.md
----------------------------------------------------------------------
diff --git a/HOW-TO-BUILD.md b/HOW-TO-BUILD.md
index 278d3e7..2000894 100644
--- a/HOW-TO-BUILD.md
+++ b/HOW-TO-BUILD.md
@@ -2,7 +2,7 @@
Weex produce SDKs to integrate to 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.
See `README.md` for further information about Weex Framework.
-Weex SDK produce 3 different SDKs to use in corresponding system/browser:
+Weex SDK produce 3 different SDKs to use in corresponding system/browser:
* Android SDK
* iOS SDK
* Mobile Web SDK
@@ -14,7 +14,7 @@ The environment required to build weex as follow:
* Android SDK:
* NodeJS 4.0+
* JDK 1.6+
- * Android SDK(`$ANDROID_HOME` must be set properly)
+ * Android SDK(`$ANDROID_HOME` must be set properly)
* Gradle 2.0+
* iOS SDK:
* NodeJS 4.0+
@@ -47,17 +47,10 @@ Install build tools:
Build the javascript libraries:
> `$ npm run build:source`
-The artifacts are under `dist/`.
-> ```
-> $ ls dist
-> browser.js browser.min.js browser.min.js.gz
-> native.js native.min.js native.min.js.gz
->```
-
### Before build Native SDK
Move `min` version to Native SDK folder, which will be used by native SDK build.
-> `cp dist/native.min.js ios_sdk/WeexSDK/Resources/main.js`
-> `cp dist/native.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
Make sure you have install gradle, see more details about 'how to install gradle' in [gradle website](https://gradle.org/install).
@@ -73,7 +66,7 @@ Build the SDK
Now, you can see the artifacts under `android_sdk/build/output/`.
You can now import the aar file to your android project.
-## Build iOS SDK
+## Build iOS SDK
Execute command below to compile iOS SDK:
> `$ xcodebuild -project ios_sdk/WeexSDK.xcodeproj -target WeexSDK_MTL`
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8e9cdb6/SCRIPTS.md
----------------------------------------------------------------------
diff --git a/SCRIPTS.md b/SCRIPTS.md
index fbb9245..1018716 100644
--- a/SCRIPTS.md
+++ b/SCRIPTS.md
@@ -4,8 +4,8 @@ There are several scripts for end-user and developer.
**For end users you can only know `npm run build` and `npm run serve` to start and `npm run dev:examples` to write or modify a demo.**
-* `npm run build:browser`: build HTML5 renderer to `dist/browser.js`.
-* `npm run build:native`: build JS framework for native renderer to `dist/native.js`.
+* `npm run build:browser`: build HTML5 renderer to `packages/weex-html5/index.js`.
+* `npm run build:native`: build JS framework for native renderer to `packages/weex-js-framework/index.js`.
* `npm run build:examples`: build all js bundles from `examples/` to `examples/build/`.
* `npm run build:test`: build all js bundles from `test/` to `test/build/`.
* `npm run build`: build all above.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8e9cdb6/build/config.js
----------------------------------------------------------------------
diff --git a/build/config.js b/build/config.js
index 7510e89..a863919 100644
--- a/build/config.js
+++ b/build/config.js
@@ -92,7 +92,7 @@ const configs = {
'weex-web-render': {
moduleName: 'Weex',
entry: absolute('html5/render/browser/index.js'),
- dest: absolute('dist/browser.js'),
+ dest: absolute('packages/weex-html5/index.js'),
banner: `(this.nativeLog || function(s) {console.log(s)})`
+ `('START WEEX HTML5: ${subversion.browser}, Build ${now()}.');\n`
+ frameworkBanner,
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8e9cdb6/packages/weex-js-runtime/package.json
----------------------------------------------------------------------
diff --git a/packages/weex-js-runtime/package.json b/packages/weex-js-runtime/package.json
index 80be1b6..6d65de4 100644
--- a/packages/weex-js-runtime/package.json
+++ b/packages/weex-js-runtime/package.json
@@ -1,10 +1,6 @@
{
"name": "weex-js-runtime",
-<<<<<<< HEAD
- "version": "0.21.7",
-=======
"version": "0.21.8",
->>>>>>> 0.16-dev
"description": "Weex JS Runtime",
"main": "index.js",
"engines": {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8e9cdb6/scripts/build_from_source.sh
----------------------------------------------------------------------
diff --git a/scripts/build_from_source.sh b/scripts/build_from_source.sh
index f73ed5f..1b114e7 100644
--- a/scripts/build_from_source.sh
+++ b/scripts/build_from_source.sh
@@ -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
@@ -31,8 +31,8 @@ npm run build:source
echo "Javascript Framework and HTML5 SDK build completed."
sleep 2
-cp dist/native.min.js ios_sdk/WeexSDK/Resources/main.js
-cp dist/native.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
gradle wrapper --gradle-version 2.14.1
echo 'include ":android_sdk"'>settings.gradle
@@ -40,4 +40,4 @@ echo 'include ":android_sdk"'>settings.gradle
xcodebuild -project ios_sdk/WeexSDK.xcodeproj -target WeexSDK_MTL
-echo "Weex SDK Build completed."
\ No newline at end of file
+echo "Weex SDK Build completed."