@pkmn/engine 0.1.0-dev.c5fe6d07 → 0.1.0-dev.ce4c0b2a
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 +46 -19
- package/build/pkg/addon/browser.d.ts +3 -0
- package/build/pkg/addon/browser.js +43 -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 +96 -0
- package/build/pkg/addon/node.js.map +1 -0
- package/build/pkg/addon.d.ts +2 -0
- package/build/pkg/addon.js +35 -58
- package/build/pkg/addon.js.map +1 -1
- package/build/pkg/data/ids.json +12 -12
- package/build/pkg/data/layout.json +2 -2
- package/build/pkg/data/protocol.json +69 -12
- package/build/pkg/data.d.ts +27 -5
- package/build/pkg/data.js.map +1 -1
- package/build/pkg/gen1.js +3 -3
- package/build/pkg/gen1.js.map +1 -1
- package/build/pkg/index.d.ts +24 -10
- 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 +123 -102
- package/build/pkg/protocol.js.map +1 -1
- package/build/tools/debug.js +36 -68
- package/build/tools/debug.js.map +1 -1
- package/build/tools/display/debug.jsx +128 -0
- package/build/tools/display/debug.jsx.map +1 -0
- package/build/tools/display/index.js +132 -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 -99
- package/package.json +63 -30
- package/src/bin/install-pkmn-engine +29 -19
- package/src/bin/pkmn-debug +1 -1
- package/src/lib/common/array.zig +77 -0
- package/src/lib/common/data.zig +12 -24
- package/src/lib/common/debug.zig +11 -6
- package/src/lib/common/js.zig +4 -2
- package/src/lib/common/optional.zig +21 -10
- package/src/lib/common/options.zig +4 -0
- package/src/lib/common/protocol.zig +807 -327
- package/src/lib/common/rational.zig +125 -31
- package/src/lib/common/rng.zig +22 -13
- package/src/lib/common/util.zig +50 -1
- package/src/lib/gen1/calc.zig +660 -137
- package/src/lib/gen1/chance.zig +409 -284
- package/src/lib/gen1/data/moves.zig +192 -180
- package/src/lib/gen1/data/species.zig +3 -3
- package/src/lib/gen1/data/types.zig +7 -7
- package/src/lib/gen1/data.zig +48 -59
- package/src/lib/gen1/helpers.zig +94 -552
- package/src/lib/gen1/mechanics.zig +580 -518
- package/src/lib/gen2/calc.zig +161 -0
- package/src/lib/gen2/chance.zig +902 -0
- package/src/lib/gen2/data/items.zig +12 -18
- package/src/lib/gen2/data/moves.zig +663 -569
- package/src/lib/gen2/data/species.zig +1 -1
- package/src/lib/gen2/data/types.zig +134 -31
- package/src/lib/gen2/data.zig +107 -79
- package/src/lib/gen2/generated.zig +806 -0
- package/src/lib/gen2/helpers.zig +49 -25
- package/src/lib/gen2/mechanics.zig +3560 -12
- package/src/lib/{binding/node.zig → node.zig} +10 -13
- package/src/lib/pkmn.zig +32 -15
- package/src/lib/{binding/wasm.zig → wasm.zig} +2 -1
- package/src/tools/display/dom.ts +96 -0
- package/src/tools/display/ui.css +351 -0
- package/build/test/display.js +0 -400
- package/build/test/display.js.map +0 -1
- package/src/lib/gen1/README.md +0 -892
- package/src/lib/gen2/README.md +0 -308
- 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.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,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;AAAzE,QAAA,MAAM,UAAmE;AAE/E,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
|
@@ -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") orelse
|
|
36
|
-
const pic = b.option(bool, "pic", "Force position independent code") orelse
|
|
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
|
|
|
@@ -44,9 +59,15 @@ pub fn build(b: *std.Build) !void {
|
|
|
44
59
|
defer parsed.deinit();
|
|
45
60
|
const version = parsed.value.object.get("version").?.string;
|
|
46
61
|
const description = parsed.value.object.get("description").?.string;
|
|
47
|
-
var repository = std.mem.
|
|
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;
|
|
@@ -61,30 +82,47 @@ pub fn build(b: *std.Build) !void {
|
|
|
61
82
|
|
|
62
83
|
const name = if (showdown) "pkmn-showdown" else "pkmn";
|
|
63
84
|
|
|
85
|
+
const pkmn = if (@hasDecl(std.Build, "CreateModuleOptions")) null else b.addModule("pkmn", .{
|
|
86
|
+
.root_source_file = if (has_path)
|
|
87
|
+
.{ .path = "src/lib/pkmn.zig" }
|
|
88
|
+
else
|
|
89
|
+
b.path("src/lib/pkmn.zig"),
|
|
90
|
+
.optimize = optimize,
|
|
91
|
+
.target = target,
|
|
92
|
+
.imports = &.{.{ .name = "build_options", .module = options.createModule() }},
|
|
93
|
+
});
|
|
94
|
+
|
|
64
95
|
var c = false;
|
|
65
96
|
if (node_headers) |headers| {
|
|
66
97
|
const addon = b.fmt("{s}.node", .{name});
|
|
67
|
-
const
|
|
98
|
+
const path = if (has_path) .{ .path = "src/lib/node.zig" } else b.path("src/lib/node.zig");
|
|
99
|
+
const lib = b.addSharedLibrary(if (force_pic) .{
|
|
100
|
+
.name = addon,
|
|
101
|
+
.root_source_file = path,
|
|
102
|
+
.optimize = optimize,
|
|
103
|
+
.target = target,
|
|
104
|
+
} else .{
|
|
68
105
|
.name = addon,
|
|
69
|
-
.
|
|
70
|
-
.root_source_file = .{ .path = "src/lib/binding/node.zig" },
|
|
106
|
+
.root_source_file = path,
|
|
71
107
|
.optimize = optimize,
|
|
72
108
|
.target = target,
|
|
109
|
+
.strip = strip,
|
|
110
|
+
.pic = pic,
|
|
73
111
|
});
|
|
74
|
-
lib.addOptions("build_options", options);
|
|
75
|
-
lib.addSystemIncludePath(.{ .path = headers });
|
|
112
|
+
(if (root_module) lib.root_module else lib).addOptions("build_options", options);
|
|
113
|
+
lib.addSystemIncludePath(if (has_path) .{ .path = headers } else b.path(headers));
|
|
76
114
|
lib.linkLibC();
|
|
77
115
|
if (node_import_lib) |il| {
|
|
78
|
-
lib.addObjectFile(.{ .path = il });
|
|
79
|
-
} else if (
|
|
116
|
+
lib.addObjectFile(if (has_path) .{ .path = il } else b.path(il));
|
|
117
|
+
} else if (detect(target).os.tag == .windows) {
|
|
80
118
|
try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
|
|
81
119
|
std.process.exit(1);
|
|
82
120
|
}
|
|
83
121
|
lib.linker_allow_shlib_undefined = true;
|
|
84
122
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
85
|
-
if (pic) lib.force_pic = pic;
|
|
123
|
+
if (force_pic and pic orelse false) lib.force_pic = pic;
|
|
86
124
|
// Always emit to build/lib because this is where the driver code expects to find it
|
|
87
|
-
// TODO
|
|
125
|
+
// TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
|
|
88
126
|
//
|
|
89
127
|
// lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
|
|
90
128
|
// b.getInstallStep().dependOn(&lib.step);
|
|
@@ -93,59 +131,116 @@ pub fn build(b: *std.Build) !void {
|
|
|
93
131
|
// rename the file ourself in install-pkmn-engine
|
|
94
132
|
b.installArtifact(lib);
|
|
95
133
|
} else if (wasm) {
|
|
96
|
-
const
|
|
97
|
-
|
|
98
|
-
.
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
});
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
134
|
+
const entry = @hasDecl(Step.Compile, "Entry");
|
|
135
|
+
const mode = switch (optimize) {
|
|
136
|
+
.ReleaseFast, .ReleaseSafe => .ReleaseSmall,
|
|
137
|
+
else => optimize,
|
|
138
|
+
};
|
|
139
|
+
const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
|
|
140
|
+
b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding })
|
|
141
|
+
else
|
|
142
|
+
ResolvedTarget{ .cpu_arch = .wasm32, .os_tag = .freestanding };
|
|
143
|
+
const path = if (has_path) .{ .path = "src/lib/wasm.zig" } else b.path("src/lib/wasm.zig");
|
|
144
|
+
const bin = if (entry) bin: {
|
|
145
|
+
const exe = b.addExecutable(if (force_pic) .{
|
|
146
|
+
.name = name,
|
|
147
|
+
.root_source_file = path,
|
|
148
|
+
.optimize = mode,
|
|
149
|
+
.target = freestanding,
|
|
150
|
+
} else .{
|
|
151
|
+
.name = name,
|
|
152
|
+
.root_source_file = path,
|
|
153
|
+
.optimize = mode,
|
|
154
|
+
.target = freestanding,
|
|
155
|
+
.strip = strip,
|
|
156
|
+
.pic = pic,
|
|
157
|
+
});
|
|
158
|
+
(if (root_module) exe.root_module else exe).export_symbol_names = &[_][]const u8{
|
|
159
|
+
"SHOWDOWN",
|
|
160
|
+
"LOG",
|
|
161
|
+
"CHANCE",
|
|
162
|
+
"CALC",
|
|
163
|
+
"GEN1_CHOICES_SIZE",
|
|
164
|
+
"GEN1_LOGS_SIZE",
|
|
165
|
+
};
|
|
166
|
+
exe.entry = .disabled;
|
|
167
|
+
break :bin exe;
|
|
168
|
+
} else bin: {
|
|
169
|
+
const lib = b.addSharedLibrary(.{
|
|
170
|
+
.name = name,
|
|
171
|
+
.root_source_file = path,
|
|
172
|
+
.optimize = mode,
|
|
173
|
+
.target = freestanding,
|
|
174
|
+
});
|
|
175
|
+
lib.rdynamic = true;
|
|
176
|
+
break :bin lib;
|
|
177
|
+
};
|
|
178
|
+
bin.stack_size = wasm_stack_size;
|
|
179
|
+
if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
|
|
180
|
+
if (force_pic and pic orelse false) bin.force_pic = pic;
|
|
181
|
+
(if (root_module) bin.root_module else bin).addOptions("build_options", options);
|
|
182
|
+
|
|
111
183
|
const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
|
|
112
184
|
if (optimize != .Debug and opt != null) {
|
|
113
185
|
const out = b.fmt("build/lib/{s}.wasm", .{name});
|
|
114
186
|
const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
|
|
115
|
-
sh.addArtifactArg(
|
|
187
|
+
sh.addArtifactArg(bin);
|
|
116
188
|
sh.addArg("-o");
|
|
117
|
-
sh
|
|
189
|
+
if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
|
|
190
|
+
sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
|
|
191
|
+
} else {
|
|
192
|
+
sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
|
|
193
|
+
}
|
|
118
194
|
b.getInstallStep().dependOn(&sh.step);
|
|
195
|
+
if (!entry) b.installArtifact(bin);
|
|
196
|
+
} else if (entry) {
|
|
197
|
+
b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
|
|
198
|
+
.dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
|
|
199
|
+
}).step);
|
|
119
200
|
}
|
|
120
|
-
b.installArtifact(lib);
|
|
121
201
|
} else if (dynamic) {
|
|
122
|
-
const
|
|
202
|
+
const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
|
|
203
|
+
const lib = b.addSharedLibrary(if (force_pic) .{
|
|
123
204
|
.name = name,
|
|
124
|
-
.
|
|
125
|
-
.root_source_file = .{ .path = "src/lib/binding/c.zig" },
|
|
205
|
+
.root_source_file = path,
|
|
126
206
|
.version = try std.SemanticVersion.parse(version),
|
|
127
207
|
.optimize = optimize,
|
|
128
208
|
.target = target,
|
|
209
|
+
} else .{
|
|
210
|
+
.name = name,
|
|
211
|
+
.root_source_file = path,
|
|
212
|
+
.version = try std.SemanticVersion.parse(version),
|
|
213
|
+
.optimize = optimize,
|
|
214
|
+
.target = target,
|
|
215
|
+
.strip = strip,
|
|
216
|
+
.pic = pic,
|
|
129
217
|
});
|
|
130
|
-
lib.addOptions("build_options", options);
|
|
131
|
-
lib.addIncludePath(.{ .path = "src/include" });
|
|
218
|
+
(if (root_module) lib.root_module else lib).addOptions("build_options", options);
|
|
219
|
+
lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
|
|
132
220
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
133
|
-
if (pic) lib.force_pic = pic;
|
|
221
|
+
if (force_pic and pic orelse false) lib.force_pic = pic;
|
|
134
222
|
b.installArtifact(lib);
|
|
135
223
|
c = true;
|
|
136
224
|
} else {
|
|
137
|
-
const
|
|
225
|
+
const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
|
|
226
|
+
const lib = b.addStaticLibrary(if (force_pic) .{
|
|
138
227
|
.name = name,
|
|
139
|
-
.
|
|
140
|
-
.root_source_file = .{ .path = "src/lib/binding/c.zig" },
|
|
228
|
+
.root_source_file = path,
|
|
141
229
|
.optimize = optimize,
|
|
142
230
|
.target = target,
|
|
231
|
+
} else .{
|
|
232
|
+
.name = name,
|
|
233
|
+
.root_source_file = path,
|
|
234
|
+
.optimize = optimize,
|
|
235
|
+
.target = target,
|
|
236
|
+
.strip = strip,
|
|
237
|
+
.pic = pic,
|
|
143
238
|
});
|
|
144
|
-
lib.addOptions("build_options", options);
|
|
145
|
-
lib.addIncludePath(.{ .path = "src/include" });
|
|
239
|
+
(if (root_module) lib.root_module else lib).addOptions("build_options", options);
|
|
240
|
+
lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
|
|
146
241
|
lib.bundle_compiler_rt = true;
|
|
147
242
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
148
|
-
if (pic) lib.force_pic = pic;
|
|
243
|
+
if (force_pic and pic orelse false) lib.force_pic = pic;
|
|
149
244
|
if (emit_asm) {
|
|
150
245
|
b.getInstallStep().dependOn(&b.addInstallFileWithDir(
|
|
151
246
|
lib.getEmittedAsm(),
|
|
@@ -165,15 +260,17 @@ pub fn build(b: *std.Build) !void {
|
|
|
165
260
|
}
|
|
166
261
|
|
|
167
262
|
if (c) {
|
|
168
|
-
const
|
|
169
|
-
.{ .path = "src/include/pkmn.h" }
|
|
170
|
-
|
|
171
|
-
"pkmn.h",
|
|
172
|
-
);
|
|
263
|
+
const path =
|
|
264
|
+
if (has_path) .{ .path = "src/include/pkmn.h" } else b.path("src/include/pkmn.h");
|
|
265
|
+
const header = b.addInstallFileWithDir(path, .header, "pkmn.h");
|
|
173
266
|
b.getInstallStep().dependOn(&header.step);
|
|
174
267
|
|
|
175
268
|
const pc = b.fmt("lib{s}.pc", .{name});
|
|
176
|
-
const file = try
|
|
269
|
+
const file = try std.fs.path.relative(
|
|
270
|
+
b.allocator,
|
|
271
|
+
try std.process.getCwdAlloc(b.allocator),
|
|
272
|
+
try b.cache_root.join(b.allocator, &.{pc}),
|
|
273
|
+
);
|
|
177
274
|
const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
|
|
178
275
|
|
|
179
276
|
const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
|
|
@@ -206,7 +303,7 @@ pub fn build(b: *std.Build) !void {
|
|
|
206
303
|
// TODO: tests can be run multiple times due to @imports
|
|
207
304
|
const tests = TestStep.create(b, options, config);
|
|
208
305
|
|
|
209
|
-
var exes = std.ArrayList(*
|
|
306
|
+
var exes = std.ArrayList(*Step.Compile).init(b.allocator);
|
|
210
307
|
const tools: ToolConfig = .{
|
|
211
308
|
.options = .{
|
|
212
309
|
.showdown = showdown,
|
|
@@ -214,6 +311,7 @@ pub fn build(b: *std.Build) !void {
|
|
|
214
311
|
.chance = chance,
|
|
215
312
|
.calc = calc,
|
|
216
313
|
},
|
|
314
|
+
.module = pkmn,
|
|
217
315
|
.general = config,
|
|
218
316
|
.tool = .{
|
|
219
317
|
.tests = if (tests.build) tests else null,
|
|
@@ -224,41 +322,43 @@ pub fn build(b: *std.Build) !void {
|
|
|
224
322
|
var benchmark_config = tools;
|
|
225
323
|
benchmark_config.general.optimize = .ReleaseFast;
|
|
226
324
|
benchmark_config.general.strip = true;
|
|
227
|
-
const benchmark = tool(b, "src/test/benchmark.zig", benchmark_config);
|
|
325
|
+
const benchmark = try tool(b, "src/test/benchmark.zig", benchmark_config);
|
|
228
326
|
|
|
229
327
|
var fuzz_config = tools;
|
|
230
328
|
fuzz_config.general.strip = false;
|
|
231
329
|
fuzz_config.tool.name = "fuzz";
|
|
232
|
-
const fuzz = tool(b, "src/test/fuzz.zig", fuzz_config);
|
|
330
|
+
const fuzz = try tool(b, "src/test/fuzz.zig", fuzz_config);
|
|
233
331
|
|
|
234
|
-
const analyze = tool(b, "src/tools/analyze.zig", tools);
|
|
235
|
-
const dump = tool(b, "src/tools/dump.zig", tools);
|
|
236
|
-
const transitions = tool(b, "src/tools/transitions.zig", tools);
|
|
332
|
+
const analyze = try tool(b, "src/tools/analyze.zig", tools);
|
|
333
|
+
const dump = try tool(b, "src/tools/dump.zig", tools);
|
|
334
|
+
const transitions = try tool(b, "src/tools/transitions.zig", tools);
|
|
237
335
|
|
|
238
|
-
// FIXME: serde randomly fails to build in
|
|
336
|
+
// FIXME: serde randomly fails to build in some release configurations
|
|
239
337
|
var hack = tools;
|
|
240
|
-
if (
|
|
241
|
-
const serde = tool(b, "src/tools/serde.zig", hack);
|
|
242
|
-
|
|
243
|
-
b.step("analyze", "Run LLVM analysis tool").dependOn(&
|
|
244
|
-
b.step("benchmark", "Run benchmark code").dependOn(&
|
|
245
|
-
b.step("dump", "Run protocol dump tool").dependOn(&
|
|
246
|
-
b.step("fuzz", "Run fuzz tester").dependOn(&
|
|
247
|
-
b.step("serde", "Run serialization/deserialization tool").dependOn(&
|
|
338
|
+
if (optimize != .Debug) hack.tool.tests = null;
|
|
339
|
+
const serde = try tool(b, "src/tools/serde.zig", hack);
|
|
340
|
+
|
|
341
|
+
if (analyze) |t| b.step("analyze", "Run LLVM analysis tool").dependOn(&t.step);
|
|
342
|
+
if (benchmark) |t| b.step("benchmark", "Run benchmark code").dependOn(&t.step);
|
|
343
|
+
if (dump) |t| b.step("dump", "Run protocol dump tool").dependOn(&t.step);
|
|
344
|
+
if (fuzz) |t| b.step("fuzz", "Run fuzz tester").dependOn(&t.step);
|
|
345
|
+
if (serde) |t| b.step("serde", "Run serialization/deserialization tool").dependOn(&t.step);
|
|
248
346
|
b.step("test", "Run all tests").dependOn(&tests.step);
|
|
249
347
|
b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
|
|
250
|
-
|
|
348
|
+
if (transitions) |t| {
|
|
349
|
+
b.step("transitions", "Visualize transitions algorithm search").dependOn(&t.step);
|
|
350
|
+
}
|
|
251
351
|
}
|
|
252
352
|
|
|
253
353
|
fn maybeStrip(
|
|
254
354
|
b: *std.Build,
|
|
255
|
-
artifact: *
|
|
355
|
+
artifact: *Step.Compile,
|
|
256
356
|
step: *std.Build.Step,
|
|
257
|
-
strip: bool,
|
|
357
|
+
strip: ?bool,
|
|
258
358
|
cmd: ?[]const u8,
|
|
259
359
|
) void {
|
|
260
|
-
artifact.strip = strip;
|
|
261
|
-
if (!strip or cmd == null) return;
|
|
360
|
+
if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
|
|
361
|
+
if (!(strip orelse false) or cmd == null) return;
|
|
262
362
|
// Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
|
|
263
363
|
const mac = builtin.os.tag == .macos;
|
|
264
364
|
if (mac and artifact.isDynamicLibrary()) return;
|
|
@@ -270,10 +370,10 @@ fn maybeStrip(
|
|
|
270
370
|
}
|
|
271
371
|
|
|
272
372
|
const Config = struct {
|
|
273
|
-
target:
|
|
373
|
+
target: ResolvedTarget,
|
|
274
374
|
optimize: std.builtin.OptimizeMode,
|
|
275
|
-
pic: bool,
|
|
276
|
-
strip: bool,
|
|
375
|
+
pic: ?bool,
|
|
376
|
+
strip: ?bool,
|
|
277
377
|
cmd: ?[]const u8,
|
|
278
378
|
};
|
|
279
379
|
|
|
@@ -281,32 +381,37 @@ const TestStep = struct {
|
|
|
281
381
|
step: std.Build.Step,
|
|
282
382
|
build: bool,
|
|
283
383
|
|
|
284
|
-
pub fn create(b: *std.Build, options: *
|
|
384
|
+
pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
|
|
285
385
|
const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
|
|
286
|
-
const test_file = b.option([]const u8, "test-file", "Input file for test");
|
|
287
386
|
const test_filter =
|
|
288
387
|
b.option([]const u8, "test-filter", "Skip tests that do not match filter");
|
|
289
388
|
|
|
290
389
|
const self = b.allocator.create(TestStep) catch @panic("OOM");
|
|
291
390
|
const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
|
|
292
|
-
self.* =
|
|
293
|
-
|
|
294
|
-
const path =
|
|
295
|
-
const tests = b.addTest(.{
|
|
296
|
-
.
|
|
297
|
-
std.fs.path.basename(std.fs.path.dirname(path).?),
|
|
298
|
-
std.fs.path.stem(std.fs.path.basename(path)),
|
|
299
|
-
}),
|
|
300
|
-
.main_pkg_path = .{ .path = "." },
|
|
301
|
-
.root_source_file = .{ .path = path },
|
|
391
|
+
self.* = .{ .step = step, .build = test_filter == null };
|
|
392
|
+
|
|
393
|
+
const path = if (has_path) .{ .path = "src/lib/test.zig" } else b.path("src/lib/test.zig");
|
|
394
|
+
const tests = b.addTest(if (force_pic) .{
|
|
395
|
+
.root_source_file = path,
|
|
302
396
|
.optimize = config.optimize,
|
|
303
397
|
.target = config.target,
|
|
304
398
|
.filter = test_filter,
|
|
399
|
+
} else .{
|
|
400
|
+
.root_source_file = path,
|
|
401
|
+
.optimize = config.optimize,
|
|
402
|
+
.target = config.target,
|
|
403
|
+
.filter = test_filter,
|
|
404
|
+
.single_threaded = true,
|
|
405
|
+
.strip = config.strip,
|
|
406
|
+
.pic = config.pic,
|
|
305
407
|
});
|
|
306
|
-
tests.addOptions("build_options", options);
|
|
307
|
-
|
|
408
|
+
(if (root_module) tests.root_module else tests).addOptions("build_options", options);
|
|
409
|
+
|
|
308
410
|
maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
|
|
309
|
-
if (
|
|
411
|
+
if (force_pic) {
|
|
412
|
+
tests.single_threaded = true;
|
|
413
|
+
if (config.pic orelse false) tests.force_pic = config.pic;
|
|
414
|
+
}
|
|
310
415
|
if (coverage) |c| {
|
|
311
416
|
tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
|
|
312
417
|
}
|
|
@@ -318,30 +423,51 @@ const TestStep = struct {
|
|
|
318
423
|
|
|
319
424
|
const ToolConfig = struct {
|
|
320
425
|
options: Options,
|
|
426
|
+
module: ?*std.Build.Module,
|
|
321
427
|
general: Config,
|
|
322
428
|
tool: struct {
|
|
323
429
|
tests: ?*TestStep,
|
|
324
430
|
name: ?[]const u8 = null,
|
|
325
|
-
exes: *std.ArrayList(*
|
|
431
|
+
exes: *std.ArrayList(*Step.Compile),
|
|
326
432
|
},
|
|
327
433
|
};
|
|
328
434
|
|
|
329
|
-
fn tool(b: *std.Build, path: []const u8, config: ToolConfig)
|
|
435
|
+
fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
|
|
436
|
+
std.fs.cwd().access(path, .{}) catch |err| switch (err) {
|
|
437
|
+
error.FileNotFound => return null,
|
|
438
|
+
else => |e| return e,
|
|
439
|
+
};
|
|
330
440
|
var name = config.tool.name orelse std.fs.path.basename(path);
|
|
331
441
|
const index = std.mem.lastIndexOfScalar(u8, name, '.');
|
|
332
442
|
if (index) |i| name = name[0..i];
|
|
333
443
|
if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
|
|
334
444
|
|
|
335
|
-
const exe = b.addExecutable(.{
|
|
445
|
+
const exe = b.addExecutable(if (force_pic) .{
|
|
336
446
|
.name = name,
|
|
337
|
-
.root_source_file = .{ .path = path },
|
|
447
|
+
.root_source_file = if (has_path) .{ .path = path } else b.path(path),
|
|
338
448
|
.target = config.general.target,
|
|
339
449
|
.optimize = config.general.optimize,
|
|
450
|
+
} else .{
|
|
451
|
+
.name = name,
|
|
452
|
+
.root_source_file = if (has_path) .{ .path = path } else b.path(path),
|
|
453
|
+
.target = config.general.target,
|
|
454
|
+
.optimize = config.general.optimize,
|
|
455
|
+
.single_threaded = true,
|
|
456
|
+
.strip = config.general.strip,
|
|
457
|
+
.pic = config.general.pic,
|
|
340
458
|
});
|
|
341
|
-
exe.addModule("pkmn", module(b, config.options));
|
|
342
459
|
|
|
343
|
-
|
|
344
|
-
|
|
460
|
+
if (root_module) {
|
|
461
|
+
const import = if (config.module) |m| m else module(b, config.options);
|
|
462
|
+
exe.root_module.addImport("pkmn", import);
|
|
463
|
+
} else {
|
|
464
|
+
exe.addModule("pkmn", module(b, config.options));
|
|
465
|
+
}
|
|
466
|
+
|
|
467
|
+
if (force_pic) {
|
|
468
|
+
exe.single_threaded = true;
|
|
469
|
+
if (config.general.pic orelse false) exe.force_pic = config.general.pic;
|
|
470
|
+
}
|
|
345
471
|
if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
|
|
346
472
|
config.tool.exes.append(exe) catch @panic("OOM");
|
|
347
473
|
|
|
@@ -355,11 +481,16 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
|
|
|
355
481
|
const ToolsStep = struct {
|
|
356
482
|
step: std.Build.Step,
|
|
357
483
|
|
|
358
|
-
pub fn create(b: *std.Build, exes: *std.ArrayList(*
|
|
484
|
+
pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
|
|
359
485
|
const self = b.allocator.create(ToolsStep) catch @panic("OOM");
|
|
360
486
|
const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
|
|
361
|
-
self.* =
|
|
487
|
+
self.* = .{ .step = step };
|
|
362
488
|
for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t, .{}).step);
|
|
363
489
|
return self;
|
|
364
490
|
}
|
|
365
491
|
};
|
|
492
|
+
|
|
493
|
+
fn detect(target: anytype) std.Target {
|
|
494
|
+
if (@hasField(@TypeOf(target), "result")) return target.result;
|
|
495
|
+
return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
|
|
496
|
+
}
|