Skip to content

Commit

Permalink
drop Windows support; rename vendored to match repo names.
Browse files Browse the repository at this point in the history
  • Loading branch information
kivikakk committed Apr 28, 2024
1 parent 55f0339 commit 52dc54c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 22 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/zig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,6 @@ jobs:
- run: brew install pcre
- run: zig build
- run: zig build test
test-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: goto-bus-stop/setup-zig@v2
with:
version: 0.12.0
- run: c:; cd \vcpkg; git pull; .\bootstrap-vcpkg.bat
- run: vcpkg integrate install
- run: vcpkg install pcre --triplet x64-windows-static
- run: zig build -Dtarget=x86_64-windows-msvc
- run: zig build -Dtarget=x86_64-windows-msvc test
lint:
runs-on: ubuntu-latest
steps:
Expand Down
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[submodule "vendor/cmark-gfm"]
path = vendor/cmark-gfm
url = https://github.com/kivikakk/cmark-gfm.git
[submodule "vendor/htmlentities"]
path = vendor/htmlentities
[submodule "vendor/htmlentities.zig"]
path = vendor/htmlentities.zig
url = https://github.com/kivikakk/htmlentities.zig
[submodule "vendor/libpcre"]
path = vendor/libpcre
[submodule "vendor/libpcre.zig"]
path = vendor/libpcre.zig
url = https://github.com/kivikakk/libpcre.zig
[submodule "vendor/zunicode"]
path = vendor/zunicode
Expand Down
6 changes: 3 additions & 3 deletions build.zig
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
const std = @import("std");
const linkPcre = @import("vendor/libpcre/build.zig").linkPcre;
const linkPcre = @import("vendor/libpcre.zig/build.zig").linkPcre;

pub fn build(b: *std.Build) !void {
const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{});

var deps = std.StringHashMap(*std.Build.Module).init(b.allocator);
const libpcre = b.addModule("libpcre", .{
.root_source_file = .{ .path = "vendor/libpcre/src/main.zig" },
.root_source_file = .{ .path = "vendor/libpcre.zig/src/main.zig" },
.target = target,
});
try linkPcre(b, libpcre);
try deps.put("libpcre", libpcre);
try deps.put("htmlentities", b.addModule("htmlentities", .{ .root_source_file = .{ .path = "vendor/htmlentities/src/main.zig" } }));
try deps.put("htmlentities", b.addModule("htmlentities", .{ .root_source_file = .{ .path = "vendor/htmlentities.zig/src/main.zig" } }));
try deps.put("clap", b.addModule("clap", .{ .root_source_file = .{ .path = "vendor/zig-clap/clap.zig" } }));
try deps.put("zunicode", b.addModule("zunicode", .{ .root_source_file = .{ .path = "vendor/zunicode/src/zunicode.zig" } }));

Expand Down
1 change: 0 additions & 1 deletion vendor/libpcre
Submodule libpcre deleted from d3bba4
1 change: 1 addition & 0 deletions vendor/libpcre.zig
Submodule libpcre.zig added at 43b9b5

0 comments on commit 52dc54c

Please sign in to comment.