summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-03-30 09:32:27 +0800
committerruki <[email protected]>2017-03-30 09:32:27 +0800
commit130e0d22c840da966e8426e0c2adc1285a70a3d8 (patch)
tree4e9fa7dbe029b437e128f255b68aaf4c0d574c16
parent972c5c27e2b926d8891f42705f4b6a7dae793e03 (diff)
modify installation docs
-rw-r--r--CHANGELOG.md2
-rw-r--r--docs/README.md21
-rwxr-xr-xdocs/zh/README.md17
3 files changed, 36 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff94420b6..aa2262d08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
### Changes
* [#61](https://github.com/tboox/xmake/pull/61): Provide safer `xmake install` and `xmake uninstall` task with administrator permission
+* Provide `rpm`, `deb` and `osxpkg` install package
## Bugs fixed
@@ -234,6 +235,7 @@
### 改进
* [#61](https://github.com/tboox/xmake/pull/61): 提供更加安全的`xmake install` and `xmake uninstall`任务,更友好的处理root安装问题
+* 提供`rpm`, `deb`和`osxpkg`安装包
### Bugs修复
diff --git a/docs/README.md b/docs/README.md
index 863ff6552..378bba34a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -17,7 +17,7 @@ so that any developer can quickly pick it up and enjoy the productivity boost wh
##### Windows
-1. Download xmake installer ([Releases](https://github.com/tboox/xmake/releases))
+1. Download xmake windows installer from [Releases](https://github.com/tboox/xmake/releases)
2. Run xmake-[version].exe
##### MacOS
@@ -27,21 +27,36 @@ $ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/maste
$ sudo brew install xmake
```
+Or
+
+1. Download xmake `.pkg` install package from [Releases](https://github.com/tboox/xmake/releases)
+2. Run it
+
##### Linux
-For linuxbrew:
+Using Linuxbrew:
```bash
$ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/linuxbrew/go/install)"
$ sudo brew install xmake
```
-For archlinux:
+On Archlinux:
```bash
$ yaourt xmake
```
+On Ubuntu:
+
+1. Download xmake `.deb` install package from [Releases](https://github.com/tboox/xmake/releases)
+2. Run `dpkg -i xmake-xxxx.deb`
+
+On Redhat/Centos:
+
+1. Download xmake `.rpm` install package from [Releases](https://github.com/tboox/xmake/releases)
+2. Run `yum install xmake-xxx.rpm --nogpgcheck`
+
##### Compilation
```bash
diff --git a/docs/zh/README.md b/docs/zh/README.md
index 44da83fc4..39fbe99a3 100755
--- a/docs/zh/README.md
+++ b/docs/zh/README.md
@@ -24,7 +24,7 @@ xmake的目标是开发者更加关注于项目本身开发,简化项目的描
##### Windows
-1. 从 ([Releases](https://github.com/tboox/xmake/releases)) 上下载windows安装包
+1. 从 [Releases](https://github.com/tboox/xmake/releases) 上下载windows安装包
2. 运行安装程序 xmake-[version].exe
##### MacOS
@@ -34,6 +34,11 @@ $ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/maste
$ sudo brew install xmake
```
+或者:
+
+1. 从 [Releases](https://github.com/tboox/xmake/releases) 上下载pkg安装包
+2. 双击运行
+
##### Linux
使用linuxbrew安装:
@@ -49,6 +54,16 @@ $ sudo brew install xmake
$ yaourt xmake
```
+在ubuntu上安装:
+
+1. 从 [Releases](https://github.com/tboox/xmake/releases) 上下载deb安装包
+2. 运行: `dpkg -i xmake-xxxx.deb`
+
+在`redhat/centos`上安装:
+
+1. 从 [Releases](https://github.com/tboox/xmake/releases) 上下载rpm安装包
+2. 运行: `yum install xmake-xxx.rpm --nogpgcheck`
+
##### 编译安装
```bash