.mise.toml

@@ -2,4 +2,4 @@
 prek = "0.3.1"
 "ubi:DonIsaac/zlint" = "0.7.9"
 zig = "0.16.0"
-zls = "0.16.0"
+zls = "0.15.1"

Makefile

@@ -0,0 +1,15 @@
+start-hand-test: src/main.zig src/aws.zig src/xml.zig
+	@zig build-exe -static -I/usr/local/include -Isrc/ -lc --strip \
+		--name start-hand-test src/main.zig src/bitfield-workaround.c \
+		/usr/local/lib64/libaws-c-*.a \
+		/usr/local/lib64/libs2n.a \
+		/usr/local/lib/libcrypto.a \
+		/usr/local/lib/libssl.a
+
+elasticurl: curl.c
+	@zig build-exe -static -I/usr/local/include -Isrc/ -lc --strip \
+		--name elasticurl curl.c \
+		/usr/local/lib64/libaws-c-*.a \
+		/usr/local/lib64/libs2n.a \
+		/usr/local/lib/libcrypto.a \
+		/usr/local/lib/libssl.a

codegen/src/main.zig

@@ -57,32 +57,30 @@ pub fn main(init: std.process.Init) anyerror!void {
             models_dir = try std.Io.Dir.cwd().openDir(io, args[i + 1], .{ .iterate = true });
     }
 
+    var manifest_file = try output_dir.createFile(io, "service_manifest.zig", .{});
+    defer manifest_file.close(io);
+    var manifest = manifest_file.writer(io, &manifest_buf).interface;
+    defer manifest.flush() catch @panic("Could not flush service manifest");
     var files_processed: usize = 0;
-    {
+    var skip_next = true;
-        var manifest_file = try output_dir.createFile(io, "service_manifest.zig", .{});
+    for (args) |arg| {
-        defer manifest_file.close(io);
+        if (skip_next) {
-        var manifest = manifest_file.writer(io, &manifest_buf).interface;
+            skip_next = false;
-        defer manifest.flush() catch @panic("Could not flush service manifest");
+            continue;
-        var skip_next = true;
-        for (args) |arg| {
-            if (skip_next) {
-                skip_next = false;
-                continue;
-            }
-            if (std.mem.eql(u8, "--verbose", arg)) {
-                verbose = true;
-                continue;
-            }
-
-            if (std.mem.eql(u8, "--models", arg) or
-                std.mem.eql(u8, "--output", arg))
-            {
-                skip_next = true;
-                continue;
-            }
-            try processFile(io, arg, output_dir, &manifest);
-            files_processed += 1;
         }
+        if (std.mem.eql(u8, "--verbose", arg)) {
+            verbose = true;
+            continue;
+        }
+
+        if (std.mem.eql(u8, "--models", arg) or
+            std.mem.eql(u8, "--output", arg))
+        {
+            skip_next = true;
+            continue;
+        }
+        try processFile(io, arg, output_dir, &manifest);
+        files_processed += 1;
     }
     if (files_processed == 0) {
         // no files specified, look for json files in models directory or cwd
@@ -104,15 +102,7 @@ pub fn main(init: std.process.Init) anyerror!void {
 
     if (verbose) {
         const output_path = try output_dir.realPathFileAlloc(io, ".", allocator);
-        // Build system suppresses stdout, we have to send this to stderr
         std.debug.print("Output path: {s}\n", .{output_path});
-        std.debug.print(
-            \\Note: if this is run from within zig build, output from verbose mode will
-            \\      trigger zig to say 'failed command'. This program has succeeded,
-            \\      and the message from the build system will not effect actual processing
-            \\      of the build. It is simply indicative of the build runner detecting
-            \\      output
-        , .{});
     }
 }
 

example/build.zig.zon

@@ -6,8 +6,8 @@
 
     .dependencies = .{
         .aws = .{
-            .url = "https://git.lerch.org/api/packages/lobo/generic/aws-sdk-with-models/2fddf4f122198ba64fbb2320e702b317b0b86837/2fddf4f122198ba64fbb2320e702b317b0b86837-with-models.tar.gz",
+            .url = "https://git.lerch.org/api/packages/lobo/generic/aws-sdk-with-models/e41f98b389539c8bc6b1a231d25e2980318e5ef4/e41f98b389539c8bc6b1a231d25e2980318e5ef4-with-models.tar.gz",
-            .hash = "aws-0.0.1-SbsFcLhoAwQ5TcclMwXhIljwW0Zz_Kcjd4yrIeQq5uHt",
+            .hash = "aws-0.0.1-SbsFcI0RCgBdf1nak95gi1kAtI6sv3Ntb7BPETH30fpS",
         },
     },
 }

example/src/main.zig

@@ -11,11 +11,12 @@ pub const std_options: std.Options = .{
     },
 };
 
-pub fn main(init: std.process.Init) anyerror!void {
+pub fn main() anyerror!void {
-    const allocator = init.gpa;
+    var gpa = std.heap.GeneralPurposeAllocator(.{}){};
-    const io = init.io;
+    defer _ = gpa.deinit();
+    const allocator = gpa.allocator();
     var stdout_buffer: [1024]u8 = undefined;
-    var stdout_raw = std.Io.File.stdout().writer(io, &stdout_buffer);
+    var stdout_raw = std.fs.File.stdout().writer(&stdout_buffer);
     const stdout = &stdout_raw.interface;
     defer stdout.flush() catch unreachable;
 
@@ -27,7 +28,10 @@ pub fn main(init: std.process.Init) anyerror!void {
     // };
     //
     // var client = aws.Client.init(allocator, .{ .proxy = proxy });
-    var client = aws.Client.init(allocator, .{ .io = io, .map = init.environ_map });
+    var threaded: std.Io.Threaded = .init(allocator);
+    defer threaded.deinit();
+    const io = threaded.io();
+    var client = aws.Client.init(allocator, .{ .io = io });
     defer client.deinit();
 
     const options = aws.Options{

zlint.json

@@ -1,3 +1,3 @@
 {
-  "ignore": ["lib/json/src/json.zig", "codegen/src/Hasher.zig"]
+  "ignore": ["lib/json/src/json.zig"]
 }