Merge branch 'main' into shell-file-lazypath

Author: rodolpheh

.github/workflows/main.yml

@@ -20,15 +20,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-      - name: Read .zig-version
-        id: zigversion
-        uses: juliangruber/read-file-action@v1
-        with:
-          path: ./.zigversion
       - name: Install Zig
-        uses: mlugg/setup-zig@v1
-        with:
-          version: ${{ steps.zigversion.outputs.content }}
+        uses: mlugg/setup-zig@v2
       - name: Check format
         continue-on-error: true
         run: zig fmt --check .

.zigversion

@@ -13,7 +13,8 @@ pub fn build(b: *std.Build) void {
 pub fn emccPath(b: *std.Build) []const u8 {
     return std.fs.path.join(b.allocator, &.{
         b.dependency("emsdk", .{}).path("").getPath(b),
-        "upstream/emscripten/",
+        "upstream",
+        "emscripten",
         switch (builtin.target.os.tag) {
             .windows => "emcc.bat",
             else => "emcc",
@@ -24,7 +25,8 @@ pub fn emccPath(b: *std.Build) []const u8 {
 pub fn emrunPath(b: *std.Build) []const u8 {
     return std.fs.path.join(b.allocator, &.{
         b.dependency("emsdk", .{}).path("").getPath(b),
-        "upstream/emscripten/",
+        "upstream",
+        "emscripten",
         switch (builtin.target.os.tag) {
             .windows => "emrun.bat",
             else => "emrun",
@@ -35,7 +37,10 @@ pub fn emrunPath(b: *std.Build) []const u8 {
 pub fn htmlPath(b: *std.Build) []const u8 {
     return std.fs.path.join(b.allocator, &.{
         b.dependency("emsdk", .{}).path("").getPath(b),
-        "upstream/emscripten/src/shell.html",
+        "upstream",
+        "emscripten",
+        "src",
+        "shell.html",
     }) catch unreachable;
 }
 
@@ -54,6 +59,9 @@ pub fn activateEmsdkStep(b: *std.Build) *std.Build.Step {
         .linux, .macos => {
             emsdk_install.step.dependOn(&b.addSystemCommand(&.{ "chmod", "+x", emsdk_script_path }).step);
         },
+        .windows => {
+            emsdk_install.step.dependOn(&b.addSystemCommand(&.{ "takeown", "/f", emsdk_script_path }).step);
+        },
         else => {},
     }
 
@@ -74,13 +82,21 @@ pub fn activateEmsdkStep(b: *std.Build) *std.Build.Step {
         .linux, .macos => {
             const chmod_emcc = b.addSystemCommand(&.{ "chmod", "+x", emccPath(b) });
             chmod_emcc.step.dependOn(&emsdk_activate.step);
+            step.dependOn(&chmod_emcc.step);
 
             const chmod_emrun = b.addSystemCommand(&.{ "chmod", "+x", emrunPath(b) });
             chmod_emrun.step.dependOn(&emsdk_activate.step);
-
-            step.dependOn(&chmod_emcc.step);
             step.dependOn(&chmod_emrun.step);
         },
+        .windows => {
+            const takeown_emcc = b.addSystemCommand(&.{ "takeown", "/f", emccPath(b) });
+            takeown_emcc.step.dependOn(&emsdk_activate.step);
+            step.dependOn(&takeown_emcc.step);
+
+            const takeown_emrun = b.addSystemCommand(&.{ "takeown", "/f", emrunPath(b) });
+            takeown_emrun.step.dependOn(&emsdk_activate.step);
+            step.dependOn(&takeown_emrun.step);
+        },
         else => {},
     }
 

build.zig

@@ -2,6 +2,7 @@
     .name = .zemscripten,
     .fingerprint = 0x2de6d80ca84319b1, // Changing this has security and trust implications.
     .version = "0.2.0-dev",
+    .minimum_zig_version = "0.14.0",
     .paths = .{
         "build.zig",
         "build.zig.zon",

build.zig.zon

@@ -8,7 +8,7 @@ comptime {
 
 pub extern fn emscripten_sleep(ms: u32) void;
 
-pub const MainLoopCallback = *const fn () callconv(.C) void;
+pub const MainLoopCallback = *const fn () callconv(.c) void;
 extern fn emscripten_set_main_loop(MainLoopCallback, c_int, c_int) void;
 pub fn setMainLoop(cb: MainLoopCallback, maybe_fps: ?i16, simulate_infinite_loop: bool) void {
     emscripten_set_main_loop(cb, if (maybe_fps) |fps| fps else -1, @intFromBool(simulate_infinite_loop));
@@ -19,13 +19,13 @@ pub fn cancelMainLoop() void {
     emscripten_cancel_main_loop();
 }
 
-pub const MainLoopArgCallback = *const fn (arg: *anyopaque) callconv(.C) void;
+pub const MainLoopArgCallback = *const fn (arg: *anyopaque) callconv(.c) void;
 extern fn emscripten_set_main_loop_arg(MainLoopArgCallback, arg: *anyopaque, c_int, c_int) void;
 pub fn setMainLoopArg(cb: MainLoopArgCallback, arg: *anyopaque, maybe_fps: ?i16, simulate_infinite_loop: bool) void {
     emscripten_set_main_loop_arg(cb, arg, if (maybe_fps) |fps| fps else -1, @intFromBool(simulate_infinite_loop));
 }
 
-pub const AnimationFrameCallback = *const fn (f64, ?*anyopaque) callconv(.C) c_int;
+pub const AnimationFrameCallback = *const fn (f64, ?*anyopaque) callconv(.c) c_int;
 extern fn emscripten_request_animation_frame_loop(AnimationFrameCallback, ?*anyopaque) void;
 pub const requestAnimationFrameLoop = emscripten_request_animation_frame_loop;
 
@@ -45,7 +45,7 @@ pub const CanvasSizeChangedCallback = *const fn (
     i16,
     *anyopaque,
     ?*anyopaque,
-) callconv(.C) c_int;
+) callconv(.c) c_int;
 pub fn setResizeCallback(
     cb: CanvasSizeChangedCallback,
     use_capture: bool,
@@ -81,13 +81,13 @@ pub fn getElementCssSize(
 }
 extern fn emscripten_get_element_css_size([*:0]const u8, *f64, *f64) c_int;
 
-// EmmalocAllocator allocator
+// EmmallocAllocator allocator
 // use with linker flag -sMALLOC=emmalloc
 // for details see docs: https://github.com/emscripten-core/emscripten/blob/main/system/lib/emmalloc.c
 extern fn emmalloc_memalign(u32, u32) ?*anyopaque;
 extern fn emmalloc_realloc_try(?*anyopaque, u32) ?*anyopaque;
 extern fn emmalloc_free(?*anyopaque) void;
-pub const EmmalocAllocator = struct {
+pub const EmmallocAllocator = struct {
     const Self = @This();
     dummy: u32 = undefined,