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