@pkmn/engine 0.1.0-dev.5570b5c5 → 0.1.0-dev.565de616
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/README.md +12 -8
- package/build/pkg/addon/browser.d.ts +3 -0
- package/build/pkg/addon/browser.js +44 -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 +97 -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 +21 -0
- package/build/pkg/addon/wasm.js.map +1 -0
- package/build/pkg/addon.d.ts +22 -0
- package/build/pkg/addon.js +29 -51
- 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 +23 -1
- package/build/pkg/data.js.map +1 -1
- package/build/pkg/gen1.d.ts +10 -13
- package/build/pkg/gen1.js +1 -1
- package/build/pkg/gen1.js.map +1 -1
- package/build/pkg/index.d.ts +53 -12
- package/build/pkg/index.js +15 -10
- package/build/pkg/index.js.map +1 -1
- package/build/pkg/protocol.d.ts +20 -1
- package/build/pkg/protocol.js +105 -103
- package/build/pkg/protocol.js.map +1 -1
- package/build/tools/debug.js +35 -68
- package/build/tools/debug.js.map +1 -1
- package/build/tools/display/debug.jsx +141 -0
- package/build/tools/display/debug.jsx.map +1 -0
- package/build/tools/display/index.js +141 -0
- package/build/tools/display/index.js.map +1 -0
- package/build/tools/display/ui.jsx +349 -0
- package/build/tools/display/ui.jsx.map +1 -0
- package/build/tools/display/util.js +18 -0
- package/build/tools/display/util.js.map +1 -0
- package/build.zig +230 -74
- package/package.json +51 -31
- package/src/bin/install-pkmn-engine +8 -6
- package/src/bin/pkmn-debug +1 -1
- package/src/lib/common/array.zig +77 -0
- package/src/lib/common/data.zig +8 -8
- package/src/lib/common/debug.zig +39 -8
- package/src/lib/common/js.zig +4 -2
- package/src/lib/common/optional.zig +13 -9
- package/src/lib/common/options.zig +6 -0
- package/src/lib/common/protocol.zig +45 -44
- package/src/lib/common/rational.zig +121 -29
- package/src/lib/common/rng.zig +5 -7
- package/src/lib/common/util.zig +50 -1
- package/src/lib/gen1/calc.zig +683 -156
- package/src/lib/gen1/chance.zig +415 -291
- package/src/lib/gen1/data/moves.zig +2 -4
- package/src/lib/gen1/data/species.zig +1 -3
- package/src/lib/gen1/data/types.zig +1 -2
- package/src/lib/gen1/data.zig +38 -41
- package/src/lib/gen1/helpers.zig +92 -548
- package/src/lib/gen1/mechanics.zig +325 -235
- package/src/lib/gen2/calc.zig +37 -27
- package/src/lib/gen2/chance.zig +90 -503
- 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 +1 -2
- package/src/lib/gen2/data.zig +26 -29
- package/src/lib/gen2/generated.zig +18 -23
- package/src/lib/gen2/helpers.zig +46 -25
- package/src/lib/gen2/mechanics.zig +69 -107
- package/src/lib/node.zig +2 -4
- package/src/lib/pkmn.zig +14 -16
- package/src/lib/wasm.zig +1 -2
- package/src/tools/display/dom.ts +96 -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/test/display/pkmn.html.tmpl +0 -368
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ui.jsx","sourceRoot":"","sources":["../../../src/tools/display/ui.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.pretty = exports.toText = void 0;
|
|
4
|
+
const format = (kwVal) => typeof kwVal === 'boolean' ? '' : ` ${kwVal}`;
|
|
5
|
+
const trim = (args) => {
|
|
6
|
+
while (args.length && !args[args.length - 1])
|
|
7
|
+
args.pop();
|
|
8
|
+
return args;
|
|
9
|
+
};
|
|
10
|
+
const compact = (line) => [...trim(line.args.slice(0)), ...Object.keys(line.kwArgs)
|
|
11
|
+
.map(k => `[${k}]${format(line.kwArgs[k])}`)].join('|');
|
|
12
|
+
const toText = (parsed) => parsed.length ? `|${parsed.map(compact).join('\n|')}` : '';
|
|
13
|
+
exports.toText = toText;
|
|
14
|
+
const pretty = (choice) => choice
|
|
15
|
+
? choice.type === 'pass' ? choice.type : `${choice.type} ${choice.data}`
|
|
16
|
+
: '???';
|
|
17
|
+
exports.pretty = pretty;
|
|
18
|
+
//# sourceMappingURL=util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/tools/display/util.ts"],"names":[],"mappings":";;;AA2BA,MAAM,MAAM,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAe,EAAE,CAAC;AACvF,MAAM,IAAI,GAAG,CAAC,IAAc,EAAE,EAAE;IAC9B,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAAE,IAAI,CAAC,GAAG,EAAE,CAAC;IACzD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE,CACnC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAa,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;SAClE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,MAAM,CAAE,IAAI,CAAC,MAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE9D,MAAM,MAAM,GAAG,CAAC,MAAoB,EAAE,EAAE,CAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AADhD,QAAA,MAAM,UAC0C;AAEtD,MAAM,MAAM,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM;IAC/C,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE;IACxE,CAAC,CAAC,KAAK,CAAC;AAFG,QAAA,MAAM,UAET"}
|
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,16 +26,20 @@ 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 = .{ .cwd_relative = dirname ++ "/src/lib/pkmn.zig" };
|
|
31
|
+
const imports = &.{.{ .name = "build_options", .module = build_options.createModule() }};
|
|
32
|
+
return b.createModule(if (@hasDecl(std.Build, "CreateModuleOptions"))
|
|
33
|
+
.{ .source_file = root_source_file, .dependencies = imports }
|
|
34
|
+
else
|
|
35
|
+
.{ .root_source_file = root_source_file, .imports = imports });
|
|
22
36
|
}
|
|
23
37
|
|
|
24
38
|
pub fn build(b: *std.Build) !void {
|
|
25
39
|
const target = b.standardTargetOptions(.{});
|
|
26
40
|
const optimize = b.standardOptimizeOption(.{});
|
|
27
41
|
|
|
42
|
+
const default: ?bool = if (force_pic) false else null;
|
|
28
43
|
const node_headers = b.option([]const u8, "node-headers", "Path to node-headers");
|
|
29
44
|
const node_import_lib =
|
|
30
45
|
b.option([]const u8, "node-import-library", "Path to node import library (Windows)");
|
|
@@ -32,8 +47,8 @@ pub fn build(b: *std.Build) !void {
|
|
|
32
47
|
const wasm_stack_size =
|
|
33
48
|
b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
|
|
34
49
|
const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
|
|
35
|
-
const strip = b.option(bool, "strip", "Strip debugging symbols from binary");
|
|
36
|
-
const pic = b.option(bool, "pic", "Force position independent code");
|
|
50
|
+
const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse default;
|
|
51
|
+
const pic = b.option(bool, "pic", "Force position independent code") orelse default;
|
|
37
52
|
const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
|
|
38
53
|
const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
|
|
39
54
|
|
|
@@ -47,11 +62,18 @@ pub fn build(b: *std.Build) !void {
|
|
|
47
62
|
var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
|
|
48
63
|
std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
|
|
49
64
|
|
|
65
|
+
const fast = try std.SemanticVersion.parse("0.12.0-dev.866+3a47bc715");
|
|
66
|
+
if (optimize != .Debug and fast.order(builtin.zig_version) == .lt) {
|
|
67
|
+
std.log.warn("Release builds are ~10-20% slower than before Zig " ++
|
|
68
|
+
"v0.12.0-dev.866+3a47bc715 due to ziglang/zig#17768", .{});
|
|
69
|
+
}
|
|
70
|
+
|
|
50
71
|
const showdown =
|
|
51
72
|
b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
|
|
52
73
|
const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
|
|
53
74
|
const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
|
|
54
75
|
const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
|
|
76
|
+
const extra = b.option([]const []const u8, "option", "Enable extra option");
|
|
55
77
|
|
|
56
78
|
const options = b.addOptions();
|
|
57
79
|
options.addOption(?bool, "showdown", showdown);
|
|
@@ -59,30 +81,64 @@ pub fn build(b: *std.Build) !void {
|
|
|
59
81
|
options.addOption(?bool, "chance", chance);
|
|
60
82
|
options.addOption(?bool, "calc", calc);
|
|
61
83
|
|
|
84
|
+
if (extra) |opts| {
|
|
85
|
+
for (opts) |opt| {
|
|
86
|
+
if (std.mem.indexOfScalar(u8, opt, '=')) |i| {
|
|
87
|
+
options.addOption(?bool, opt[0..i], if (std.mem.eql(u8, opt[i + 1 ..], "true"))
|
|
88
|
+
true
|
|
89
|
+
else if (std.mem.eql(u8, opt[i + 1 ..], "false"))
|
|
90
|
+
false
|
|
91
|
+
else {
|
|
92
|
+
std.log.err("Invalid option: {s}\n", .{opt});
|
|
93
|
+
return error.InvalidOption;
|
|
94
|
+
});
|
|
95
|
+
} else {
|
|
96
|
+
options.addOption(?bool, opt, true);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
62
101
|
const name = if (showdown) "pkmn-showdown" else "pkmn";
|
|
63
102
|
|
|
103
|
+
const pkmn = if (@hasDecl(std.Build, "CreateModuleOptions")) null else b.addModule("pkmn", .{
|
|
104
|
+
.root_source_file = if (has_path)
|
|
105
|
+
.{ .path = "src/lib/pkmn.zig" }
|
|
106
|
+
else
|
|
107
|
+
b.path("src/lib/pkmn.zig"),
|
|
108
|
+
.optimize = optimize,
|
|
109
|
+
.target = target,
|
|
110
|
+
.imports = &.{.{ .name = "build_options", .module = options.createModule() }},
|
|
111
|
+
});
|
|
112
|
+
|
|
64
113
|
var c = false;
|
|
65
114
|
if (node_headers) |headers| {
|
|
66
115
|
const addon = b.fmt("{s}.node", .{name});
|
|
67
|
-
const
|
|
116
|
+
const path = if (has_path) .{ .path = "src/lib/node.zig" } else b.path("src/lib/node.zig");
|
|
117
|
+
const lib = b.addSharedLibrary(if (force_pic) .{
|
|
118
|
+
.name = addon,
|
|
119
|
+
.root_source_file = path,
|
|
120
|
+
.optimize = optimize,
|
|
121
|
+
.target = target,
|
|
122
|
+
} else .{
|
|
68
123
|
.name = addon,
|
|
69
|
-
.root_source_file =
|
|
124
|
+
.root_source_file = path,
|
|
70
125
|
.optimize = optimize,
|
|
71
126
|
.target = target,
|
|
72
127
|
.strip = strip,
|
|
73
128
|
.pic = pic,
|
|
74
129
|
});
|
|
75
|
-
lib.root_module.addOptions("build_options", options);
|
|
76
|
-
lib.addSystemIncludePath(b.path(headers));
|
|
130
|
+
(if (root_module) lib.root_module else lib).addOptions("build_options", options);
|
|
131
|
+
lib.addSystemIncludePath(if (has_path) .{ .path = headers } else b.path(headers));
|
|
77
132
|
lib.linkLibC();
|
|
78
133
|
if (node_import_lib) |il| {
|
|
79
|
-
lib.addObjectFile(b.path(il));
|
|
80
|
-
} else if (target.
|
|
134
|
+
lib.addObjectFile(if (has_path) .{ .path = il } else b.path(il));
|
|
135
|
+
} else if (detect(target).os.tag == .windows) {
|
|
81
136
|
try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
|
|
82
137
|
std.process.exit(1);
|
|
83
138
|
}
|
|
84
139
|
lib.linker_allow_shlib_undefined = true;
|
|
85
140
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
141
|
+
if (force_pic and pic orelse false) lib.force_pic = pic;
|
|
86
142
|
// Always emit to build/lib because this is where the driver code expects to find it
|
|
87
143
|
// TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
|
|
88
144
|
//
|
|
@@ -93,69 +149,50 @@ pub fn build(b: *std.Build) !void {
|
|
|
93
149
|
// rename the file ourself in install-pkmn-engine
|
|
94
150
|
b.installArtifact(lib);
|
|
95
151
|
} else if (wasm) {
|
|
96
|
-
|
|
97
|
-
.name = name,
|
|
98
|
-
.root_source_file = b.path("src/lib/wasm.zig"),
|
|
99
|
-
.optimize = switch (optimize) {
|
|
100
|
-
.ReleaseFast, .ReleaseSafe => .ReleaseSmall,
|
|
101
|
-
else => optimize,
|
|
102
|
-
},
|
|
103
|
-
.target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
|
|
104
|
-
.strip = strip,
|
|
105
|
-
.pic = pic,
|
|
106
|
-
});
|
|
107
|
-
exe.root_module.addOptions("build_options", options);
|
|
108
|
-
exe.root_module.export_symbol_names = &[_][]const u8{
|
|
109
|
-
"SHOWDOWN",
|
|
110
|
-
"LOG",
|
|
111
|
-
"CHANCE",
|
|
112
|
-
"CALC",
|
|
113
|
-
"GEN1_CHOICES_SIZE",
|
|
114
|
-
"GEN1_LOGS_SIZE",
|
|
115
|
-
};
|
|
116
|
-
exe.entry = .disabled;
|
|
117
|
-
exe.stack_size = wasm_stack_size;
|
|
118
|
-
const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
|
|
119
|
-
if (optimize != .Debug and opt != null) {
|
|
120
|
-
const out = b.fmt("build/lib/{s}.wasm", .{name});
|
|
121
|
-
const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
|
|
122
|
-
sh.addArtifactArg(exe);
|
|
123
|
-
sh.addArg("-o");
|
|
124
|
-
sh.addFileArg(b.path(out));
|
|
125
|
-
b.getInstallStep().dependOn(&sh.step);
|
|
126
|
-
} else {
|
|
127
|
-
b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
|
|
128
|
-
.dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
|
|
129
|
-
}).step);
|
|
130
|
-
}
|
|
152
|
+
try buildWasm(b, name, "src/lib/wasm.zig", optimize, strip, pic, wasm_stack_size, options);
|
|
131
153
|
} else if (dynamic) {
|
|
132
|
-
const
|
|
154
|
+
const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
|
|
155
|
+
const lib = b.addSharedLibrary(if (force_pic) .{
|
|
133
156
|
.name = name,
|
|
134
|
-
.root_source_file =
|
|
157
|
+
.root_source_file = path,
|
|
158
|
+
.version = try std.SemanticVersion.parse(version),
|
|
159
|
+
.optimize = optimize,
|
|
160
|
+
.target = target,
|
|
161
|
+
} else .{
|
|
162
|
+
.name = name,
|
|
163
|
+
.root_source_file = path,
|
|
135
164
|
.version = try std.SemanticVersion.parse(version),
|
|
136
165
|
.optimize = optimize,
|
|
137
166
|
.target = target,
|
|
138
167
|
.strip = strip,
|
|
139
168
|
.pic = pic,
|
|
140
169
|
});
|
|
141
|
-
lib.root_module.addOptions("build_options", options);
|
|
142
|
-
lib.addIncludePath(b.path("src/include"));
|
|
170
|
+
(if (root_module) lib.root_module else lib).addOptions("build_options", options);
|
|
171
|
+
lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
|
|
143
172
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
173
|
+
if (force_pic and pic orelse false) lib.force_pic = pic;
|
|
144
174
|
b.installArtifact(lib);
|
|
145
175
|
c = true;
|
|
146
176
|
} else {
|
|
147
|
-
const
|
|
177
|
+
const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
|
|
178
|
+
const lib = b.addStaticLibrary(if (force_pic) .{
|
|
179
|
+
.name = name,
|
|
180
|
+
.root_source_file = path,
|
|
181
|
+
.optimize = optimize,
|
|
182
|
+
.target = target,
|
|
183
|
+
} else .{
|
|
148
184
|
.name = name,
|
|
149
|
-
.root_source_file =
|
|
185
|
+
.root_source_file = path,
|
|
150
186
|
.optimize = optimize,
|
|
151
187
|
.target = target,
|
|
152
188
|
.strip = strip,
|
|
153
189
|
.pic = pic,
|
|
154
190
|
});
|
|
155
|
-
lib.root_module.addOptions("build_options", options);
|
|
156
|
-
lib.addIncludePath(b.path("src/include"));
|
|
191
|
+
(if (root_module) lib.root_module else lib).addOptions("build_options", options);
|
|
192
|
+
lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
|
|
157
193
|
lib.bundle_compiler_rt = true;
|
|
158
194
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
195
|
+
if (force_pic and pic orelse false) lib.force_pic = pic;
|
|
159
196
|
if (emit_asm) {
|
|
160
197
|
b.getInstallStep().dependOn(&b.addInstallFileWithDir(
|
|
161
198
|
lib.getEmittedAsm(),
|
|
@@ -175,11 +212,9 @@ pub fn build(b: *std.Build) !void {
|
|
|
175
212
|
}
|
|
176
213
|
|
|
177
214
|
if (c) {
|
|
178
|
-
const
|
|
179
|
-
b.path("src/include/pkmn.h")
|
|
180
|
-
|
|
181
|
-
"pkmn.h",
|
|
182
|
-
);
|
|
215
|
+
const path =
|
|
216
|
+
if (has_path) .{ .path = "src/include/pkmn.h" } else b.path("src/include/pkmn.h");
|
|
217
|
+
const header = b.addInstallFileWithDir(path, .header, "pkmn.h");
|
|
183
218
|
b.getInstallStep().dependOn(&header.step);
|
|
184
219
|
|
|
185
220
|
const pc = b.fmt("lib{s}.pc", .{name});
|
|
@@ -220,7 +255,7 @@ pub fn build(b: *std.Build) !void {
|
|
|
220
255
|
// TODO: tests can be run multiple times due to @imports
|
|
221
256
|
const tests = TestStep.create(b, options, config);
|
|
222
257
|
|
|
223
|
-
var exes = std.ArrayList(*
|
|
258
|
+
var exes = std.ArrayList(*Step.Compile).init(b.allocator);
|
|
224
259
|
const tools: ToolConfig = .{
|
|
225
260
|
.options = .{
|
|
226
261
|
.showdown = showdown,
|
|
@@ -228,6 +263,7 @@ pub fn build(b: *std.Build) !void {
|
|
|
228
263
|
.chance = chance,
|
|
229
264
|
.calc = calc,
|
|
230
265
|
},
|
|
266
|
+
.module = pkmn,
|
|
231
267
|
.general = config,
|
|
232
268
|
.tool = .{
|
|
233
269
|
.tests = if (tests.build) tests else null,
|
|
@@ -266,13 +302,86 @@ pub fn build(b: *std.Build) !void {
|
|
|
266
302
|
}
|
|
267
303
|
}
|
|
268
304
|
|
|
305
|
+
fn buildWasm(
|
|
306
|
+
b: *std.Build,
|
|
307
|
+
name: []const u8,
|
|
308
|
+
root_src_file: []const u8,
|
|
309
|
+
optimize: std.builtin.OptimizeMode,
|
|
310
|
+
strip: ?bool,
|
|
311
|
+
pic: ?bool,
|
|
312
|
+
wasm_stack_size: u64,
|
|
313
|
+
options: anytype,
|
|
314
|
+
) !void {
|
|
315
|
+
const entry = @hasDecl(Step.Compile, "Entry");
|
|
316
|
+
const mode = switch (optimize) {
|
|
317
|
+
.ReleaseFast, .ReleaseSafe => .ReleaseSmall,
|
|
318
|
+
else => optimize,
|
|
319
|
+
};
|
|
320
|
+
const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
|
|
321
|
+
b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding })
|
|
322
|
+
else
|
|
323
|
+
ResolvedTarget{ .cpu_arch = .wasm32, .os_tag = .freestanding };
|
|
324
|
+
const path = if (has_path) .{ .path = root_src_file } else b.path(root_src_file);
|
|
325
|
+
const bin = if (entry) bin: {
|
|
326
|
+
const exe = b.addExecutable(if (force_pic) .{
|
|
327
|
+
.name = name,
|
|
328
|
+
.root_source_file = path,
|
|
329
|
+
.optimize = mode,
|
|
330
|
+
.target = freestanding,
|
|
331
|
+
} else .{
|
|
332
|
+
.name = name,
|
|
333
|
+
.root_source_file = path,
|
|
334
|
+
.optimize = mode,
|
|
335
|
+
.target = freestanding,
|
|
336
|
+
.strip = strip,
|
|
337
|
+
.pic = pic,
|
|
338
|
+
});
|
|
339
|
+
(if (root_module) exe.root_module else exe).export_symbol_names = try exports(b);
|
|
340
|
+
exe.entry = .disabled;
|
|
341
|
+
break :bin exe;
|
|
342
|
+
} else bin: {
|
|
343
|
+
const lib = b.addSharedLibrary(.{
|
|
344
|
+
.name = name,
|
|
345
|
+
.root_source_file = path,
|
|
346
|
+
.optimize = mode,
|
|
347
|
+
.target = freestanding,
|
|
348
|
+
});
|
|
349
|
+
lib.rdynamic = true;
|
|
350
|
+
break :bin lib;
|
|
351
|
+
};
|
|
352
|
+
bin.stack_size = wasm_stack_size;
|
|
353
|
+
if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
|
|
354
|
+
if (force_pic and pic orelse false) bin.force_pic = pic;
|
|
355
|
+
(if (root_module) bin.root_module else bin).addOptions("build_options", options);
|
|
356
|
+
|
|
357
|
+
const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
|
|
358
|
+
if (optimize != .Debug and opt != null) {
|
|
359
|
+
const out = b.fmt("build/lib/{s}.wasm", .{name});
|
|
360
|
+
const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
|
|
361
|
+
sh.addArtifactArg(bin);
|
|
362
|
+
sh.addArg("-o");
|
|
363
|
+
if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
|
|
364
|
+
sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
|
|
365
|
+
} else {
|
|
366
|
+
sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
|
|
367
|
+
}
|
|
368
|
+
b.getInstallStep().dependOn(&sh.step);
|
|
369
|
+
if (!entry) b.installArtifact(bin);
|
|
370
|
+
} else if (entry) {
|
|
371
|
+
b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
|
|
372
|
+
.dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
|
|
373
|
+
}).step);
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
|
|
269
377
|
fn maybeStrip(
|
|
270
378
|
b: *std.Build,
|
|
271
|
-
artifact: *
|
|
379
|
+
artifact: *Step.Compile,
|
|
272
380
|
step: *std.Build.Step,
|
|
273
381
|
strip: ?bool,
|
|
274
382
|
cmd: ?[]const u8,
|
|
275
383
|
) void {
|
|
384
|
+
if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
|
|
276
385
|
if (!(strip orelse false) or cmd == null) return;
|
|
277
386
|
// Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
|
|
278
387
|
const mac = builtin.os.tag == .macos;
|
|
@@ -285,7 +394,7 @@ fn maybeStrip(
|
|
|
285
394
|
}
|
|
286
395
|
|
|
287
396
|
const Config = struct {
|
|
288
|
-
target:
|
|
397
|
+
target: ResolvedTarget,
|
|
289
398
|
optimize: std.builtin.OptimizeMode,
|
|
290
399
|
pic: ?bool,
|
|
291
400
|
strip: ?bool,
|
|
@@ -296,7 +405,7 @@ const TestStep = struct {
|
|
|
296
405
|
step: std.Build.Step,
|
|
297
406
|
build: bool,
|
|
298
407
|
|
|
299
|
-
pub fn create(b: *std.Build, options: *
|
|
408
|
+
pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
|
|
300
409
|
const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
|
|
301
410
|
const test_filter =
|
|
302
411
|
b.option([]const u8, "test-filter", "Skip tests that do not match filter");
|
|
@@ -305,8 +414,14 @@ const TestStep = struct {
|
|
|
305
414
|
const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
|
|
306
415
|
self.* = .{ .step = step, .build = test_filter == null };
|
|
307
416
|
|
|
308
|
-
const
|
|
309
|
-
|
|
417
|
+
const path = if (has_path) .{ .path = "src/lib/test.zig" } else b.path("src/lib/test.zig");
|
|
418
|
+
const tests = b.addTest(if (force_pic) .{
|
|
419
|
+
.root_source_file = path,
|
|
420
|
+
.optimize = config.optimize,
|
|
421
|
+
.target = config.target,
|
|
422
|
+
.filter = test_filter,
|
|
423
|
+
} else .{
|
|
424
|
+
.root_source_file = path,
|
|
310
425
|
.optimize = config.optimize,
|
|
311
426
|
.target = config.target,
|
|
312
427
|
.filter = test_filter,
|
|
@@ -314,8 +429,13 @@ const TestStep = struct {
|
|
|
314
429
|
.strip = config.strip,
|
|
315
430
|
.pic = config.pic,
|
|
316
431
|
});
|
|
317
|
-
tests.root_module.addOptions("build_options", options);
|
|
432
|
+
(if (root_module) tests.root_module else tests).addOptions("build_options", options);
|
|
433
|
+
|
|
318
434
|
maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
|
|
435
|
+
if (force_pic) {
|
|
436
|
+
tests.single_threaded = true;
|
|
437
|
+
if (config.pic orelse false) tests.force_pic = config.pic;
|
|
438
|
+
}
|
|
319
439
|
if (coverage) |c| {
|
|
320
440
|
tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
|
|
321
441
|
}
|
|
@@ -327,15 +447,16 @@ const TestStep = struct {
|
|
|
327
447
|
|
|
328
448
|
const ToolConfig = struct {
|
|
329
449
|
options: Options,
|
|
450
|
+
module: ?*std.Build.Module,
|
|
330
451
|
general: Config,
|
|
331
452
|
tool: struct {
|
|
332
453
|
tests: ?*TestStep,
|
|
333
454
|
name: ?[]const u8 = null,
|
|
334
|
-
exes: *std.ArrayList(*
|
|
455
|
+
exes: *std.ArrayList(*Step.Compile),
|
|
335
456
|
},
|
|
336
457
|
};
|
|
337
458
|
|
|
338
|
-
fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*
|
|
459
|
+
fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
|
|
339
460
|
std.fs.cwd().access(path, .{}) catch |err| switch (err) {
|
|
340
461
|
error.FileNotFound => return null,
|
|
341
462
|
else => |e| return e,
|
|
@@ -345,17 +466,32 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.R
|
|
|
345
466
|
if (index) |i| name = name[0..i];
|
|
346
467
|
if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
|
|
347
468
|
|
|
348
|
-
const exe = b.addExecutable(.{
|
|
469
|
+
const exe = b.addExecutable(if (force_pic) .{
|
|
349
470
|
.name = name,
|
|
350
|
-
.root_source_file = b.path(path),
|
|
471
|
+
.root_source_file = if (has_path) .{ .path = path } else b.path(path),
|
|
472
|
+
.target = config.general.target,
|
|
473
|
+
.optimize = config.general.optimize,
|
|
474
|
+
} else .{
|
|
475
|
+
.name = name,
|
|
476
|
+
.root_source_file = if (has_path) .{ .path = path } else b.path(path),
|
|
351
477
|
.target = config.general.target,
|
|
352
478
|
.optimize = config.general.optimize,
|
|
353
479
|
.single_threaded = true,
|
|
354
480
|
.strip = config.general.strip,
|
|
355
481
|
.pic = config.general.pic,
|
|
356
482
|
});
|
|
357
|
-
exe.root_module.addImport("pkmn", module(b, config.options));
|
|
358
483
|
|
|
484
|
+
if (root_module) {
|
|
485
|
+
const import = if (config.module) |m| m else module(b, config.options);
|
|
486
|
+
exe.root_module.addImport("pkmn", import);
|
|
487
|
+
} else {
|
|
488
|
+
exe.addModule("pkmn", module(b, config.options));
|
|
489
|
+
}
|
|
490
|
+
|
|
491
|
+
if (force_pic) {
|
|
492
|
+
exe.single_threaded = true;
|
|
493
|
+
if (config.general.pic orelse false) exe.force_pic = config.general.pic;
|
|
494
|
+
}
|
|
359
495
|
if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
|
|
360
496
|
config.tool.exes.append(exe) catch @panic("OOM");
|
|
361
497
|
|
|
@@ -369,7 +505,7 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.R
|
|
|
369
505
|
const ToolsStep = struct {
|
|
370
506
|
step: std.Build.Step,
|
|
371
507
|
|
|
372
|
-
pub fn create(b: *std.Build, exes: *std.ArrayList(*
|
|
508
|
+
pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
|
|
373
509
|
const self = b.allocator.create(ToolsStep) catch @panic("OOM");
|
|
374
510
|
const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
|
|
375
511
|
self.* = .{ .step = step };
|
|
@@ -377,3 +513,23 @@ const ToolsStep = struct {
|
|
|
377
513
|
return self;
|
|
378
514
|
}
|
|
379
515
|
};
|
|
516
|
+
|
|
517
|
+
fn detect(target: anytype) std.Target {
|
|
518
|
+
if (@hasField(@TypeOf(target), "result")) return target.result;
|
|
519
|
+
return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
|
|
520
|
+
}
|
|
521
|
+
|
|
522
|
+
const WASM = @embedFile("src/lib/wasm.zig");
|
|
523
|
+
|
|
524
|
+
fn exports(b: *std.Build) ![][]const u8 {
|
|
525
|
+
var symbols = std.ArrayList([]const u8).init(b.allocator);
|
|
526
|
+
|
|
527
|
+
var it = std.mem.splitSequence(u8, WASM, "export const ");
|
|
528
|
+
_ = it.next();
|
|
529
|
+
while (it.next()) |s| {
|
|
530
|
+
const i = std.mem.indexOf(u8, s, " ").?;
|
|
531
|
+
try symbols.append(s[0..i]);
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
return symbols.items;
|
|
535
|
+
}
|