From 52dc54c200e89de9ad1040d7cb3e94f12bd28ada Mon Sep 17 00:00:00 2001
From: Amelia Cuss <amelia@kivikakk.ee>
Date: Sun, 28 Apr 2024 12:42:15 +0300
Subject: [PATCH] drop Windows support; rename vendored to match repo names.

---
 .github/workflows/zig.yml                 | 14 --------------
 .gitmodules                               |  8 ++++----
 build.zig                                 |  6 +++---
 vendor/{htmlentities => htmlentities.zig} |  0
 vendor/libpcre                            |  1 -
 vendor/libpcre.zig                        |  1 +
 6 files changed, 8 insertions(+), 22 deletions(-)
 rename vendor/{htmlentities => htmlentities.zig} (100%)
 delete mode 160000 vendor/libpcre
 create mode 160000 vendor/libpcre.zig

diff --git a/.github/workflows/zig.yml b/.github/workflows/zig.yml
index c33bd7f..0c14515 100644
--- a/.github/workflows/zig.yml
+++ b/.github/workflows/zig.yml
@@ -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:
diff --git a/.gitmodules b/.gitmodules
index 9ea4e7e..fa71a83 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/build.zig b/build.zig
index 2c55118..4a9ba93 100644
--- a/build.zig
+++ b/build.zig
@@ -1,5 +1,5 @@
 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(.{});
@@ -7,12 +7,12 @@ pub fn build(b: *std.Build) !void {
 
     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" } }));
 
diff --git a/vendor/htmlentities b/vendor/htmlentities.zig
similarity index 100%
rename from vendor/htmlentities
rename to vendor/htmlentities.zig
diff --git a/vendor/libpcre b/vendor/libpcre
deleted file mode 160000
index d3bba4b..0000000
--- a/vendor/libpcre
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d3bba4b272a08ea3bcfbd65267a8cfa5abf41c66
diff --git a/vendor/libpcre.zig b/vendor/libpcre.zig
new file mode 160000
index 0000000..43b9b58
--- /dev/null
+++ b/vendor/libpcre.zig
@@ -0,0 +1 @@
+Subproject commit 43b9b5865be4076d2f3146554317b875f7430a8d