laurens/ziglings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

build: add the Exercise.addExecutable method

Browse source 
Currently addExecutable is called 3 times, unnecessarily making the code
more complex.

The method takes as argument the path to the exercises directory.

Additionally, use the new std.Build.ExecutableOptions.link_libc field.
The new field was added in ziglang/zig@adc9b77d5f on 2023-04-13.

Update the required Zig compiler version.
Note that I added the **current** zig version to the changelog, since
the reason for the change is known only to the person updating the
version.
This commit is contained in:
Manlio Perillo 2023-04-30 17:47:16 +02:00
parent 423cb5057e
commit 370337998e
3 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
build.zig
View file

@ -5,6 +5,7 @@ const ipc = @import("src/ipc.zig");
const tests = @import("test/tests.zig");
const Build = compat.Build;
const CompileStep = compat.build.CompileStep;
const Step = compat.build.Step;
const Child = std.process.Child;
@ -60,6 +61,18 @@ pub const Exercise = struct {
pub fn number(self: Exercise) usize {
return std.fmt.parseInt(usize, self.key(), 10) catch unreachable;
}
/// Returns the CompileStep for this exercise.
pub fn addExecutable(self: Exercise, b: *Build, work_path: []const u8) *CompileStep {
const file_path = join(b.allocator, &.{ work_path, self.main_file }) catch
@panic("OOM");
return b.addExecutable(.{
.name = self.baseName(),
.root_source_file = .{ .path = file_path },
.link_libc = self.link_libc,
});
}
};
pub fn build(b: *Build) !void {
@ -121,14 +134,8 @@ pub fn build(b: *Build) !void {
}
const ex = exercises[n - 1];
const base_name = ex.baseName();
const file_path = join(b.allocator, &.{ work_path, ex.main_file }) catch
@panic("OOM");
const build_step = b.addExecutable(.{ .name = base_name, .root_source_file = .{ .path = file_path } });
if (ex.link_libc) {
build_step.linkLibC();
}
const build_step = ex.addExecutable(b, work_path);
b.installArtifact(build_step);
const run_step = b.addRunArtifact(build_step);
@ -178,14 +185,7 @@ pub fn build(b: *Build) !void {
b.default_step = test_step;
for (exercises) |ex| {
const base_name = ex.baseName();
const file_path = join(b.allocator, &.{ healed_path, ex.main_file }) catch
@panic("OOM");
const build_step = b.addExecutable(.{ .name = base_name, .root_source_file = .{ .path = file_path } });
if (ex.link_libc) {
build_step.linkLibC();
}
const build_step = ex.addExecutable(b, healed_path);
b.installArtifact(build_step);
const run_step = b.addRunArtifact(build_step);
@ -207,11 +207,7 @@ pub fn build(b: *Build) !void {
// error with old Zig compilers.
var prev_step = &header_step.step;
for (exercises) |ex| {
const base_name = ex.baseName();
const file_path = join(b.allocator, &.{ "exercises", ex.main_file }) catch
@panic("OOM");
const build_step = b.addExecutable(.{ .name = base_name, .root_source_file = .{ .path = file_path } });
const build_step = ex.addExecutable(b, "exercises");
b.installArtifact(build_step);
const verify_stepn = ZiglingStep.create(b, ex, work_path);