mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-18 07:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig build system: implement custom command step

Browse Source
This commit is contained in:
Andrew Kelley 2017-04-17 03:20:56 -04:00
parent 47336abae3
commit e4ec2d10c6
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
std/build.zig
View File

@ -397,6 +397,10 @@ pub const Builder = struct {
}
fn spawnChild(self: &Builder, exe_path: []const u8, args: []const []const u8) {
return self.spawnChildEnvMap(&self.env_map, exe_path, args);
}
fn spawnChildEnvMap(self: &Builder, env_map: &const BufMap, exe_path: []const u8, args: []const []const u8) {
if (self.verbose) {
%%io.stderr.printf("{}", exe_path);
for (args) |arg| {
@ -405,7 +409,7 @@ pub const Builder = struct {
%%io.stderr.printf("\n");
}
var child = os.ChildProcess.spawn(exe_path, args, &self.env_map,
var child = os.ChildProcess.spawn(exe_path, args, env_map,
StdIo.Ignore, StdIo.Inherit, StdIo.Inherit, self.allocator)
%% |err| debug.panic("Unable to spawn {}: {}\n", exe_path, @errorName(err));
@ -905,17 +909,19 @@ const CExecutable = struct {
const CommandStep = struct {
step: Step,
path: []const u8,
builder: &Builder,
exe_path: []const u8,
args: []const []const u8,
cwd: []const u8,
env_map: &const BufMap,
pub fn init(builder: &Builder, cwd: []const u8, env_map: &const BufMap,
path: []const u8, args: []const []const u8) -> CommandStep
exe_path: []const u8, args: []const []const u8) -> CommandStep
{
CommandStep {
.step = Step.init(path, builder.allocator, make),
.path = path,
.builder = builder,
.step = Step.init(exe_path, builder.allocator, make),
.exe_path = exe_path,
.args = args,
.cwd = cwd,
.env_map = env_map,
@ -927,7 +933,8 @@ const CommandStep = struct {
//const self = @fieldParentPtr(CExecutable, "step", step);
const self = @ptrcast(&CommandStep, step);
%%io.stderr.printf("TODO: exec command\n");
// TODO set cwd
self.builder.spawnChildEnvMap(self.env_map, self.exe_path, self.args);
}
};