@pkmn/engine 0.1.0-dev.b05836cd → 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.
- package/LICENSE +1 -3
- package/README.md +91 -18
- 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/layout.json +15 -2
- package/build/pkg/data/protocol.json +23 -9
- 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 +28 -19
- 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 +109 -107
- package/build/pkg/protocol.js.map +1 -1
- package/build/tools/debug.js +53 -78
- 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 +331 -104
- package/package.json +61 -134
- 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 -26
- package/src/lib/bindings/wasm.zig +59 -0
- package/src/lib/common/array.zig +77 -0
- package/src/lib/common/data.zig +4 -4
- package/src/lib/common/debug.zig +39 -8
- package/src/lib/common/js.zig +4 -6
- package/src/lib/common/napi.zig +4 -0
- package/src/lib/common/optional.zig +14 -10
- package/src/lib/common/options.zig +6 -0
- package/src/lib/common/protocol.zig +63 -67
- package/src/lib/common/rational.zig +355 -248
- package/src/lib/common/rng.zig +7 -9
- package/src/lib/common/util.zig +65 -1
- package/src/lib/gen1/calc.zig +698 -162
- package/src/lib/gen1/chance.zig +405 -280
- package/src/lib/gen1/data/moves.zig +2 -4
- package/src/lib/gen1/data/species.zig +2 -4
- package/src/lib/gen1/data/types.zig +2 -3
- package/src/lib/gen1/data.zig +24 -27
- package/src/lib/gen1/helpers.zig +92 -548
- package/src/lib/gen1/mechanics.zig +390 -267
- package/src/lib/gen2/calc.zig +37 -27
- package/src/lib/gen2/chance.zig +84 -496
- package/src/lib/gen2/data/items.zig +1 -3
- package/src/lib/gen2/data/moves.zig +2 -4
- package/src/lib/gen2/data/species.zig +1 -3
- package/src/lib/gen2/data/types.zig +7 -5
- package/src/lib/gen2/data.zig +22 -24
- package/src/lib/gen2/generated.zig +19 -26
- package/src/lib/gen2/helpers.zig +46 -25
- package/src/lib/gen2/mechanics.zig +218 -164
- package/src/lib/node.zig +14 -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 -894
- package/src/lib/gen2/README.md +0 -329
- 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,22 @@ 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
|
+
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
|
+
|
|
50
82
|
const showdown =
|
|
51
83
|
b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
|
|
52
84
|
const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
|
|
53
85
|
const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
|
|
54
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");
|
|
55
88
|
|
|
56
89
|
const options = b.addOptions();
|
|
57
90
|
options.addOption(?bool, "showdown", showdown);
|
|
@@ -59,32 +92,69 @@ pub fn build(b: *std.Build) !void {
|
|
|
59
92
|
options.addOption(?bool, "chance", chance);
|
|
60
93
|
options.addOption(?bool, "calc", calc);
|
|
61
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
|
+
|
|
62
112
|
const name = if (showdown) "pkmn-showdown" else "pkmn";
|
|
63
113
|
|
|
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
|
+
});
|
|
126
|
+
|
|
64
127
|
var c = false;
|
|
65
128
|
if (node_headers) |headers| {
|
|
66
129
|
const addon = b.fmt("{s}.node", .{name});
|
|
67
|
-
const
|
|
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) .{
|
|
68
132
|
.name = addon,
|
|
69
|
-
.
|
|
70
|
-
.root_source_file = .{ .path = "src/lib/binding/node.zig" },
|
|
133
|
+
.root_source_file = path,
|
|
71
134
|
.optimize = optimize,
|
|
72
135
|
.target = target,
|
|
136
|
+
} else .{
|
|
137
|
+
.name = addon,
|
|
138
|
+
.root_source_file = path,
|
|
139
|
+
.optimize = optimize,
|
|
140
|
+
.target = target,
|
|
141
|
+
.strip = strip,
|
|
142
|
+
.pic = pic,
|
|
73
143
|
});
|
|
74
|
-
lib.addOptions("build_options", options);
|
|
75
|
-
lib.addSystemIncludePath(.{ .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));
|
|
76
146
|
lib.linkLibC();
|
|
77
147
|
if (node_import_lib) |il| {
|
|
78
|
-
lib.addObjectFile(.{ .path = il });
|
|
79
|
-
} else if (
|
|
148
|
+
lib.addObjectFile(if (has_path) .{ .path = il } else b.path(il));
|
|
149
|
+
} else if (detect(target).os.tag == .windows) {
|
|
80
150
|
try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
|
|
81
151
|
std.process.exit(1);
|
|
82
152
|
}
|
|
83
153
|
lib.linker_allow_shlib_undefined = true;
|
|
84
154
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
85
|
-
if (pic) lib.force_pic = pic;
|
|
155
|
+
if (force_pic and pic orelse false) lib.force_pic = pic;
|
|
86
156
|
// Always emit to build/lib because this is where the driver code expects to find it
|
|
87
|
-
// TODO
|
|
157
|
+
// TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
|
|
88
158
|
//
|
|
89
159
|
// lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
|
|
90
160
|
// b.getInstallStep().dependOn(&lib.step);
|
|
@@ -93,70 +163,61 @@ pub fn build(b: *std.Build) !void {
|
|
|
93
163
|
// rename the file ourself in install-pkmn-engine
|
|
94
164
|
b.installArtifact(lib);
|
|
95
165
|
} else if (wasm) {
|
|
96
|
-
const
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
.
|
|
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,
|
|
105
176
|
});
|
|
106
|
-
|
|
107
|
-
exe.export_symbol_names = &[_][]const u8{
|
|
108
|
-
"SHOWDOWN",
|
|
109
|
-
"LOG",
|
|
110
|
-
"CHANCE",
|
|
111
|
-
"CALC",
|
|
112
|
-
"GEN1_CHOICES_SIZE",
|
|
113
|
-
"GEN1_LOGS_SIZE",
|
|
114
|
-
};
|
|
115
|
-
exe.entry = .disabled;
|
|
116
|
-
exe.stack_size = wasm_stack_size;
|
|
117
|
-
exe.strip = strip;
|
|
118
|
-
if (pic) exe.force_pic = pic;
|
|
119
|
-
const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
|
|
120
|
-
if (optimize != .Debug and opt != null) {
|
|
121
|
-
const out = b.fmt("build/lib/{s}.wasm", .{name});
|
|
122
|
-
const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
|
|
123
|
-
sh.addArtifactArg(exe);
|
|
124
|
-
sh.addArg("-o");
|
|
125
|
-
sh.addFileSourceArg(.{ .path = out });
|
|
126
|
-
b.getInstallStep().dependOn(&sh.step);
|
|
127
|
-
} else {
|
|
128
|
-
b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
|
|
129
|
-
.dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
|
|
130
|
-
}).step);
|
|
131
|
-
}
|
|
177
|
+
try buildWasm(b, n, path, optimize, strip, pic, wasm_stack_size, mod, options);
|
|
132
178
|
} else if (dynamic) {
|
|
133
|
-
const
|
|
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) .{
|
|
134
181
|
.name = name,
|
|
135
|
-
.
|
|
136
|
-
.root_source_file = .{ .path = "src/lib/binding/c.zig" },
|
|
182
|
+
.root_source_file = path,
|
|
137
183
|
.version = try std.SemanticVersion.parse(version),
|
|
138
184
|
.optimize = optimize,
|
|
139
185
|
.target = target,
|
|
186
|
+
} else .{
|
|
187
|
+
.name = name,
|
|
188
|
+
.root_source_file = path,
|
|
189
|
+
.version = try std.SemanticVersion.parse(version),
|
|
190
|
+
.optimize = optimize,
|
|
191
|
+
.target = target,
|
|
192
|
+
.strip = strip,
|
|
193
|
+
.pic = pic,
|
|
140
194
|
});
|
|
141
|
-
lib.addOptions("build_options", options);
|
|
142
|
-
lib.addIncludePath(.{ .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"));
|
|
143
197
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
144
|
-
if (pic) lib.force_pic = pic;
|
|
198
|
+
if (force_pic and pic orelse false) lib.force_pic = pic;
|
|
145
199
|
b.installArtifact(lib);
|
|
146
200
|
c = true;
|
|
147
201
|
} else {
|
|
148
|
-
const
|
|
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) .{
|
|
204
|
+
.name = name,
|
|
205
|
+
.root_source_file = path,
|
|
206
|
+
.optimize = optimize,
|
|
207
|
+
.target = target,
|
|
208
|
+
} else .{
|
|
149
209
|
.name = name,
|
|
150
|
-
.
|
|
151
|
-
.root_source_file = .{ .path = "src/lib/binding/c.zig" },
|
|
210
|
+
.root_source_file = path,
|
|
152
211
|
.optimize = optimize,
|
|
153
212
|
.target = target,
|
|
213
|
+
.strip = strip,
|
|
214
|
+
.pic = pic,
|
|
154
215
|
});
|
|
155
|
-
lib.addOptions("build_options", options);
|
|
156
|
-
lib.addIncludePath(.{ .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"));
|
|
157
218
|
lib.bundle_compiler_rt = true;
|
|
158
219
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
159
|
-
if (pic) lib.force_pic = pic;
|
|
220
|
+
if (force_pic and pic orelse false) lib.force_pic = pic;
|
|
160
221
|
if (emit_asm) {
|
|
161
222
|
b.getInstallStep().dependOn(&b.addInstallFileWithDir(
|
|
162
223
|
lib.getEmittedAsm(),
|
|
@@ -176,15 +237,17 @@ pub fn build(b: *std.Build) !void {
|
|
|
176
237
|
}
|
|
177
238
|
|
|
178
239
|
if (c) {
|
|
179
|
-
const
|
|
180
|
-
.{ .path = "src/include/pkmn.h" }
|
|
181
|
-
|
|
182
|
-
"pkmn.h",
|
|
183
|
-
);
|
|
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");
|
|
184
243
|
b.getInstallStep().dependOn(&header.step);
|
|
185
244
|
|
|
186
245
|
const pc = b.fmt("lib{s}.pc", .{name});
|
|
187
|
-
const file = try
|
|
246
|
+
const file = try std.fs.path.relative(
|
|
247
|
+
b.allocator,
|
|
248
|
+
try std.process.getCwdAlloc(b.allocator),
|
|
249
|
+
try b.cache_root.join(b.allocator, &.{pc}),
|
|
250
|
+
);
|
|
188
251
|
const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
|
|
189
252
|
|
|
190
253
|
const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
|
|
@@ -206,7 +269,7 @@ pub fn build(b: *std.Build) !void {
|
|
|
206
269
|
b.installFile(file, b.fmt("share/pkgconfig/{s}", .{pc}));
|
|
207
270
|
}
|
|
208
271
|
|
|
209
|
-
const config = .{
|
|
272
|
+
const config: Config = .{
|
|
210
273
|
.target = target,
|
|
211
274
|
.optimize = optimize,
|
|
212
275
|
.pic = pic,
|
|
@@ -217,7 +280,7 @@ pub fn build(b: *std.Build) !void {
|
|
|
217
280
|
// TODO: tests can be run multiple times due to @imports
|
|
218
281
|
const tests = TestStep.create(b, options, config);
|
|
219
282
|
|
|
220
|
-
var exes = std.ArrayList(*
|
|
283
|
+
var exes = std.ArrayList(*Step.Compile).init(b.allocator);
|
|
221
284
|
const tools: ToolConfig = .{
|
|
222
285
|
.options = .{
|
|
223
286
|
.showdown = showdown,
|
|
@@ -225,6 +288,7 @@ pub fn build(b: *std.Build) !void {
|
|
|
225
288
|
.chance = chance,
|
|
226
289
|
.calc = calc,
|
|
227
290
|
},
|
|
291
|
+
.module = pkmn,
|
|
228
292
|
.general = config,
|
|
229
293
|
.tool = .{
|
|
230
294
|
.tests = if (tests.build) tests else null,
|
|
@@ -263,15 +327,128 @@ pub fn build(b: *std.Build) !void {
|
|
|
263
327
|
}
|
|
264
328
|
}
|
|
265
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
|
+
|
|
266
443
|
fn maybeStrip(
|
|
267
444
|
b: *std.Build,
|
|
268
|
-
artifact: *
|
|
445
|
+
artifact: *Step.Compile,
|
|
269
446
|
step: *std.Build.Step,
|
|
270
|
-
strip: bool,
|
|
447
|
+
strip: ?bool,
|
|
271
448
|
cmd: ?[]const u8,
|
|
272
449
|
) void {
|
|
273
|
-
artifact.strip = strip;
|
|
274
|
-
if (!strip or cmd == null) return;
|
|
450
|
+
if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
|
|
451
|
+
if (!(strip orelse false) or cmd == null) return;
|
|
275
452
|
// Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
|
|
276
453
|
const mac = builtin.os.tag == .macos;
|
|
277
454
|
if (mac and artifact.isDynamicLibrary()) return;
|
|
@@ -283,10 +460,10 @@ fn maybeStrip(
|
|
|
283
460
|
}
|
|
284
461
|
|
|
285
462
|
const Config = struct {
|
|
286
|
-
target:
|
|
463
|
+
target: ResolvedTarget,
|
|
287
464
|
optimize: std.builtin.OptimizeMode,
|
|
288
|
-
pic: bool,
|
|
289
|
-
strip: bool,
|
|
465
|
+
pic: ?bool,
|
|
466
|
+
strip: ?bool,
|
|
290
467
|
cmd: ?[]const u8,
|
|
291
468
|
};
|
|
292
469
|
|
|
@@ -294,9 +471,8 @@ const TestStep = struct {
|
|
|
294
471
|
step: std.Build.Step,
|
|
295
472
|
build: bool,
|
|
296
473
|
|
|
297
|
-
pub fn create(b: *std.Build, options: *
|
|
474
|
+
pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
|
|
298
475
|
const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
|
|
299
|
-
const test_file = b.option([]const u8, "test-file", "Input file for test");
|
|
300
476
|
const test_filter =
|
|
301
477
|
b.option([]const u8, "test-filter", "Skip tests that do not match filter");
|
|
302
478
|
|
|
@@ -304,22 +480,28 @@ const TestStep = struct {
|
|
|
304
480
|
const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
|
|
305
481
|
self.* = .{ .step = step, .build = test_filter == null };
|
|
306
482
|
|
|
307
|
-
const path =
|
|
308
|
-
const tests = b.addTest(.{
|
|
309
|
-
.
|
|
310
|
-
std.fs.path.basename(std.fs.path.dirname(path).?),
|
|
311
|
-
std.fs.path.stem(std.fs.path.basename(path)),
|
|
312
|
-
}),
|
|
313
|
-
.main_pkg_path = .{ .path = "." },
|
|
314
|
-
.root_source_file = .{ .path = path },
|
|
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,
|
|
315
486
|
.optimize = config.optimize,
|
|
316
487
|
.target = config.target,
|
|
317
488
|
.filter = test_filter,
|
|
489
|
+
} else .{
|
|
490
|
+
.root_source_file = path,
|
|
491
|
+
.optimize = config.optimize,
|
|
492
|
+
.target = config.target,
|
|
493
|
+
.filter = test_filter,
|
|
494
|
+
.single_threaded = true,
|
|
495
|
+
.strip = config.strip,
|
|
496
|
+
.pic = config.pic,
|
|
318
497
|
});
|
|
319
|
-
tests.addOptions("build_options", options);
|
|
320
|
-
|
|
498
|
+
(if (root_module) tests.root_module else tests).addOptions("build_options", options);
|
|
499
|
+
|
|
321
500
|
maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
|
|
322
|
-
if (
|
|
501
|
+
if (force_pic) {
|
|
502
|
+
tests.single_threaded = true;
|
|
503
|
+
if (config.pic orelse false) tests.force_pic = config.pic;
|
|
504
|
+
}
|
|
323
505
|
if (coverage) |c| {
|
|
324
506
|
tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
|
|
325
507
|
}
|
|
@@ -331,34 +513,48 @@ const TestStep = struct {
|
|
|
331
513
|
|
|
332
514
|
const ToolConfig = struct {
|
|
333
515
|
options: Options,
|
|
516
|
+
module: ?*std.Build.Module,
|
|
334
517
|
general: Config,
|
|
335
518
|
tool: struct {
|
|
336
519
|
tests: ?*TestStep,
|
|
337
520
|
name: ?[]const u8 = null,
|
|
338
|
-
exes: *std.ArrayList(*
|
|
521
|
+
exes: *std.ArrayList(*Step.Compile),
|
|
339
522
|
},
|
|
340
523
|
};
|
|
341
524
|
|
|
342
|
-
fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*
|
|
343
|
-
|
|
344
|
-
error.FileNotFound => return null,
|
|
345
|
-
else => |e| return e,
|
|
346
|
-
};
|
|
525
|
+
fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
|
|
526
|
+
if (!try exists(path)) return null;
|
|
347
527
|
var name = config.tool.name orelse std.fs.path.basename(path);
|
|
348
528
|
const index = std.mem.lastIndexOfScalar(u8, name, '.');
|
|
349
529
|
if (index) |i| name = name[0..i];
|
|
350
530
|
if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
|
|
351
531
|
|
|
352
|
-
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 .{
|
|
353
538
|
.name = name,
|
|
354
|
-
.root_source_file = .{ .path = path },
|
|
539
|
+
.root_source_file = if (has_path) .{ .path = path } else b.path(path),
|
|
355
540
|
.target = config.general.target,
|
|
356
541
|
.optimize = config.general.optimize,
|
|
542
|
+
.single_threaded = true,
|
|
543
|
+
.strip = config.general.strip,
|
|
544
|
+
.pic = config.general.pic,
|
|
357
545
|
});
|
|
358
|
-
exe.addModule("pkmn", module(b, config.options));
|
|
359
546
|
|
|
360
|
-
|
|
361
|
-
|
|
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
|
+
}
|
|
362
558
|
if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
|
|
363
559
|
config.tool.exes.append(exe) catch @panic("OOM");
|
|
364
560
|
|
|
@@ -369,10 +565,18 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.RunSte
|
|
|
369
565
|
return run;
|
|
370
566
|
}
|
|
371
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
|
+
|
|
372
576
|
const ToolsStep = struct {
|
|
373
577
|
step: std.Build.Step,
|
|
374
578
|
|
|
375
|
-
pub fn create(b: *std.Build, exes: *std.ArrayList(*
|
|
579
|
+
pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
|
|
376
580
|
const self = b.allocator.create(ToolsStep) catch @panic("OOM");
|
|
377
581
|
const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
|
|
378
582
|
self.* = .{ .step = step };
|
|
@@ -380,3 +584,26 @@ const ToolsStep = struct {
|
|
|
380
584
|
return self;
|
|
381
585
|
}
|
|
382
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
|
+
}
|