Skip to content

Drop Zig 0.11.0 support #525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mochalins merged 3 commits into from
Nov 19, 2024
Merged

Drop Zig 0.11.0 support #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
828ea1e
scm: Update to beta 3 in `build.zig.zon`
mochalins Nov 18, 2024
b917498
scm: Drop Zig 0.11.0 support
mochalins Nov 19, 2024
8ed78e9
scm: Make shared library PIC
mochalins Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/zig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
version: [0.11.0, 0.12.0, 0.13.0, '']
version: [0.12.0, 0.13.0, '']
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Expand Down
78 changes: 32 additions & 46 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,19 @@ pub fn build(b: *Build) !void {
const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{});

switch (comptime zig_ver) {
12, 13, 14 => {},
else => return error.UnsupportedZigVersion,
}

const is_dynamic = b.option(bool, "dynamic", "build the dynamic library") orelse false;
const enable_tls = b.option(bool, "enable-tls", "enable TLS support") orelse false;
const verbose = b.option(std.log.Level, "verbose", "set verbose output") orelse .warn;

global_log_level = verbose;

switch (comptime zig_ver) {
11 => {
if (enable_tls and !target.isNative()) {
log(.err, .WebUI, "cross compilation is not supported with TLS enabled", .{});
return error.InvalidBuildConfiguration;
}
},
12, 13, 14 => {
if (enable_tls and !target.query.isNative()) {
log(.err, .WebUI, "cross compilation is not supported with TLS enabled", .{});
return error.InvalidBuildConfiguration;
}
},
else => return error.UnsupportedZigVersion,
if (enable_tls and !target.query.isNative()) {
log(.err, .WebUI, "cross compilation is not supported with TLS enabled", .{});
return error.InvalidBuildConfiguration;
}

log(.info, .WebUI, "Building {s} WebUI library{s}...", .{
Expand All @@ -48,6 +41,7 @@ pub fn build(b: *Build) !void {
.name = lib_name,
.target = target,
.optimize = optimize,
.pic = true,
}) else b.addStaticLibrary(.{
.name = lib_name,
.target = target,
Expand All @@ -61,8 +55,8 @@ pub fn build(b: *Build) !void {
}

fn addLinkerFlags(b: *Build, webui: *Compile, enable_tls: bool) !void {
const webui_target = if (zig_ver < 12) webui.target else webui.rootModuleTarget();
const is_windows = if (zig_ver < 12) webui_target.isWindows() else webui_target.os.tag == .windows;
const webui_target = webui.rootModuleTarget();
const is_windows = webui_target.os.tag == .windows;

// Prepare compiler flags.
const no_tls_flags: []const []const u8 = &.{"-DNO_SSL"};
Expand All @@ -76,23 +70,19 @@ fn addLinkerFlags(b: *Build, webui: *Compile, enable_tls: bool) !void {
};

webui.addCSourceFile(.{
.file = if (zig_ver < 12) .{ .path = "src/webui.c" } else b.path("src/webui.c"),
.file = b.path("src/webui.c"),
.flags = if (enable_tls) tls_flags else no_tls_flags,
});
webui.addCSourceFile(.{
.file = if (zig_ver < 12) .{ .path = "src/civetweb/civetweb.c" } else b.path("src/civetweb/civetweb.c"),
.file = b.path("src/civetweb/civetweb.c"),
.flags = if (enable_tls) civetweb_flags ++ tls_flags else civetweb_flags ++ .{"-DUSE_WEBSOCKET"} ++ no_tls_flags,
});
webui.linkLibC();
webui.addIncludePath(if (zig_ver < 12) .{ .path = "include" } else b.path("include"));
if (zig_ver < 12) {
webui.installHeader("include/webui.h", "webui.h");
} else {
webui.installHeader(b.path("include/webui.h"), "webui.h");
}
webui.addIncludePath(b.path("include"));
webui.installHeader(b.path("include/webui.h"), "webui.h");
if (webui_target.isDarwin()) {
webui.addCSourceFile(.{
.file = if (zig_ver < 12) .{ .path = "src/webview/wkwebview.m" } else b.path("src/webview/wkwebview.m"),
.file = b.path("src/webview/wkwebview.m"),
.flags = &.{},
});
webui.linkFramework("Cocoa");
Expand All @@ -114,11 +104,11 @@ fn addLinkerFlags(b: *Build, webui: *Compile, enable_tls: bool) !void {
webui.linkSystemLibrary("crypto");
}

for (if (zig_ver < 12) webui.link_objects.items else webui.root_module.link_objects.items) |lo| {
for (webui.root_module.link_objects.items) |lo| {
switch (lo) {
.c_source_file => |csf| {
log(.debug, .WebUI, "{s} linker flags: {s}", .{
if (zig_ver < 12) csf.file.path else csf.file.src_path.sub_path,
csf.file.src_path.sub_path,
csf.flags,
});
},
Expand All @@ -129,22 +119,18 @@ fn addLinkerFlags(b: *Build, webui: *Compile, enable_tls: bool) !void {

fn build_examples(b: *Build, webui: *Compile) !void {
const build_examples_step = b.step("examples", "builds the library and its examples");
const target = if (zig_ver < 12) webui.target else webui.root_module.resolved_target.?;
const optimize = if (zig_ver < 12) webui.optimize else webui.root_module.optimize.?;

const examples_path = (if (zig_ver < 12) (Build.LazyPath{ .path = "examples/C" }) else b.path("examples/C")).getPath(b);
var examples_dir = if (zig_ver < 12)
std.fs.cwd().openIterableDir(examples_path, .{}) catch |e| switch (e) {
// Do not attempt building examples if directory does not exist.
error.FileNotFound => return,
else => return e,
}
else
std.fs.cwd().openDir(examples_path, .{ .iterate = true }) catch |e| switch (e) {
// Do not attempt building examples if directory does not exist.
error.FileNotFound => return,
else => return e,
};
const target = webui.root_module.resolved_target.?;
const optimize = webui.root_module.optimize.?;

const examples_path = b.path("examples/C").getPath(b);
var examples_dir = std.fs.cwd().openDir(
examples_path,
.{ .iterate = true },
) catch |e| switch (e) {
// Do not attempt building examples if directory does not exist.
error.FileNotFound => return,
else => return e,
};
defer examples_dir.close();

var paths = examples_dir.iterate();
Expand All @@ -158,7 +144,7 @@ fn build_examples(b: *Build, webui: *Compile) !void {
const path = try std.fmt.allocPrint(b.allocator, "examples/C/{s}/main.c", .{example_name});
defer b.allocator.free(path);

exe.addCSourceFile(.{ .file = if (zig_ver < 12) .{ .path = path } else b.path(path), .flags = &.{} });
exe.addCSourceFile(.{ .file = b.path(path), .flags = &.{} });
exe.linkLibrary(webui);

const exe_install = b.addInstallArtifact(exe, .{});
Expand All @@ -170,7 +156,7 @@ fn build_examples(b: *Build, webui: *Compile) !void {

const cwd = try std.fmt.allocPrint(b.allocator, "src/examples/{s}", .{example_name});
defer b.allocator.free(cwd);
if (zig_ver < 12) exe_run.cwd = cwd else exe_run.setCwd(b.path(cwd));
exe_run.setCwd(b.path(cwd));

exe_run.step.dependOn(&exe_install.step);
build_examples_step.dependOn(&exe_install.step);
Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.{
.name = "webui",
.version = "2.5.0-beta.2",
.version = "2.5.0-beta.3",
.paths = .{
"src",
"include",
Expand Down