Browse Source

zig update, use @import("builtin")

Jonathan Marler 3 years ago
parent
commit
9d805a728a
6 changed files with 12 additions and 9 deletions
  1. 1 1
      fixdeletetree.zig
  2. 5 3
      test.zig
  3. 3 2
      ziget-build-files-copy/build.zig
  4. 1 1
      ziget-build-files-copy/iguanasha
  5. 1 1
      zigetsha
  6. 1 1
      zigup.zig

+ 1 - 1
fixdeletetree.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const builtin = std.builtin;
+const builtin = @import("builtin");
 
 //
 // TODO: we should fix std library to address these issues

+ 5 - 3
test.zig

@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const testing = std.testing;
 
 const sep = std.fs.path.sep_str;
@@ -15,8 +16,8 @@ pub fn main() !void {
     try std.fs.cwd().makeDir(bin_dir);
 
     // NOTE: for now we are incorrectly assuming the install dir is CWD/zig-out
-    const zigup = "." ++ sep ++ "zig-out" ++ sep ++ "bin" ++ sep ++ "zigup" ++ std.builtin.target.exeFileExt();
-    const path_link = if (std.builtin.os.tag == .windows) "scratch\\zig.bat" else (bin_dir ++ sep ++ "zig");
+    const zigup = "." ++ sep ++ "zig-out" ++ sep ++ "bin" ++ sep ++ "zigup" ++ builtin.target.exeFileExt();
+    const path_link = if (builtin.os.tag == .windows) "scratch\\zig.bat" else (bin_dir ++ sep ++ "zig");
     const zigup_args = &[_][]const u8 { zigup, "--install-dir", install_dir, "--path-link", path_link };
 
     var allocator_store = std.heap.ArenaAllocator.init(std.heap.page_allocator);
@@ -110,6 +111,7 @@ pub fn main() !void {
         try testing.expect(std.mem.containsAtLeast(u8, result.stderr, 1, "HTTP request failed"));
     }
     try testing.expectEqual(@as(u32, 2), try getCompilerCount(install_dir));
+    std.log.info("Success", .{});
 }
 
 fn getCompilerCount(install_dir: []const u8) !u32 {
@@ -121,7 +123,7 @@ fn getCompilerCount(install_dir: []const u8) !u32 {
         if (entry.kind == .Directory) {
             count += 1;
         } else {
-            if (std.builtin.os.tag == .windows) {
+            if (builtin.os.tag == .windows) {
                 try testing.expect(entry.kind == .File);
             } else {
                 try testing.expect(entry.kind == .SymLink);

+ 3 - 2
ziget-build-files-copy/build.zig

@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const Builder = std.build.Builder;
 const Pkg = std.build.Pkg;
 
@@ -37,7 +38,7 @@ fn addTests(b: *Builder, target: std.zig.CrossTarget, mode: std.builtin.Mode) vo
         const enum_value = @field(SslBackend, field.name);
         const enabled_by_default =
             if (enum_value == .wolfssl) false
-            else if (enum_value == .schannel and std.builtin.os.tag != .windows) false
+            else if (enum_value == .schannel and builtin.os.tag != .windows) false
             else true;
         addTest(test_step, test_exe, field.name, enabled_by_default);
     }
@@ -114,7 +115,7 @@ pub fn addSslBackend(step: *std.build.LibExeObjStep, backend: SslBackend, ziget_
     switch (backend) {
         .openssl => {
             step.linkSystemLibrary("c");
-            if (std.builtin.os.tag == .windows) {
+            if (builtin.os.tag == .windows) {
                 step.linkSystemLibrary("libcrypto");
                 step.linkSystemLibrary("libssl");
                 try setupOpensslWindows(step);

+ 1 - 1
ziget-build-files-copy/iguanasha

@@ -1 +1 @@
-ea3ee83dd816f815cedcb67e4896ade701038b90
+c1106fa6ecac1d51e8148cd47a8a4b99bb307af8

+ 1 - 1
zigetsha

@@ -1 +1 @@
-85f25dcdd107c9dcabd525aa5c9e2ccd0e163f76
+5b6f0667c906e1c76b71317a599d9a3831d50661

+ 1 - 1
zigup.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const builtin = std.builtin;
+const builtin = @import("builtin");
 const mem = std.mem;
 
 const ArrayList = std.ArrayList;