Merge branch 'marler8997:master' into all_arch

Author: kassane

README.md

@@ -50,7 +50,7 @@ cp zig-out/bin/zigup BIN_PATH
 
 # Building Zigup
 
-Zigup is currently built/tested using zig 0.11.0.
+Zigup is currently built/tested using zig 0.12.0.
 
 # TODO
 

build.zig

@@ -11,15 +11,19 @@ pub fn build(b: *std.Build) !void {
     //var github_release_step = b.step("github-release", "Build the github-release binaries");
     //try addGithubReleaseExe(b, github_release_step, ziget_repo, "x86_64-linux", .std);
 
-    const target = if (b.option([]const u8, "ci_target", "the CI target being built")) |ci_target|
+    const maybe_ci_target = b.option([]const u8, "ci_target", "the CI target being built");
+    const target = if (maybe_ci_target) |ci_target|
         b.resolveTargetQuery(try std.zig.CrossTarget.parse(.{ .arch_os_abi = ci_target_map.get(ci_target) orelse {
             std.log.err("unknown ci_target '{s}'", .{ci_target});
             std.process.exit(1);
         } }))
     else
         b.standardTargetOptions(.{});
 
-    const optimize = b.standardOptimizeOption(.{});
+    // Compile in ReleaseSafe on Windows for faster extraction
+    const optimize: std.builtin.OptimizeMode = if (
+        (maybe_ci_target != null) and (target.result.os.tag == .windows)
+    ) .ReleaseSafe else b.standardOptimizeOption(.{});
 
     const win32exelink_mod: ?*std.Build.Module = blk: {
         if (target.result.os.tag == .windows) {

unzip.zig

@@ -78,5 +78,7 @@ pub fn main() !void {
     const zip_file = std.fs.cwd().openFile(zip_file_arg, .{}) catch |err|
         fatal("open '{s}' failed: {s}", .{zip_file_arg, @errorName(err)});
     defer zip_file.close();
-    try @import("zip.zig").pipeToFileSystem(out_dir, zip_file);
+    try @import("zip.zig").extract(out_dir, zip_file.seekableStream(), .{
+        .allow_backslashes = true,
+    });
 }

zigup.zig

@@ -1010,7 +1010,7 @@ fn installCompiler(allocator: Allocator, compiler_dir: []const u8, url: []const
                     var timer = try std.time.Timer.start();
                     var archive_file = try std.fs.openFileAbsolute(archive_absolute, .{});
                     defer archive_file.close();
-                    try zip.pipeToFileSystem(installing_dir_opened, archive_file);
+                    try zip.extract(installing_dir_opened, archive_file.seekableStream(), .{});
                     const time = timer.read();
                     loginfo("extracted archive in {d:.2} s", .{@as(f32, @floatFromInt(time)) / @as(f32, @floatFromInt(std.time.ns_per_s))});
                 }