Force user to specify where emsdk dependency is coming from

README.md

@@ -11,7 +11,8 @@ Add `zemscripten` and (optionally) `emsdk` to your build.zig.zon dependencies
 
 Emsdk must be activated before it can be used. You can use `activateEmsdkStep` to create a build step for that:
 ```zig
-    const activate_emsdk_step = @import("zemscripten").activateEmsdkStep(b);
+    const emsdk_dep = b.dependency("emsdk", .{});
+    const activate_emsdk_step = @import("zemscripten").activateEmsdkStep(b, emsdk_dep);
 ```
 
 Add zemscripten's "root" module to your wasm compile target., then create an `emcc` build step. We use zemscripten's default flags and settings which can be overridden for your project specific requirements. Refer to the [emcc documentation](https://emscripten.org/docs/tools_reference/emcc.html). Example build.zig code:
@@ -39,6 +40,7 @@ Add zemscripten's "root" module to your wasm compile target., then create an `em
 
     const emcc_step = @import("zemscripten").emccStep(
         b,
+        emsdk_dep,
         &.{ }, // src file paths 
         &.{ wasm }, // src compile steps
         .{
@@ -83,6 +85,7 @@ You can also define a run step that invokes `emrun`. This will serve the html lo
     const emrun_args = .{};
     const emrun_step = @import("zemscripten").emrunStep(
         b,
+        emsdk_dep,
         b.getInstallPath(.{ .custom = "web" }, html_filename),
         &emrun_args,
     );

build.zig

@@ -10,45 +10,45 @@ pub fn build(b: *std.Build) void {
     _ = b.addModule("root", .{ .root_source_file = b.path("src/zemscripten.zig") });
 }
 
-pub fn emccPath(b: *std.Build) []const u8 {
-    return std.fs.path.join(b.allocator, &.{
-        b.dependency("emsdk", .{}).path("").getPath(b),
+pub fn emccPath(b: *std.Build, emsdk_dep: *std.Build.Dependency) []const u8 {
+    return b.pathJoin(&.{
+        emsdk_dep.path("").getPath(b),
         "upstream",
         "emscripten",
         "emcc.py",
-    }) catch unreachable;
+    });
 }
 
-pub fn emrunPath(b: *std.Build) []const u8 {
-    return std.fs.path.join(b.allocator, &.{
-        b.dependency("emsdk", .{}).path("").getPath(b),
+pub fn emrunPath(b: *std.Build, emsdk_dep: *std.Build.Dependency) []const u8 {
+    return b.pathJoin(&.{
+        emsdk_dep.path("").getPath(b),
         "upstream",
         "emscripten",
         switch (builtin.target.os.tag) {
             .windows => "emrun.bat",
             else => "emrun",
         },
-    }) catch unreachable;
+    });
 }
 
-pub fn htmlPath(b: *std.Build) []const u8 {
-    return std.fs.path.join(b.allocator, &.{
-        b.dependency("emsdk", .{}).path("").getPath(b),
+pub fn htmlPath(b: *std.Build, emsdk_dep: *std.Build.Dependency) []const u8 {
+    return b.pathJoin(&.{
+        emsdk_dep.path("").getPath(b),
         "upstream",
         "emscripten",
         "src",
         "shell.html",
-    }) catch unreachable;
+    });
 }
 
-pub fn activateEmsdkStep(b: *std.Build) *std.Build.Step {
-    const emsdk_script_path = std.fs.path.join(b.allocator, &.{
-        b.dependency("emsdk", .{}).path("").getPath(b),
+pub fn activateEmsdkStep(b: *std.Build, emsdk_dep: *std.Build.Dependency) *std.Build.Step {
+    const emsdk_script_path = b.pathJoin(&.{
+        emsdk_dep.path("").getPath(b),
         switch (builtin.target.os.tag) {
             .windows => "emsdk.bat",
             else => "emsdk",
         },
-    }) catch unreachable;
+    });
 
     var emsdk_update = b.addSystemCommand(&.{ emsdk_script_path, "update" });
 
@@ -80,11 +80,11 @@ pub fn activateEmsdkStep(b: *std.Build) *std.Build.Step {
 
     switch (builtin.target.os.tag) {
         .linux, .macos => {
-            const chmod_emcc = b.addSystemCommand(&.{ "chmod", "a+x", emccPath(b) });
+            const chmod_emcc = b.addSystemCommand(&.{ "chmod", "a+x", emccPath(b, emsdk_dep) });
             chmod_emcc.step.dependOn(&emsdk_activate.step);
             step.dependOn(&chmod_emcc.step);
 
-            const chmod_emrun = b.addSystemCommand(&.{ "chmod", "a+x", emrunPath(b) });
+            const chmod_emrun = b.addSystemCommand(&.{ "chmod", "a+x", emrunPath(b, emsdk_dep) });
             chmod_emrun.step.dependOn(&emsdk_activate.step);
             step.dependOn(&chmod_emrun.step);
         },
@@ -197,11 +197,12 @@ pub const StepOptions = struct {
 
 pub fn emccStep(
     b: *std.Build,
+    emsdk_dep: *std.Build.Dependency,
     src_paths: []const std.Build.LazyPath,
     compile_steps: []const *std.Build.Step.Compile,
     options: StepOptions,
 ) *std.Build.Step {
-    var emcc = b.addSystemCommand(&.{emccPath(b)});
+    var emcc = b.addSystemCommand(&.{emccPath(b, emsdk_dep)});
 
     var iterFlags = options.flags.iterator();
     while (iterFlags.next()) |kvp| {
@@ -283,10 +284,11 @@ pub fn emccStep(
 
 pub fn emrunStep(
     b: *std.Build,
+    emsdk_dep: *std.Build.Dependency,
     html_path: []const u8,
     extra_args: []const []const u8,
 ) *std.Build.Step {
-    var emrun = b.addSystemCommand(&.{emrunPath(b)});
+    var emrun = b.addSystemCommand(&.{emrunPath(b, emsdk_dep)});
     emrun.addArgs(extra_args);
     emrun.addArg(html_path);
     // emrun.addArg("--");