summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2016-07-13 08:03:24 +0800
committerruki <[email protected]>2016-07-13 08:03:24 +0800
commitc0f02d4654ea2b46732eacbacce8fc9ee80c6e9a (patch)
treea7704df913c302e91917051c74cefec64dadcc10
parent0f7173fe7610408d1f947517e48447a4b0fd4461 (diff)
add process interfaces into sandbox
-rwxr-xr-xREADME.md10
-rwxr-xr-xcore/src/xmake/process/waitlist.c2
-rw-r--r--xmake/core/sandbox/modules/process.lua133
3 files changed, 140 insertions, 5 deletions
diff --git a/README.md b/README.md
index 42fb8e973..0ef0a6499 100755
--- a/README.md
+++ b/README.md
@@ -59,13 +59,14 @@ so that any developer can quickly pick it up and enjoy the productivity boost wh
- Watchos (armv7k, i386)
- Mingw (i386, x86_64)
-####In the plans
+####Todolist
- Manage package and dependencies
- Download package automatically
- Create package repository for porting other third-party source codes, it's goal is that one people port it and many people shared.
-- Implement more plugins
+- Implement more plugins(.e.g generate .deb, .rpm package)
- Create more project file for IDE (.e.g vs, xcode ..)
+- Add debugger integration to `xmake run -d`
####Examples
@@ -294,12 +295,13 @@ xmake的目标是开发者更加关注于项目本身开发,简化项目的描
- Watchos (armv7k, i386)
- Mingw (i386, x86_64)
-####后续计划
+####后续任务
- 自动包依赖管理和下载
- 创建移植仓库,实现`一人移植,多人共享`
-- 更多的插件开发
+- 更多的插件开发(例如:生成.deb, .rpm的安装包)
- 自动生成vs,xcode等工程文件
+- 添加调试器集成到`xmake run -d`
####简单例子
diff --git a/core/src/xmake/process/waitlist.c b/core/src/xmake/process/waitlist.c
index 15e065628..a2d461401 100755
--- a/core/src/xmake/process/waitlist.c
+++ b/core/src/xmake/process/waitlist.c
@@ -118,7 +118,7 @@ tb_int_t xm_process_waitlist(lua_State* lua)
// save process info count
lua_pushinteger(lua, infosize);
- if (infosize > 0)
+ if (infosize >= 0)
{
// save process info list
lua_newtable(lua);
diff --git a/xmake/core/sandbox/modules/process.lua b/xmake/core/sandbox/modules/process.lua
new file mode 100644
index 000000000..12ae20fad
--- /dev/null
+++ b/xmake/core/sandbox/modules/process.lua
@@ -0,0 +1,133 @@
+--!The Automatic Cross-platform Build Tool
+--
+-- XMake is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU Lesser General Public License as published by
+-- the Free Software Foundation; either version 2.1 of the License, or
+-- (at your option) any later version.
+--
+-- XMake is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public License
+-- along with XMake;
+-- If not, see <a href="http://www.gnu.org/licenses/"> http://www.gnu.org/licenses/</a>
+--
+-- Copyright (C) 2015 - 2016, ruki All rights reserved.
+--
+-- @author ruki
+-- @file process.lua
+--
+
+-- load modules
+local sandbox = require("sandbox/sandbox")
+local raise = require("sandbox/modules/raise")
+local vformat = require("sandbox/modules/vformat")
+
+-- define module
+local sandbox_process = sandbox_process or {}
+
+-- open process
+function sandbox_process.open(command, outfile, errfile)
+
+ -- check
+ assert(command)
+
+ -- format command first
+ command = vformat(command)
+
+ -- format output file if exists
+ if outfile then
+ outfile = vformat(outfile)
+ end
+
+ -- format error file if exists
+ if errfile then
+ errfile = vformat(errfile)
+ end
+
+ -- open process
+ local proc = process.open(command, outfile, errfile)
+ if not proc then
+ raise("open process(%s) failed!", command)
+ end
+
+ -- ok
+ return proc
+end
+
+-- open process with arguments
+function sandbox_process.openv(argv, outfile, errfile)
+
+ -- check
+ assert(argv)
+
+ -- format output file if exists
+ if outfile then
+ outfile = vformat(outfile)
+ end
+
+ -- format error file if exists
+ if errfile then
+ errfile = vformat(errfile)
+ end
+
+ -- open process
+ local proc = process.openv(argv, outfile, errfile)
+ if not proc then
+ raise("openv process(%s) failed!", table.concat(argv, " "))
+ end
+
+ -- ok
+ return proc
+end
+
+-- close process
+function sandbox_process.close(proc)
+
+ -- check
+ assert(proc)
+
+ -- close it
+ process.close(proc)
+end
+
+-- wait process
+function sandbox_process.wait(proc, timeout)
+
+ -- check
+ assert(proc)
+
+ -- wait it
+ local ok, status = process.wait(proc, timeout)
+ if ok < 0 then
+ raise("wait process failed(%d)", ok)
+ end
+
+ -- timeout or finished
+ return ok, status
+end
+
+-- wait processes
+function sandbox_process.waitlist(processes, timeout)
+
+ -- check
+ assert(processes)
+
+ -- wait them
+ local count, infos = process.waitlist(processes, timeout)
+ if count < 0 then
+ raise("wait processes(%d) failed(%d)", #processes, count)
+ end
+
+ -- check infos
+ assert(infos and count == #infos)
+
+ -- timeout or finished
+ return count, infos
+end
+
+-- return module
+return sandbox_process
+