authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-14 11:56:58-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-14 11:56:58-07:00
log7d5538c32b7acfb6878be4178af2f71977d0cf9d
tree0f910772d58b670c89186a3ba49fc1d2e688b443
parent193c529b8c9529c4303aeb3a8864dfee9b1d2485

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

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

1 files changed, 10 insertions(+), 8 deletions(-)

lib/std/special/build_runner.zig+10-8
...@@ -89,17 +89,17 @@ pub fn main() !void {...@@ -89,17 +89,17 @@ pub fn main() !void {
89 warn("Expected argument after {s}\n\n", .{arg});89 warn("Expected argument after {s}\n\n", .{arg});
90 return usageAndErr(builder, false, stderr_stream);90 return usageAndErr(builder, false, stderr_stream);
91 };91 };
92 } else if (mem.eql(u8, arg, "--lib-dir")) {92 } else if (mem.eql(u8, arg, "--prefix-lib-dir")) {
93 dir_list.lib_dir = nextArg(args, &arg_idx) orelse {93 dir_list.lib_dir = nextArg(args, &arg_idx) orelse {
94 warn("Expected argument after {s}\n\n", .{arg});94 warn("Expected argument after {s}\n\n", .{arg});
95 return usageAndErr(builder, false, stderr_stream);95 return usageAndErr(builder, false, stderr_stream);
96 };96 };
97 } else if (mem.eql(u8, arg, "--exe-dir")) {97 } else if (mem.eql(u8, arg, "--prefix-exe-dir")) {
98 dir_list.exe_dir = nextArg(args, &arg_idx) orelse {98 dir_list.exe_dir = nextArg(args, &arg_idx) orelse {
99 warn("Expected argument after {s}\n\n", .{arg});99 warn("Expected argument after {s}\n\n", .{arg});
100 return usageAndErr(builder, false, stderr_stream);100 return usageAndErr(builder, false, stderr_stream);
101 };101 };
102 } else if (mem.eql(u8, arg, "--include-dir")) {102 } else if (mem.eql(u8, arg, "--prefix-include-dir")) {
103 dir_list.include_dir = nextArg(args, &arg_idx) orelse {103 dir_list.include_dir = nextArg(args, &arg_idx) orelse {
104 warn("Expected argument after {s}\n\n", .{arg});104 warn("Expected argument after {s}\n\n", .{arg});
105 return usageAndErr(builder, false, stderr_stream);105 return usageAndErr(builder, false, stderr_stream);
...@@ -203,13 +203,15 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void...@@ -203,13 +203,15 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void
203 try out_stream.writeAll(203 try out_stream.writeAll(
204 \\204 \\
205 \\General Options:205 \\General Options:
206 \\ -p, --prefix [path] Override default install prefix
207 \\ --prefix-lib-dir [path] Override default library directory path
208 \\ --prefix-exe-dir [path] Override default executable directory path
209 \\ --prefix-include-dir [path] Override default include directory path
210 \\
211 \\ --search-prefix [path] Add a path to look for binaries, libraries, headers
212 \\
206 \\ -h, --help Print this help and exit213 \\ -h, --help Print this help and exit
207 \\ --verbose Print commands before executing them214 \\ --verbose Print commands before executing them
208 \\ -p, --prefix [path] Override default install prefix
209 \\ --lib-dir [path] Override default library directory path
210 \\ --exe-dir [path] Override default executable directory path
211 \\ --include-dir [path] Override default include directory path
212 \\ --search-prefix [path] Add a path to look for binaries, libraries, headers
213 \\ --color [auto|off|on] Enable or disable colored error messages215 \\ --color [auto|off|on] Enable or disable colored error messages
214 \\216 \\
215 \\Project-Specific Options:217 \\Project-Specific Options: