| ... | ... | @@ -76,6 +76,8 @@ pub fn main() !void { |
| 76 | 76 | cache.addPrefix(global_cache_directory); |
| 77 | 77 | cache.hash.addBytes(builtin.zig_version_string); |
| 78 | 78 | |
| 79 | var system_library_options: std.StringArrayHashMapUnmanaged(std.Build.SystemLibraryMode) = .{}; |
| 80 | |
| 79 | 81 | const builder = try std.Build.create( |
| 80 | 82 | arena, |
| 81 | 83 | zig_exe, |
| ... | ... | @@ -85,8 +87,8 @@ pub fn main() !void { |
| 85 | 87 | host, |
| 86 | 88 | &cache, |
| 87 | 89 | dependencies.root_deps, |
| 90 | &system_library_options, |
| 88 | 91 | ); |
| 89 | | defer builder.destroy(); |
| 90 | 92 | |
| 91 | 93 | var targets = ArrayList([]const u8).init(arena); |
| 92 | 94 | var debug_log_scopes = ArrayList([]const u8).init(arena); |
| ... | ... | @@ -100,64 +102,50 @@ pub fn main() !void { |
| 100 | 102 | var color: Color = .auto; |
| 101 | 103 | var seed: u32 = 0; |
| 102 | 104 | var prominent_compile_errors: bool = false; |
| 105 | var help_menu: bool = false; |
| 106 | var steps_menu: bool = false; |
| 103 | 107 | |
| 104 | | const stderr_stream = io.getStdErr().writer(); |
| 105 | 108 | const stdout_stream = io.getStdOut().writer(); |
| 106 | 109 | |
| 107 | 110 | while (nextArg(args, &arg_idx)) |arg| { |
| 108 | 111 | if (mem.startsWith(u8, arg, "-D")) { |
| 109 | 112 | const option_contents = arg[2..]; |
| 110 | | if (option_contents.len == 0) { |
| 111 | | std.debug.print("Expected option name after '-D'\n\n", .{}); |
| 112 | | usageAndErr(builder, false, stderr_stream); |
| 113 | | } |
| 113 | if (option_contents.len == 0) |
| 114 | fatalWithHint("expected option name after '-D'", .{}); |
| 114 | 115 | if (mem.indexOfScalar(u8, option_contents, '=')) |name_end| { |
| 115 | 116 | const option_name = option_contents[0..name_end]; |
| 116 | 117 | const option_value = option_contents[name_end + 1 ..]; |
| 117 | 118 | if (try builder.addUserInputOption(option_name, option_value)) |
| 118 | | usageAndErr(builder, false, stderr_stream); |
| 119 | fatal(" access the help menu with 'zig build -h'", .{}); |
| 119 | 120 | } else { |
| 120 | 121 | if (try builder.addUserInputFlag(option_contents)) |
| 121 | | usageAndErr(builder, false, stderr_stream); |
| 122 | fatal(" access the help menu with 'zig build -h'", .{}); |
| 122 | 123 | } |
| 123 | 124 | } else if (mem.startsWith(u8, arg, "-")) { |
| 124 | 125 | if (mem.eql(u8, arg, "--verbose")) { |
| 125 | 126 | builder.verbose = true; |
| 126 | 127 | } else if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) { |
| 127 | | return usage(builder, false, stdout_stream); |
| 128 | help_menu = true; |
| 128 | 129 | } else if (mem.eql(u8, arg, "-p") or mem.eql(u8, arg, "--prefix")) { |
| 129 | | install_prefix = nextArg(args, &arg_idx) orelse { |
| 130 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 131 | | usageAndErr(builder, false, stderr_stream); |
| 132 | | }; |
| 130 | install_prefix = nextArgOrFatal(args, &arg_idx); |
| 133 | 131 | } else if (mem.eql(u8, arg, "-l") or mem.eql(u8, arg, "--list-steps")) { |
| 134 | | return steps(builder, false, stdout_stream); |
| 132 | steps_menu = true; |
| 133 | } else if (mem.eql(u8, arg, "--system-lib")) { |
| 134 | const name = nextArgOrFatal(args, &arg_idx); |
| 135 | builder.system_library_options.put(arena, name, .user_enabled) catch @panic("OOM"); |
| 136 | } else if (mem.eql(u8, arg, "--no-system-lib")) { |
| 137 | const name = nextArgOrFatal(args, &arg_idx); |
| 138 | builder.system_library_options.put(arena, name, .user_disabled) catch @panic("OOM"); |
| 135 | 139 | } else if (mem.eql(u8, arg, "--prefix-lib-dir")) { |
| 136 | | dir_list.lib_dir = nextArg(args, &arg_idx) orelse { |
| 137 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 138 | | usageAndErr(builder, false, stderr_stream); |
| 139 | | }; |
| 140 | dir_list.lib_dir = nextArgOrFatal(args, &arg_idx); |
| 140 | 141 | } else if (mem.eql(u8, arg, "--prefix-exe-dir")) { |
| 141 | | dir_list.exe_dir = nextArg(args, &arg_idx) orelse { |
| 142 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 143 | | usageAndErr(builder, false, stderr_stream); |
| 144 | | }; |
| 142 | dir_list.exe_dir = nextArgOrFatal(args, &arg_idx); |
| 145 | 143 | } else if (mem.eql(u8, arg, "--prefix-include-dir")) { |
| 146 | | dir_list.include_dir = nextArg(args, &arg_idx) orelse { |
| 147 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 148 | | usageAndErr(builder, false, stderr_stream); |
| 149 | | }; |
| 144 | dir_list.include_dir = nextArgOrFatal(args, &arg_idx); |
| 150 | 145 | } else if (mem.eql(u8, arg, "--sysroot")) { |
| 151 | | const sysroot = nextArg(args, &arg_idx) orelse { |
| 152 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 153 | | usageAndErr(builder, false, stderr_stream); |
| 154 | | }; |
| 155 | | builder.sysroot = sysroot; |
| 146 | builder.sysroot = nextArgOrFatal(args, &arg_idx); |
| 156 | 147 | } else if (mem.eql(u8, arg, "--maxrss")) { |
| 157 | | const max_rss_text = nextArg(args, &arg_idx) orelse { |
| 158 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 159 | | usageAndErr(builder, false, stderr_stream); |
| 160 | | }; |
| 148 | const max_rss_text = nextArgOrFatal(args, &arg_idx); |
| 161 | 149 | max_rss = std.fmt.parseIntSizeSuffix(max_rss_text, 10) catch |err| { |
| 162 | 150 | std.debug.print("invalid byte size: '{s}': {s}\n", .{ |
| 163 | 151 | max_rss_text, @errorName(err), |
| ... | ... | @@ -167,66 +155,45 @@ pub fn main() !void { |
| 167 | 155 | } else if (mem.eql(u8, arg, "--skip-oom-steps")) { |
| 168 | 156 | skip_oom_steps = true; |
| 169 | 157 | } else if (mem.eql(u8, arg, "--search-prefix")) { |
| 170 | | const search_prefix = nextArg(args, &arg_idx) orelse { |
| 171 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 172 | | usageAndErr(builder, false, stderr_stream); |
| 173 | | }; |
| 158 | const search_prefix = nextArgOrFatal(args, &arg_idx); |
| 174 | 159 | builder.addSearchPrefix(search_prefix); |
| 175 | 160 | } else if (mem.eql(u8, arg, "--libc")) { |
| 176 | | const libc_file = nextArg(args, &arg_idx) orelse { |
| 177 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 178 | | usageAndErr(builder, false, stderr_stream); |
| 179 | | }; |
| 180 | | builder.libc_file = libc_file; |
| 161 | builder.libc_file = nextArgOrFatal(args, &arg_idx); |
| 181 | 162 | } else if (mem.eql(u8, arg, "--color")) { |
| 182 | | const next_arg = nextArg(args, &arg_idx) orelse { |
| 183 | | std.debug.print("Expected [auto|on|off] after {s}\n\n", .{arg}); |
| 184 | | usageAndErr(builder, false, stderr_stream); |
| 185 | | }; |
| 163 | const next_arg = nextArg(args, &arg_idx) orelse |
| 164 | fatalWithHint("expected [auto|on|off] after '{s}'", .{arg}); |
| 186 | 165 | color = std.meta.stringToEnum(Color, next_arg) orelse { |
| 187 | | std.debug.print("Expected [auto|on|off] after {s}, found '{s}'\n\n", .{ arg, next_arg }); |
| 188 | | usageAndErr(builder, false, stderr_stream); |
| 166 | fatalWithHint("expected [auto|on|off] after '{s}', found '{s}'", .{ |
| 167 | arg, next_arg, |
| 168 | }); |
| 189 | 169 | }; |
| 190 | 170 | } else if (mem.eql(u8, arg, "--summary")) { |
| 191 | | const next_arg = nextArg(args, &arg_idx) orelse { |
| 192 | | std.debug.print("Expected [all|failures|none] after {s}\n\n", .{arg}); |
| 193 | | usageAndErr(builder, false, stderr_stream); |
| 194 | | }; |
| 171 | const next_arg = nextArg(args, &arg_idx) orelse |
| 172 | fatalWithHint("expected [all|failures|none] after '{s}'", .{arg}); |
| 195 | 173 | summary = std.meta.stringToEnum(Summary, next_arg) orelse { |
| 196 | | std.debug.print("Expected [all|failures|none] after {s}, found '{s}'\n\n", .{ arg, next_arg }); |
| 197 | | usageAndErr(builder, false, stderr_stream); |
| 174 | fatalWithHint("expected [all|failures|none] after '{s}', found '{s}'", .{ |
| 175 | arg, next_arg, |
| 176 | }); |
| 198 | 177 | }; |
| 199 | 178 | } else if (mem.eql(u8, arg, "--zig-lib-dir")) { |
| 200 | | builder.zig_lib_dir = .{ .cwd_relative = nextArg(args, &arg_idx) orelse { |
| 201 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 202 | | usageAndErr(builder, false, stderr_stream); |
| 203 | | } }; |
| 179 | builder.zig_lib_dir = .{ .cwd_relative = nextArgOrFatal(args, &arg_idx) }; |
| 204 | 180 | } else if (mem.eql(u8, arg, "--seed")) { |
| 205 | | const next_arg = nextArg(args, &arg_idx) orelse { |
| 206 | | std.debug.print("Expected u32 after {s}\n\n", .{arg}); |
| 207 | | usageAndErr(builder, false, stderr_stream); |
| 208 | | }; |
| 181 | const next_arg = nextArg(args, &arg_idx) orelse |
| 182 | fatalWithHint("expected u32 after '{s}'", .{arg}); |
| 209 | 183 | seed = std.fmt.parseUnsigned(u32, next_arg, 0) catch |err| { |
| 210 | | std.debug.print("unable to parse seed '{s}' as 32-bit integer: {s}\n", .{ |
| 184 | fatal("unable to parse seed '{s}' as 32-bit integer: {s}\n", .{ |
| 211 | 185 | next_arg, @errorName(err), |
| 212 | 186 | }); |
| 213 | | process.exit(1); |
| 214 | 187 | }; |
| 215 | 188 | } else if (mem.eql(u8, arg, "--debug-log")) { |
| 216 | | const next_arg = nextArg(args, &arg_idx) orelse { |
| 217 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 218 | | usageAndErr(builder, false, stderr_stream); |
| 219 | | }; |
| 189 | const next_arg = nextArgOrFatal(args, &arg_idx); |
| 220 | 190 | try debug_log_scopes.append(next_arg); |
| 221 | 191 | } else if (mem.eql(u8, arg, "--debug-pkg-config")) { |
| 222 | 192 | builder.debug_pkg_config = true; |
| 223 | 193 | } else if (mem.eql(u8, arg, "--debug-compile-errors")) { |
| 224 | 194 | builder.debug_compile_errors = true; |
| 225 | 195 | } else if (mem.eql(u8, arg, "--glibc-runtimes")) { |
| 226 | | builder.glibc_runtimes_dir = nextArg(args, &arg_idx) orelse { |
| 227 | | std.debug.print("Expected argument after {s}\n\n", .{arg}); |
| 228 | | usageAndErr(builder, false, stderr_stream); |
| 229 | | }; |
| 196 | builder.glibc_runtimes_dir = nextArgOrFatal(args, &arg_idx); |
| 230 | 197 | } else if (mem.eql(u8, arg, "--verbose-link")) { |
| 231 | 198 | builder.verbose_link = true; |
| 232 | 199 | } else if (mem.eql(u8, arg, "--verbose-air")) { |
| ... | ... | @@ -292,8 +259,7 @@ pub fn main() !void { |
| 292 | 259 | builder.args = argsRest(args, arg_idx); |
| 293 | 260 | break; |
| 294 | 261 | } else { |
| 295 | | std.debug.print("Unrecognized argument: {s}\n\n", .{arg}); |
| 296 | | usageAndErr(builder, false, stderr_stream); |
| 262 | fatalWithHint("unrecognized argument: '{s}'", .{arg}); |
| 297 | 263 | } |
| 298 | 264 | } else { |
| 299 | 265 | try targets.append(arg); |
| ... | ... | @@ -319,8 +285,17 @@ pub fn main() !void { |
| 319 | 285 | try builder.runBuild(root); |
| 320 | 286 | } |
| 321 | 287 | |
| 322 | | if (builder.validateUserInputDidItFail()) |
| 323 | | usageAndErr(builder, true, stderr_stream); |
| 288 | if (builder.validateUserInputDidItFail()) { |
| 289 | fatal(" access the help menu with 'zig build -h'", .{}); |
| 290 | } |
| 291 | |
| 292 | validateSystemLibraryOptions(builder); |
| 293 | |
| 294 | if (help_menu) |
| 295 | return usage(builder, stdout_stream); |
| 296 | |
| 297 | if (steps_menu) |
| 298 | return steps(builder, stdout_stream); |
| 324 | 299 | |
| 325 | 300 | var run: Run = .{ |
| 326 | 301 | .max_rss = max_rss, |
| ... | ... | @@ -389,7 +364,7 @@ fn runStepNames( |
| 389 | 364 | for (0..step_names.len) |i| { |
| 390 | 365 | const step_name = step_names[step_names.len - i - 1]; |
| 391 | 366 | const s = b.top_level_steps.get(step_name) orelse { |
| 392 | | std.debug.print("no step named '{s}'. Access the help menu with 'zig build -h'\n", .{step_name}); |
| 367 | std.debug.print("no step named '{s}'\n access the help menu with 'zig build -h'\n", .{step_name}); |
| 393 | 368 | process.exit(1); |
| 394 | 369 | }; |
| 395 | 370 | step_stack.putAssumeCapacity(&s.step, {}); |
| ... | ... | @@ -1037,13 +1012,7 @@ fn printErrorMessages(b: *std.Build, failing_step: *Step, run: *const Run) !void |
| 1037 | 1012 | } |
| 1038 | 1013 | } |
| 1039 | 1014 | |
| 1040 | | fn steps(builder: *std.Build, already_ran_build: bool, out_stream: anytype) !void { |
| 1041 | | // run the build script to collect the options |
| 1042 | | if (!already_ran_build) { |
| 1043 | | builder.resolveInstallPrefix(null, .{}); |
| 1044 | | try builder.runBuild(root); |
| 1045 | | } |
| 1046 | | |
| 1015 | fn steps(builder: *std.Build, out_stream: anytype) !void { |
| 1047 | 1016 | const allocator = builder.allocator; |
| 1048 | 1017 | for (builder.top_level_steps.values()) |top_level_step| { |
| 1049 | 1018 | const name = if (&top_level_step.step == builder.default_step) |
| ... | ... | @@ -1054,29 +1023,22 @@ fn steps(builder: *std.Build, already_ran_build: bool, out_stream: anytype) !voi |
| 1054 | 1023 | } |
| 1055 | 1024 | } |
| 1056 | 1025 | |
| 1057 | | fn usage(builder: *std.Build, already_ran_build: bool, out_stream: anytype) !void { |
| 1058 | | // run the build script to collect the options |
| 1059 | | if (!already_ran_build) { |
| 1060 | | builder.resolveInstallPrefix(null, .{}); |
| 1061 | | try builder.runBuild(root); |
| 1062 | | } |
| 1063 | | |
| 1026 | fn usage(b: *std.Build, out_stream: anytype) !void { |
| 1064 | 1027 | try out_stream.print( |
| 1065 | | \\ |
| 1066 | 1028 | \\Usage: {s} build [steps] [options] |
| 1067 | 1029 | \\ |
| 1068 | 1030 | \\Steps: |
| 1069 | 1031 | \\ |
| 1070 | | , .{builder.zig_exe}); |
| 1071 | | try steps(builder, true, out_stream); |
| 1032 | , .{b.zig_exe}); |
| 1033 | try steps(b, out_stream); |
| 1072 | 1034 | |
| 1073 | 1035 | try out_stream.writeAll( |
| 1074 | 1036 | \\ |
| 1075 | 1037 | \\General Options: |
| 1076 | | \\ -p, --prefix [path] Override default install prefix |
| 1077 | | \\ --prefix-lib-dir [path] Override default library directory path |
| 1078 | | \\ --prefix-exe-dir [path] Override default executable directory path |
| 1079 | | \\ --prefix-include-dir [path] Override default include directory path |
| 1038 | \\ -p, --prefix [path] Where to put installed files (default: zig-out) |
| 1039 | \\ --prefix-lib-dir [path] Where to put installed libraries |
| 1040 | \\ --prefix-exe-dir [path] Where to put installed executables |
| 1041 | \\ --prefix-include-dir [path] Where to put installed C header files |
| 1080 | 1042 | \\ |
| 1081 | 1043 | \\ --sysroot [path] Set the system root directory (usually /) |
| 1082 | 1044 | \\ --search-prefix [path] Add a path to look for binaries, libraries, headers |
| ... | ... | @@ -1116,16 +1078,15 @@ fn usage(builder: *std.Build, already_ran_build: bool, out_stream: anytype) !voi |
| 1116 | 1078 | \\ |
| 1117 | 1079 | ); |
| 1118 | 1080 | |
| 1119 | | const allocator = builder.allocator; |
| 1120 | | if (builder.available_options_list.items.len == 0) { |
| 1081 | const arena = b.allocator; |
| 1082 | if (b.available_options_list.items.len == 0) { |
| 1121 | 1083 | try out_stream.print(" (none)\n", .{}); |
| 1122 | 1084 | } else { |
| 1123 | | for (builder.available_options_list.items) |option| { |
| 1124 | | const name = try fmt.allocPrint(allocator, " -D{s}=[{s}]", .{ |
| 1085 | for (b.available_options_list.items) |option| { |
| 1086 | const name = try fmt.allocPrint(arena, " -D{s}=[{s}]", .{ |
| 1125 | 1087 | option.name, |
| 1126 | 1088 | @tagName(option.type_id), |
| 1127 | 1089 | }); |
| 1128 | | defer allocator.free(name); |
| 1129 | 1090 | try out_stream.print("{s:<30} {s}\n", .{ name, option.description }); |
| 1130 | 1091 | if (option.enum_options) |enum_options| { |
| 1131 | 1092 | const padding = " " ** 33; |
| ... | ... | @@ -1137,6 +1098,31 @@ fn usage(builder: *std.Build, already_ran_build: bool, out_stream: anytype) !voi |
| 1137 | 1098 | } |
| 1138 | 1099 | } |
| 1139 | 1100 | |
| 1101 | try out_stream.writeAll( |
| 1102 | \\ |
| 1103 | \\System Integration Options: |
| 1104 | \\ --system [dir] System Package Mode. Disable fetching; prefer system libs |
| 1105 | \\ --host-target [triple] Use the provided target as the host |
| 1106 | \\ --host-cpu [cpu] Use the provided CPU as the host |
| 1107 | \\ --system-lib [name] Use the system-provided library |
| 1108 | \\ --no-system-lib [name] Do not use the system-provided library |
| 1109 | \\ |
| 1110 | \\ Available System Library Integrations: Enabled: |
| 1111 | \\ |
| 1112 | ); |
| 1113 | if (b.system_library_options.entries.len == 0) { |
| 1114 | try out_stream.writeAll(" (none) -\n"); |
| 1115 | } else { |
| 1116 | for (b.system_library_options.keys(), b.system_library_options.values()) |name, v| { |
| 1117 | const status = switch (v) { |
| 1118 | .declared_enabled => "yes", |
| 1119 | .declared_disabled => "no", |
| 1120 | .user_enabled, .user_disabled => unreachable, // already emitted error |
| 1121 | }; |
| 1122 | try out_stream.print(" {s:<43} {s}\n", .{ name, status }); |
| 1123 | } |
| 1124 | } |
| 1125 | |
| 1140 | 1126 | try out_stream.writeAll( |
| 1141 | 1127 | \\ |
| 1142 | 1128 | \\Advanced Options: |
| ... | ... | @@ -1161,17 +1147,19 @@ fn usage(builder: *std.Build, already_ran_build: bool, out_stream: anytype) !voi |
| 1161 | 1147 | ); |
| 1162 | 1148 | } |
| 1163 | 1149 | |
| 1164 | | fn usageAndErr(builder: *std.Build, already_ran_build: bool, out_stream: anytype) noreturn { |
| 1165 | | usage(builder, already_ran_build, out_stream) catch {}; |
| 1166 | | process.exit(1); |
| 1167 | | } |
| 1168 | | |
| 1169 | 1150 | fn nextArg(args: [][:0]const u8, idx: *usize) ?[:0]const u8 { |
| 1170 | 1151 | if (idx.* >= args.len) return null; |
| 1171 | 1152 | defer idx.* += 1; |
| 1172 | 1153 | return args[idx.*]; |
| 1173 | 1154 | } |
| 1174 | 1155 | |
| 1156 | fn nextArgOrFatal(args: [][:0]const u8, idx: *usize) [:0]const u8 { |
| 1157 | return nextArg(args, idx) orelse { |
| 1158 | std.debug.print("expected argument after '{s}'\n access the help menu with 'zig build -h'\n", .{args[idx.*]}); |
| 1159 | process.exit(1); |
| 1160 | }; |
| 1161 | } |
| 1162 | |
| 1175 | 1163 | fn argsRest(args: [][:0]const u8, idx: usize) ?[][:0]const u8 { |
| 1176 | 1164 | if (idx >= args.len) return null; |
| 1177 | 1165 | return args[idx..]; |
| ... | ... | @@ -1202,3 +1190,32 @@ fn renderOptions(ttyconf: std.io.tty.Config) std.zig.ErrorBundle.RenderOptions { |
| 1202 | 1190 | .include_reference_trace = ttyconf != .no_color, |
| 1203 | 1191 | }; |
| 1204 | 1192 | } |
| 1193 | |
| 1194 | fn fatalWithHint(comptime f: []const u8, args: anytype) noreturn { |
| 1195 | std.debug.print(f ++ "\n access the help menu with 'zig build -h'\n", args); |
| 1196 | process.exit(1); |
| 1197 | } |
| 1198 | |
| 1199 | fn fatal(comptime f: []const u8, args: anytype) noreturn { |
| 1200 | std.debug.print(f ++ "\n", args); |
| 1201 | process.exit(1); |
| 1202 | } |
| 1203 | |
| 1204 | fn validateSystemLibraryOptions(b: *std.Build) void { |
| 1205 | var bad = false; |
| 1206 | for (b.system_library_options.keys(), b.system_library_options.values()) |k, v| { |
| 1207 | switch (v) { |
| 1208 | .user_disabled, .user_enabled => { |
| 1209 | // The user tried to enable or disable a system library integration, but |
| 1210 | // the build script did not recognize that option. |
| 1211 | std.debug.print("system library name not recognized by build script: '{s}'\n", .{k}); |
| 1212 | bad = true; |
| 1213 | }, |
| 1214 | .declared_disabled, .declared_enabled => {}, |
| 1215 | } |
| 1216 | } |
| 1217 | if (bad) { |
| 1218 | std.debug.print(" access the help menu with 'zig build -h'\n", .{}); |
| 1219 | process.exit(1); |
| 1220 | } |
| 1221 | } |