@pkmn/engine 0.1.0-dev.b01cb48c → 0.1.0-dev.b3197aa3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (81) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +54 -6
  3. package/build/pkg/addon/browser.d.ts +3 -0
  4. package/build/pkg/addon/browser.js +47 -0
  5. package/build/pkg/addon/browser.js.map +1 -0
  6. package/build/pkg/addon/node.d.ts +3 -0
  7. package/build/pkg/addon/node.js +110 -0
  8. package/build/pkg/addon/node.js.map +1 -0
  9. package/build/pkg/addon/wasm.d.ts +2 -0
  10. package/build/pkg/addon/wasm.js +53 -0
  11. package/build/pkg/addon/wasm.js.map +1 -0
  12. package/build/pkg/addon.d.ts +25 -3
  13. package/build/pkg/addon.js +34 -65
  14. package/build/pkg/addon.js.map +1 -1
  15. package/build/pkg/data/layout.json +15 -2
  16. package/build/pkg/data/protocol.json +23 -9
  17. package/build/pkg/data.d.ts +23 -1
  18. package/build/pkg/data.js.map +1 -1
  19. package/build/pkg/gen1.d.ts +15 -18
  20. package/build/pkg/gen1.js +28 -19
  21. package/build/pkg/gen1.js.map +1 -1
  22. package/build/pkg/index.d.ts +40 -90
  23. package/build/pkg/index.js +23 -70
  24. package/build/pkg/index.js.map +1 -1
  25. package/build/pkg/protocol.d.ts +20 -1
  26. package/build/pkg/protocol.js +105 -103
  27. package/build/pkg/protocol.js.map +1 -1
  28. package/build/tools/debug.js +52 -76
  29. package/build/tools/debug.js.map +1 -1
  30. package/build/tools/display/debug.jsx +152 -0
  31. package/build/tools/display/debug.jsx.map +1 -0
  32. package/build/tools/display/index.js +152 -0
  33. package/build/tools/display/index.js.map +1 -0
  34. package/build/tools/display/ui.jsx +359 -0
  35. package/build/tools/display/ui.jsx.map +1 -0
  36. package/build/tools/display/util.js +33 -0
  37. package/build/tools/display/util.js.map +1 -0
  38. package/build.zig +331 -85
  39. package/package.json +56 -136
  40. package/src/bin/install-pkmn-engine +10 -7
  41. package/src/bin/pkmn-debug +1 -1
  42. package/src/lib/bindings/c.zig +255 -0
  43. package/src/lib/bindings/node.zig +117 -0
  44. package/src/lib/bindings/wasm.zig +59 -0
  45. package/src/lib/common/array.zig +77 -0
  46. package/src/lib/common/data.zig +8 -8
  47. package/src/lib/common/debug.zig +39 -8
  48. package/src/lib/common/js.zig +4 -6
  49. package/src/lib/common/napi.zig +4 -0
  50. package/src/lib/common/optional.zig +13 -9
  51. package/src/lib/common/options.zig +4 -0
  52. package/src/lib/common/protocol.zig +44 -43
  53. package/src/lib/common/rational.zig +317 -304
  54. package/src/lib/common/rng.zig +5 -7
  55. package/src/lib/common/util.zig +65 -1
  56. package/src/lib/gen1/calc.zig +266 -135
  57. package/src/lib/gen1/chance.zig +469 -110
  58. package/src/lib/gen1/data/moves.zig +2 -4
  59. package/src/lib/gen1/data/species.zig +1 -3
  60. package/src/lib/gen1/data/types.zig +2 -3
  61. package/src/lib/gen1/data.zig +35 -38
  62. package/src/lib/gen1/helpers.zig +17 -27
  63. package/src/lib/gen1/mechanics.zig +213 -160
  64. package/src/lib/gen2/calc.zig +37 -27
  65. package/src/lib/gen2/chance.zig +87 -67
  66. package/src/lib/gen2/data/items.zig +1 -3
  67. package/src/lib/gen2/data/moves.zig +2 -4
  68. package/src/lib/gen2/data/species.zig +1 -3
  69. package/src/lib/gen2/data/types.zig +7 -5
  70. package/src/lib/gen2/data.zig +28 -30
  71. package/src/lib/gen2/generated.zig +18 -23
  72. package/src/lib/gen2/helpers.zig +9 -18
  73. package/src/lib/gen2/mechanics.zig +82 -82
  74. package/src/lib/node.zig +4 -121
  75. package/src/lib/pkmn.zig +14 -7
  76. package/src/lib/wasm.zig +13 -9
  77. package/src/tools/display/dom.ts +93 -0
  78. package/src/tools/display/ui.css +354 -0
  79. package/build/test/display.js +0 -405
  80. package/build/test/display.js.map +0 -1
  81. package/src/test/display/pkmn.html.tmpl +0 -368
package/build.zig CHANGED
@@ -1,19 +1,64 @@
1
- const std = @import("std");
2
1
  const builtin = @import("builtin");
2
+ const std = @import("std");
3
+
4
+ pub const Options = struct {
5
+ showdown: ?bool = null,
6
+ log: ?bool = null,
7
+ chance: ?bool = null,
8
+ calc: ?bool = null,
9
+ };
10
+
11
+ const Step = if (@hasDecl(std.Build, "Step")) std.Build.Step else .{
12
+ .Compile = std.Build.CompileStep,
13
+ .Options = std.Build.OptionsStep,
14
+ .Run = std.Build.RunStep,
15
+ };
16
+ const has_path = @hasField(std.Build.LazyPath, "path");
17
+ const root_module = @hasField(Step.Compile, "root_module");
18
+ const force_pic = !@hasField(std.Build.SharedLibraryOptions, "pic");
19
+ const ResolvedTarget =
20
+ if (@hasDecl(std.Build, "ResolvedTarget")) std.Build.ResolvedTarget else std.zig.CrossTarget;
21
+
22
+ pub fn module(b: *std.Build, options: Options) *std.Build.Module {
23
+ const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
24
+ const build_options = b.addOptions();
25
+ build_options.addOption(?bool, "showdown", options.showdown);
26
+ build_options.addOption(?bool, "log", options.log);
27
+ build_options.addOption(?bool, "chance", options.chance);
28
+ build_options.addOption(?bool, "calc", options.calc);
29
+
30
+ const root_source_file: std.Build.LazyPath =
31
+ .{ .cwd_relative = dirname ++ "/src/lib/pkmn.zig" };
32
+ const Import = if (@hasDecl(std.Build.Module, "Import"))
33
+ std.Build.Module.Import
34
+ else
35
+ std.Build.ModuleDependency;
36
+ const imports: []const Import =
37
+ &.{.{ .name = "build_options", .module = build_options.createModule() }};
38
+ return b.createModule(if (@hasDecl(std.Build, "CreateModuleOptions"))
39
+ .{ .source_file = root_source_file, .dependencies = imports }
40
+ else
41
+ .{ .root_source_file = root_source_file, .imports = imports });
42
+ }
3
43
 
4
44
  pub fn build(b: *std.Build) !void {
5
45
  const target = b.standardTargetOptions(.{});
6
46
  const optimize = b.standardOptimizeOption(.{});
7
47
 
48
+ const default: ?bool = if (force_pic) false else null;
8
49
  const node_headers = b.option([]const u8, "node-headers", "Path to node-headers");
9
50
  const node_import_lib =
10
51
  b.option([]const u8, "node-import-library", "Path to node import library (Windows)");
52
+ const demo = if (try exists("src/tools/demo.zig"))
53
+ b.option(bool, "demo", "Build the demo library") orelse false
54
+ else
55
+ false;
11
56
  const wasm = b.option(bool, "wasm", "Build a WASM library") orelse false;
12
57
  const wasm_stack_size =
13
58
  b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
14
59
  const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
15
- const strip = b.option(bool, "strip", "Strip debugging symbols from binary");
16
- const pic = b.option(bool, "pic", "Force position independent code");
60
+ const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse default;
61
+ const pic = b.option(bool, "pic", "Force position independent code") orelse default;
17
62
  const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
18
63
  const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
19
64
 
@@ -27,11 +72,19 @@ pub fn build(b: *std.Build) !void {
27
72
  var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
28
73
  std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
29
74
 
75
+ const fast = try std.SemanticVersion.parse("0.12.0-dev.866+3a47bc715");
76
+ const patched = std.mem.endsWith(u8, builtin.zig_version_string, "patched");
77
+ if (optimize != .Debug and fast.order(builtin.zig_version) == .lt and !patched) {
78
+ std.log.warn("Release builds are ~10-20% slower than before Zig " ++
79
+ "v0.12.0-dev.866+3a47bc715 due to ziglang/zig#17768", .{});
80
+ }
81
+
30
82
  const showdown =
31
83
  b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
32
84
  const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
33
85
  const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
34
86
  const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
87
+ const extra = b.option([]const []const u8, "option", "Enable extra option");
35
88
 
36
89
  const options = b.addOptions();
37
90
  options.addOption(?bool, "showdown", showdown);
@@ -39,37 +92,67 @@ pub fn build(b: *std.Build) !void {
39
92
  options.addOption(?bool, "chance", chance);
40
93
  options.addOption(?bool, "calc", calc);
41
94
 
95
+ if (extra) |opts| {
96
+ for (opts) |opt| {
97
+ if (std.mem.indexOfScalar(u8, opt, '=')) |i| {
98
+ options.addOption(?bool, opt[0..i], if (std.mem.eql(u8, opt[i + 1 ..], "true"))
99
+ true
100
+ else if (std.mem.eql(u8, opt[i + 1 ..], "false"))
101
+ false
102
+ else {
103
+ std.log.err("Invalid option: {s}\n", .{opt});
104
+ return error.InvalidOption;
105
+ });
106
+ } else {
107
+ options.addOption(?bool, opt, true);
108
+ }
109
+ }
110
+ }
111
+
42
112
  const name = if (showdown) "pkmn-showdown" else "pkmn";
43
113
 
44
- const module = b.addModule("pkmn", .{
45
- .root_source_file = b.path("src/lib/pkmn.zig"),
46
- .optimize = optimize,
47
- .target = target,
48
- .imports = &.{.{ .name = "build_options", .module = options.createModule() }},
49
- });
114
+ const pkmn: ?*std.Build.Module = if (@hasDecl(std.Build, "CreateModuleOptions"))
115
+ null
116
+ else
117
+ b.addModule("pkmn", .{
118
+ .root_source_file = if (has_path)
119
+ .{ .path = "src/lib/pkmn.zig" }
120
+ else
121
+ b.path("src/lib/pkmn.zig"),
122
+ .optimize = optimize,
123
+ .target = target,
124
+ .imports = &.{.{ .name = "build_options", .module = options.createModule() }},
125
+ });
50
126
 
51
127
  var c = false;
52
128
  if (node_headers) |headers| {
53
129
  const addon = b.fmt("{s}.node", .{name});
54
- const lib = b.addSharedLibrary(.{
130
+ const path = if (has_path) .{ .path = "src/lib/node.zig" } else b.path("src/lib/node.zig");
131
+ const lib = b.addSharedLibrary(if (force_pic) .{
132
+ .name = addon,
133
+ .root_source_file = path,
134
+ .optimize = optimize,
135
+ .target = target,
136
+ } else .{
55
137
  .name = addon,
56
- .root_source_file = b.path("src/lib/node.zig"),
138
+ .root_source_file = path,
57
139
  .optimize = optimize,
58
140
  .target = target,
59
141
  .strip = strip,
60
142
  .pic = pic,
61
143
  });
62
- lib.root_module.addOptions("build_options", options);
63
- lib.addSystemIncludePath(b.path(headers));
144
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
145
+ lib.addSystemIncludePath(if (has_path) .{ .path = headers } else b.path(headers));
64
146
  lib.linkLibC();
65
147
  if (node_import_lib) |il| {
66
- lib.addObjectFile(b.path(il));
67
- } else if (target.result.os.tag == .windows) {
148
+ lib.addObjectFile(if (has_path) .{ .path = il } else b.path(il));
149
+ } else if (detect(target).os.tag == .windows) {
68
150
  try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
69
151
  std.process.exit(1);
70
152
  }
71
153
  lib.linker_allow_shlib_undefined = true;
72
154
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
155
+ if (force_pic and pic orelse false) lib.force_pic = pic;
73
156
  // Always emit to build/lib because this is where the driver code expects to find it
74
157
  // TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
75
158
  //
@@ -80,69 +163,61 @@ pub fn build(b: *std.Build) !void {
80
163
  // rename the file ourself in install-pkmn-engine
81
164
  b.installArtifact(lib);
82
165
  } else if (wasm) {
83
- const exe = b.addExecutable(.{
84
- .name = name,
85
- .root_source_file = b.path("src/lib/wasm.zig"),
86
- .optimize = switch (optimize) {
87
- .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
88
- else => optimize,
89
- },
90
- .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
91
- .strip = strip,
92
- .pic = pic,
166
+ const path = "src/lib/wasm.zig";
167
+ try buildWasm(b, name, path, optimize, strip, pic, wasm_stack_size, null, options);
168
+ } else if (demo) {
169
+ const path = "src/tools/demo.zig";
170
+ const n = if (showdown) "demo-showdown" else "demo";
171
+ const mod = pkmn orelse module(b, .{
172
+ .showdown = showdown,
173
+ .log = log,
174
+ .chance = chance,
175
+ .calc = calc,
93
176
  });
94
- exe.root_module.addOptions("build_options", options);
95
- exe.root_module.export_symbol_names = &[_][]const u8{
96
- "SHOWDOWN",
97
- "LOG",
98
- "CHANCE",
99
- "CALC",
100
- "GEN1_CHOICES_SIZE",
101
- "GEN1_LOGS_SIZE",
102
- };
103
- exe.entry = .disabled;
104
- exe.stack_size = wasm_stack_size;
105
- const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
106
- if (optimize != .Debug and opt != null) {
107
- const out = b.fmt("build/lib/{s}.wasm", .{name});
108
- const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
109
- sh.addArtifactArg(exe);
110
- sh.addArg("-o");
111
- sh.addFileArg(b.path(out));
112
- b.getInstallStep().dependOn(&sh.step);
113
- } else {
114
- b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
115
- .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
116
- }).step);
117
- }
177
+ try buildWasm(b, n, path, optimize, strip, pic, wasm_stack_size, mod, options);
118
178
  } else if (dynamic) {
119
- const lib = b.addSharedLibrary(.{
179
+ const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
180
+ const lib = b.addSharedLibrary(if (force_pic) .{
120
181
  .name = name,
121
- .root_source_file = b.path("src/lib/c.zig"),
182
+ .root_source_file = path,
183
+ .version = try std.SemanticVersion.parse(version),
184
+ .optimize = optimize,
185
+ .target = target,
186
+ } else .{
187
+ .name = name,
188
+ .root_source_file = path,
122
189
  .version = try std.SemanticVersion.parse(version),
123
190
  .optimize = optimize,
124
191
  .target = target,
125
192
  .strip = strip,
126
193
  .pic = pic,
127
194
  });
128
- lib.root_module.addOptions("build_options", options);
129
- lib.addIncludePath(b.path("src/include"));
195
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
196
+ lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
130
197
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
198
+ if (force_pic and pic orelse false) lib.force_pic = pic;
131
199
  b.installArtifact(lib);
132
200
  c = true;
133
201
  } else {
134
- const lib = b.addStaticLibrary(.{
202
+ const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
203
+ const lib = b.addStaticLibrary(if (force_pic) .{
135
204
  .name = name,
136
- .root_source_file = b.path("src/lib/c.zig"),
205
+ .root_source_file = path,
206
+ .optimize = optimize,
207
+ .target = target,
208
+ } else .{
209
+ .name = name,
210
+ .root_source_file = path,
137
211
  .optimize = optimize,
138
212
  .target = target,
139
213
  .strip = strip,
140
214
  .pic = pic,
141
215
  });
142
- lib.root_module.addOptions("build_options", options);
143
- lib.addIncludePath(b.path("src/include"));
216
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
217
+ lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
144
218
  lib.bundle_compiler_rt = true;
145
219
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
220
+ if (force_pic and pic orelse false) lib.force_pic = pic;
146
221
  if (emit_asm) {
147
222
  b.getInstallStep().dependOn(&b.addInstallFileWithDir(
148
223
  lib.getEmittedAsm(),
@@ -162,11 +237,9 @@ pub fn build(b: *std.Build) !void {
162
237
  }
163
238
 
164
239
  if (c) {
165
- const header = b.addInstallFileWithDir(
166
- b.path("src/include/pkmn.h"),
167
- .header,
168
- "pkmn.h",
169
- );
240
+ const path =
241
+ if (has_path) .{ .path = "src/include/pkmn.h" } else b.path("src/include/pkmn.h");
242
+ const header = b.addInstallFileWithDir(path, .header, "pkmn.h");
170
243
  b.getInstallStep().dependOn(&header.step);
171
244
 
172
245
  const pc = b.fmt("lib{s}.pc", .{name});
@@ -196,7 +269,7 @@ pub fn build(b: *std.Build) !void {
196
269
  b.installFile(file, b.fmt("share/pkgconfig/{s}", .{pc}));
197
270
  }
198
271
 
199
- const config = .{
272
+ const config: Config = .{
200
273
  .target = target,
201
274
  .optimize = optimize,
202
275
  .pic = pic,
@@ -207,10 +280,15 @@ pub fn build(b: *std.Build) !void {
207
280
  // TODO: tests can be run multiple times due to @imports
208
281
  const tests = TestStep.create(b, options, config);
209
282
 
210
- var exes = std.ArrayList(*std.Build.Step.Compile).init(b.allocator);
283
+ var exes = std.ArrayList(*Step.Compile).init(b.allocator);
211
284
  const tools: ToolConfig = .{
212
- .showdown = showdown,
213
- .module = module,
285
+ .options = .{
286
+ .showdown = showdown,
287
+ .log = log,
288
+ .chance = chance,
289
+ .calc = calc,
290
+ },
291
+ .module = pkmn,
214
292
  .general = config,
215
293
  .tool = .{
216
294
  .tests = if (tests.build) tests else null,
@@ -249,13 +327,127 @@ pub fn build(b: *std.Build) !void {
249
327
  }
250
328
  }
251
329
 
330
+ fn buildWasm(
331
+ b: *std.Build,
332
+ name: []const u8,
333
+ root_src_file: []const u8,
334
+ optimize: std.builtin.OptimizeMode,
335
+ strip: ?bool,
336
+ pic: ?bool,
337
+ wasm_stack_size: u64,
338
+ import: ?*std.Build.Module,
339
+ options: anytype,
340
+ ) !void {
341
+ const entry = @hasDecl(Step.Compile, "Entry");
342
+ const mode = switch (optimize) {
343
+ .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
344
+ else => optimize,
345
+ };
346
+ // https://webassembly.org/features/
347
+ var features = std.Target.wasm.featureSet(&.{
348
+ .atomics,
349
+ .bulk_memory,
350
+ // .exception_handling,
351
+ .extended_const,
352
+ // .half_precision,
353
+ // .multimemory,
354
+ .mutable_globals,
355
+ .nontrapping_fptoint,
356
+ .reference_types,
357
+ // .relaxed_simd,
358
+ .sign_ext,
359
+ .simd128,
360
+ // .tail_call,
361
+ });
362
+ if (builtin.zig_version.order(try std.SemanticVersion.parse("0.12.0")) != .lt) {
363
+ features.addFeature(@intFromEnum(std.Target.wasm.Feature.multivalue));
364
+ }
365
+ const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
366
+ b.resolveTargetQuery(.{
367
+ .cpu_arch = .wasm32,
368
+ .os_tag = .freestanding,
369
+ .cpu_features_add = features,
370
+ })
371
+ else
372
+ ResolvedTarget{
373
+ .cpu_arch = .wasm32,
374
+ .os_tag = .freestanding,
375
+ .cpu_features_add = features,
376
+ };
377
+ const path = if (has_path) .{ .path = root_src_file } else b.path(root_src_file);
378
+ const bin = if (entry) bin: {
379
+ const exe = b.addExecutable(if (force_pic) .{
380
+ .name = name,
381
+ .root_source_file = path,
382
+ .optimize = mode,
383
+ .target = freestanding,
384
+ } else .{
385
+ .name = name,
386
+ .root_source_file = path,
387
+ .optimize = mode,
388
+ .target = freestanding,
389
+ .strip = strip,
390
+ .pic = pic,
391
+ });
392
+
393
+ var file = try std.fs.cwd().openFile(root_src_file, .{});
394
+ defer file.close();
395
+ const bytes = try file.readToEndAlloc(b.allocator, std.math.maxInt(usize));
396
+ (if (root_module) exe.root_module else exe).export_symbol_names = try exports(b, bytes);
397
+ exe.entry = .disabled;
398
+ break :bin exe;
399
+ } else bin: {
400
+ const lib = b.addSharedLibrary(.{
401
+ .name = name,
402
+ .root_source_file = path,
403
+ .optimize = mode,
404
+ .target = freestanding,
405
+ });
406
+ lib.rdynamic = true;
407
+ break :bin lib;
408
+ };
409
+ if (import) |i| {
410
+ if (root_module) {
411
+ bin.root_module.addImport("pkmn", i);
412
+ } else {
413
+ bin.addModule("pkmn", i);
414
+ }
415
+ }
416
+ bin.stack_size = wasm_stack_size;
417
+ if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
418
+ if (force_pic and pic orelse false) bin.force_pic = pic;
419
+ (if (root_module) bin.root_module else bin).addOptions("build_options", options);
420
+
421
+ const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
422
+ if (optimize != .Debug and opt != null) {
423
+ const out = b.fmt("build/lib/{s}.wasm", .{name});
424
+ const sh = b.addSystemCommand(&.{ opt.?, "--enable-bulk-memory", "--enable-simd", "-O4" });
425
+ sh.addArtifactArg(bin);
426
+ sh.addArg("-o");
427
+ if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
428
+ sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
429
+ } else {
430
+ sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
431
+ }
432
+ b.getInstallStep().dependOn(&sh.step);
433
+ if (!entry) b.installArtifact(bin);
434
+ } else if (entry) {
435
+ b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
436
+ .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
437
+ }).step);
438
+ } else {
439
+ b.installArtifact(bin);
440
+ }
441
+ }
442
+
252
443
  fn maybeStrip(
253
444
  b: *std.Build,
254
- artifact: *std.Build.Step.Compile,
445
+ artifact: *Step.Compile,
255
446
  step: *std.Build.Step,
256
447
  strip: ?bool,
257
448
  cmd: ?[]const u8,
258
449
  ) void {
450
+ if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
259
451
  if (!(strip orelse false) or cmd == null) return;
260
452
  // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
261
453
  const mac = builtin.os.tag == .macos;
@@ -268,7 +460,7 @@ fn maybeStrip(
268
460
  }
269
461
 
270
462
  const Config = struct {
271
- target: std.Build.ResolvedTarget,
463
+ target: ResolvedTarget,
272
464
  optimize: std.builtin.OptimizeMode,
273
465
  pic: ?bool,
274
466
  strip: ?bool,
@@ -279,7 +471,7 @@ const TestStep = struct {
279
471
  step: std.Build.Step,
280
472
  build: bool,
281
473
 
282
- pub fn create(b: *std.Build, options: *std.Build.Step.Options, config: Config) *TestStep {
474
+ pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
283
475
  const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
284
476
  const test_filter =
285
477
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
@@ -288,8 +480,14 @@ const TestStep = struct {
288
480
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
289
481
  self.* = .{ .step = step, .build = test_filter == null };
290
482
 
291
- const tests = b.addTest(.{
292
- .root_source_file = b.path("src/lib/test.zig"),
483
+ const path = if (has_path) .{ .path = "src/lib/test.zig" } else b.path("src/lib/test.zig");
484
+ const tests = b.addTest(if (force_pic) .{
485
+ .root_source_file = path,
486
+ .optimize = config.optimize,
487
+ .target = config.target,
488
+ .filter = test_filter,
489
+ } else .{
490
+ .root_source_file = path,
293
491
  .optimize = config.optimize,
294
492
  .target = config.target,
295
493
  .filter = test_filter,
@@ -297,8 +495,13 @@ const TestStep = struct {
297
495
  .strip = config.strip,
298
496
  .pic = config.pic,
299
497
  });
300
- tests.root_module.addOptions("build_options", options);
498
+ (if (root_module) tests.root_module else tests).addOptions("build_options", options);
499
+
301
500
  maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
501
+ if (force_pic) {
502
+ tests.single_threaded = true;
503
+ if (config.pic orelse false) tests.force_pic = config.pic;
504
+ }
302
505
  if (coverage) |c| {
303
506
  tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
304
507
  }
@@ -309,37 +512,49 @@ const TestStep = struct {
309
512
  };
310
513
 
311
514
  const ToolConfig = struct {
312
- showdown: ?bool,
313
- module: *std.Build.Module,
515
+ options: Options,
516
+ module: ?*std.Build.Module,
314
517
  general: Config,
315
518
  tool: struct {
316
519
  tests: ?*TestStep,
317
520
  name: ?[]const u8 = null,
318
- exes: *std.ArrayList(*std.Build.Step.Compile),
521
+ exes: *std.ArrayList(*Step.Compile),
319
522
  },
320
523
  };
321
524
 
322
- fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.Run {
323
- std.fs.cwd().access(path, .{}) catch |err| switch (err) {
324
- error.FileNotFound => return null,
325
- else => |e| return e,
326
- };
525
+ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
526
+ if (!try exists(path)) return null;
327
527
  var name = config.tool.name orelse std.fs.path.basename(path);
328
528
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
329
529
  if (index) |i| name = name[0..i];
330
- if (config.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
530
+ if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
331
531
 
332
- const exe = b.addExecutable(.{
532
+ const exe = b.addExecutable(if (force_pic) .{
533
+ .name = name,
534
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
535
+ .target = config.general.target,
536
+ .optimize = config.general.optimize,
537
+ } else .{
333
538
  .name = name,
334
- .root_source_file = b.path(path),
539
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
335
540
  .target = config.general.target,
336
541
  .optimize = config.general.optimize,
337
542
  .single_threaded = true,
338
543
  .strip = config.general.strip,
339
544
  .pic = config.general.pic,
340
545
  });
341
- exe.root_module.addImport("pkmn", config.module);
342
546
 
547
+ if (root_module) {
548
+ const import = if (config.module) |m| m else module(b, config.options);
549
+ exe.root_module.addImport("pkmn", import);
550
+ } else {
551
+ exe.addModule("pkmn", module(b, config.options));
552
+ }
553
+
554
+ if (force_pic) {
555
+ exe.single_threaded = true;
556
+ if (config.general.pic orelse false) exe.force_pic = config.general.pic;
557
+ }
343
558
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
344
559
  config.tool.exes.append(exe) catch @panic("OOM");
345
560
 
@@ -350,10 +565,18 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.R
350
565
  return run;
351
566
  }
352
567
 
568
+ fn exists(path: []const u8) !bool {
569
+ std.fs.cwd().access(path, .{}) catch |err| switch (err) {
570
+ error.FileNotFound => return false,
571
+ else => |e| return e,
572
+ };
573
+ return true;
574
+ }
575
+
353
576
  const ToolsStep = struct {
354
577
  step: std.Build.Step,
355
578
 
356
- pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.Step.Compile)) *ToolsStep {
579
+ pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
357
580
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
358
581
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
359
582
  self.* = .{ .step = step };
@@ -361,3 +584,26 @@ const ToolsStep = struct {
361
584
  return self;
362
585
  }
363
586
  };
587
+
588
+ fn detect(target: anytype) std.Target {
589
+ if (@hasField(@TypeOf(target), "result")) return target.result;
590
+ return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
591
+ }
592
+
593
+ pub fn exports(b: *std.Build, bytes: []const u8) ![][]const u8 {
594
+ var symbols = std.ArrayList([]const u8).init(b.allocator);
595
+
596
+ var it = std.mem.splitSequence(u8, bytes, "export ");
597
+ _ = it.next();
598
+ while (it.next()) |s| {
599
+ if (std.mem.startsWith(u8, s, "const ")) {
600
+ const i = std.mem.indexOf(u8, s[6..], " ").?;
601
+ try symbols.append(s[6 .. 6 + i]);
602
+ } else { // "fn "
603
+ const i = std.mem.indexOf(u8, s[3..], "(").?;
604
+ try symbols.append(s[3 .. 3 + i]);
605
+ }
606
+ }
607
+
608
+ return symbols.items;
609
+ }