zig

commit 7d5538c32b7acfb6878be4178af2f71977d0cf9d (tree)
parent 193c529b8c9529c4303aeb3a8864dfee9b1d2485
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Mon, 14 Jun 2021 11:56:58 -0700

zig build: rename --lib-dir, --include-dir, --exe-dir

To --prefix-lib-dir, --prefix-include-dir, --prefix-exe-dir,
respectively.

Diffstat:
M
lib/std/special/build_runner.zig
 | 
18
++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/lib/std/special/build_runner.zig b/lib/std/special/build_runner.zig
@@ -89,17 +89,17 @@ pub fn main() !void {
                     warn("Expected argument after {s}\n\n", .{arg});
                     return usageAndErr(builder, false, stderr_stream);
                 };
-            } else if (mem.eql(u8, arg, "--lib-dir")) {
+            } else if (mem.eql(u8, arg, "--prefix-lib-dir")) {
                 dir_list.lib_dir = nextArg(args, &arg_idx) orelse {
                     warn("Expected argument after {s}\n\n", .{arg});
                     return usageAndErr(builder, false, stderr_stream);
                 };
-            } else if (mem.eql(u8, arg, "--exe-dir")) {
+            } else if (mem.eql(u8, arg, "--prefix-exe-dir")) {
                 dir_list.exe_dir = nextArg(args, &arg_idx) orelse {
                     warn("Expected argument after {s}\n\n", .{arg});
                     return usageAndErr(builder, false, stderr_stream);
                 };
-            } else if (mem.eql(u8, arg, "--include-dir")) {
+            } else if (mem.eql(u8, arg, "--prefix-include-dir")) {
                 dir_list.include_dir = nextArg(args, &arg_idx) orelse {
                     warn("Expected argument after {s}\n\n", .{arg});
                     return usageAndErr(builder, false, stderr_stream);
@@ -203,13 +203,15 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void 
     try out_stream.writeAll(
         \\
         \\General Options:
+        \\  -p, --prefix         [path] Override default install prefix
+        \\  --prefix-lib-dir     [path] Override default library directory path
+        \\  --prefix-exe-dir     [path] Override default executable directory path
+        \\  --prefix-include-dir [path] Override default include directory path
+        \\
+        \\  --search-prefix [path]      Add a path to look for binaries, libraries, headers
+        \\
         \\  -h, --help                  Print this help and exit
         \\  --verbose                   Print commands before executing them
-        \\  -p, --prefix [path]         Override default install prefix
-        \\  --lib-dir [path]            Override default library directory path
-        \\  --exe-dir [path]            Override default executable directory path
-        \\  --include-dir [path]        Override default include directory path
-        \\  --search-prefix [path]      Add a path to look for binaries, libraries, headers
         \\  --color [auto|off|on]       Enable or disable colored error messages
         \\
         \\Project-Specific Options: