Skip to content

Commit 978feed

Browse files
authored
Merge pull request #2242 from HDR-Development/feature/no-more-build-script
feat: Remove need for building PRCs at compile time
2 parents a2467b8 + afc0d72 commit 978feed

File tree

11 files changed

+104
-267
lines changed

11 files changed

+104
-267
lines changed

Cargo.toml

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = ["crates/*", "dynamic", "fighters/*", "hdr-macros", "utils"]
2+
members = ["dynamic", "fighters/*", "hdr-macros", "utils"]
33

44
resolver = "2"
55

@@ -226,10 +226,6 @@ smashline.workspace = true
226226
skyline-web = { workspace = true, optional = true }
227227
utils.workspace = true
228228

229-
[build-dependencies]
230-
build-tools = { path = "crates/build-tools" }
231-
hdr-macros.workspace = true
232-
233229
[features]
234230
default = [
235231
"bayonetta",

build.rs

-15
This file was deleted.

crates/build-tools/Cargo.toml

-12
This file was deleted.

crates/build-tools/src/lib.rs

-48
This file was deleted.

crates/build-tools/src/main.rs

-7
This file was deleted.

hdr-macros/src/lib.rs

+1-19
Original file line numberDiff line numberDiff line change
@@ -255,32 +255,14 @@ pub fn agent_params(item: TokenStream) -> TokenStream {
255255
}
256256
};
257257

258-
let path = Path::new(file!()).strip_prefix("hdr-macros").unwrap();
259-
let path = Path::new(env!("CARGO_MANIFEST_DIR")).join(path);
260-
let parent = match path.parent() {
261-
Some(parent) => parent,
262-
None => {
263-
return syn::Error::new(literal.span(), "Failed to get parent of current path.")
264-
.into_compile_error()
265-
.into()
266-
}
267-
};
268-
269-
let rom_path = parent.join("../../romfs/build/");
270-
271258
let mut output = String::new();
272259
for line in data.lines() {
273260
let line = line.trim_start();
274261
if !line.starts_with("#") {
275262
if let Some((agent, file)) = line.split_once(":") {
276263
let agent = agent.trim_start().trim_end();
277264
let file = file.trim_start().trim_end();
278-
if let Ok(metadata) = std::fs::metadata(rom_path.join(file)) {
279-
writeln!(output, "fighter_kind_{}:{}:{}", agent, file, metadata.len())
280-
.expect("Unknown error writing to output!");
281-
} else {
282-
panic!("Missing romfs file {}", file);
283-
}
265+
let _ = writeln!(output, "fighter_kind_{}:{}", agent, file);
284266
}
285267
}
286268
}

romfs/agent_params.txt

+38-38
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
luigi: fighter/luigi/param/hdr.prc
2-
pikmin: fighter/pikmin/param/hdr.prc
3-
lucas: fighter/lucas/param/hdr.prc
4-
lucario: fighter/lucario/param/hdr.prc
5-
pichu: fighter/pichu/param/hdr.prc
6-
ike: fighter/ike/param/hdr.prc
7-
donkey: fighter/donkey/param/hdr.prc
8-
dolly: fighter/dolly/param/hdr.prc
9-
chrom: fighter/chrom/param/hdr.prc
10-
captain: fighter/captain/param/hdr.prc
11-
pacman: fighter/pacman/param/hdr.prc
12-
mario: fighter/mario/param/hdr.prc
13-
mariod: fighter/mariod/param/hdr.prc
14-
link: fighter/link/param/hdr.prc
15-
simon: fighter/simon/param/hdr.prc
16-
richter: fighter/richter/param/hdr.prc
17-
koopajr: fighter/koopajr/param/hdr.prc
18-
demon: fighter/demon/param/hdr.prc
19-
samus: fighter/samus/param/hdr.prc
20-
samusd: fighter/samusd/param/hdr.prc
21-
edge: fighter/edge/param/hdr.prc
22-
szerosuit: fighter/szerosuit/param/hdr.prc
23-
pit: fighter/pit/param/hdr.prc
24-
pitb: fighter/pitb/param/hdr.prc
25-
toonlink: fighter/toonlink/param/hdr.prc
26-
younglink: fighter/younglink/param/hdr.prc
27-
daisy: fighter/daisy/param/hdr.prc
28-
miiswordsman: fighter/miiswordsman/param/hdr.prc
29-
duckhunt: fighter/duckhunt/param/hdr.prc
30-
krool: fighter/krool/param/hdr.prc
31-
ganon: fighter/ganon/param/hdr.prc
32-
miifighter: fighter/miifighter/param/hdr.prc
33-
sheik: fighter/sheik/param/hdr.prc
34-
miigunner: fighter/miigunner/param/hdr.prc
35-
falco: fighter/falco/param/hdr.prc
36-
ness: fighter/ness/param/hdr.prc
37-
ryu: fighter/ryu/param/hdr.prc
38-
ken: fighter/ken/param/hdr.prc
1+
luigi: fighter/luigi/param/hdr.xml
2+
pikmin: fighter/pikmin/param/hdr.xml
3+
lucas: fighter/lucas/param/hdr.xml
4+
lucario: fighter/lucario/param/hdr.xml
5+
pichu: fighter/pichu/param/hdr.xml
6+
ike: fighter/ike/param/hdr.xml
7+
donkey: fighter/donkey/param/hdr.xml
8+
dolly: fighter/dolly/param/hdr.xml
9+
chrom: fighter/chrom/param/hdr.xml
10+
captain: fighter/captain/param/hdr.xml
11+
pacman: fighter/pacman/param/hdr.xml
12+
mario: fighter/mario/param/hdr.xml
13+
mariod: fighter/mariod/param/hdr.xml
14+
link: fighter/link/param/hdr.xml
15+
simon: fighter/simon/param/hdr.xml
16+
richter: fighter/richter/param/hdr.xml
17+
koopajr: fighter/koopajr/param/hdr.xml
18+
demon: fighter/demon/param/hdr.xml
19+
samus: fighter/samus/param/hdr.xml
20+
samusd: fighter/samusd/param/hdr.xml
21+
edge: fighter/edge/param/hdr.xml
22+
szerosuit: fighter/szerosuit/param/hdr.xml
23+
pit: fighter/pit/param/hdr.xml
24+
pitb: fighter/pitb/param/hdr.xml
25+
toonlink: fighter/toonlink/param/hdr.xml
26+
younglink: fighter/younglink/param/hdr.xml
27+
daisy: fighter/daisy/param/hdr.xml
28+
miiswordsman: fighter/miiswordsman/param/hdr.xml
29+
duckhunt: fighter/duckhunt/param/hdr.xml
30+
krool: fighter/krool/param/hdr.xml
31+
ganon: fighter/ganon/param/hdr.xml
32+
miifighter: fighter/miifighter/param/hdr.xml
33+
sheik: fighter/sheik/param/hdr.xml
34+
miigunner: fighter/miigunner/param/hdr.xml
35+
falco: fighter/falco/param/hdr.xml
36+
ness: fighter/ness/param/hdr.xml
37+
ryu: fighter/ryu/param/hdr.xml
38+
ken: fighter/ken/param/hdr.xml

romfs/config.json

+40-40
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,122 @@
11
{
22
"new-dir-files": {
33
"0xecf7a127b": [
4-
"fighter/common/hdr/param/fighter_param.prc",
5-
"fighter/common/hdr/param/common.prc"
4+
"fighter/common/hdr/param/fighter_param.xml",
5+
"fighter/common/hdr/param/common.xml"
66
],
77
"fighter/luigi/cmn": [
8-
"fighter/luigi/param/hdr.prc"
8+
"fighter/luigi/param/hdr.xml"
99
],
1010
"fighter/pikmin/cmn": [
11-
"fighter/pikmin/param/hdr.prc"
11+
"fighter/pikmin/param/hdr.xml"
1212
],
1313
"fighter/lucas/cmn": [
14-
"fighter/lucas/param/hdr.prc"
14+
"fighter/lucas/param/hdr.xml"
1515
],
1616
"fighter/lucario/cmn": [
17-
"fighter/lucario/param/hdr.prc"
17+
"fighter/lucario/param/hdr.xml"
1818
],
1919
"fighter/pichu/cmn": [
20-
"fighter/pichu/param/hdr.prc"
20+
"fighter/pichu/param/hdr.xml"
2121
],
2222
"fighter/ike/cmn": [
23-
"fighter/ike/param/hdr.prc"
23+
"fighter/ike/param/hdr.xml"
2424
],
2525
"fighter/donkey/cmn": [
26-
"fighter/donkey/param/hdr.prc"
26+
"fighter/donkey/param/hdr.xml"
2727
],
2828
"fighter/captain/cmn": [
29-
"fighter/captain/param/hdr.prc"
29+
"fighter/captain/param/hdr.xml"
3030
],
3131
"fighter/chrom/cmn": [
32-
"fighter/chrom/param/hdr.prc"
32+
"fighter/chrom/param/hdr.xml"
3333
],
3434
"fighter/dolly/cmn": [
35-
"fighter/dolly/param/hdr.prc"
35+
"fighter/dolly/param/hdr.xml"
3636
],
3737
"fighter/pacman/cmn": [
38-
"fighter/pacman/param/hdr.prc"
38+
"fighter/pacman/param/hdr.xml"
3939
],
4040
"fighter/mario/cmn": [
41-
"fighter/mario/param/hdr.prc"
41+
"fighter/mario/param/hdr.xml"
4242
],
4343
"fighter/mariod/cmn": [
44-
"fighter/mariod/param/hdr.prc"
44+
"fighter/mariod/param/hdr.xml"
4545
],
4646
"fighter/link/cmn": [
47-
"fighter/link/param/hdr.prc"
47+
"fighter/link/param/hdr.xml"
4848
],
4949
"fighter/simon/cmn": [
50-
"fighter/simon/param/hdr.prc"
50+
"fighter/simon/param/hdr.xml"
5151
],
5252
"fighter/richter/cmn": [
53-
"fighter/richter/param/hdr.prc"
53+
"fighter/richter/param/hdr.xml"
5454
],
5555
"fighter/koopajr/cmn": [
56-
"fighter/koopajr/param/hdr.prc"
56+
"fighter/koopajr/param/hdr.xml"
5757
],
5858
"fighter/demon/cmn": [
59-
"fighter/demon/param/hdr.prc"
59+
"fighter/demon/param/hdr.xml"
6060
],
6161
"fighter/samus/cmn": [
62-
"fighter/samus/param/hdr.prc"
62+
"fighter/samus/param/hdr.xml"
6363
],
6464
"fighter/samusd/cmn": [
65-
"fighter/samusd/param/hdr.prc"
65+
"fighter/samusd/param/hdr.xml"
6666
],
6767
"fighter/edge/cmn": [
68-
"fighter/edge/param/hdr.prc"
68+
"fighter/edge/param/hdr.xml"
6969
],
7070
"fighter/szerosuit/cmn": [
71-
"fighter/szerosuit/param/hdr.prc"
71+
"fighter/szerosuit/param/hdr.xml"
7272
],
7373
"fighter/pit/cmn": [
74-
"fighter/pit/param/hdr.prc"
74+
"fighter/pit/param/hdr.xml"
7575
],
7676
"fighter/pitb/cmn": [
77-
"fighter/pitb/param/hdr.prc"
77+
"fighter/pitb/param/hdr.xml"
7878
],
7979
"fighter/toonlink/cmn": [
80-
"fighter/toonlink/param/hdr.prc"
80+
"fighter/toonlink/param/hdr.xml"
8181
],
8282
"fighter/younglink/cmn": [
83-
"fighter/younglink/param/hdr.prc"
83+
"fighter/younglink/param/hdr.xml"
8484
],
8585
"fighter/daisy/cmn": [
86-
"fighter/daisy/param/hdr.prc"
86+
"fighter/daisy/param/hdr.xml"
8787
],
8888
"fighter/miiswordsman/cmn": [
89-
"fighter/miiswordsman/param/hdr.prc"
89+
"fighter/miiswordsman/param/hdr.xml"
9090
],
9191
"fighter/duckhunt/cmn": [
92-
"fighter/duckhunt/param/hdr.prc"
92+
"fighter/duckhunt/param/hdr.xml"
9393
],
9494
"fighter/krool/cmn": [
95-
"fighter/krool/param/hdr.prc"
95+
"fighter/krool/param/hdr.xml"
9696
],
9797
"fighter/ganon/cmn": [
98-
"fighter/ganon/param/hdr.prc"
98+
"fighter/ganon/param/hdr.xml"
9999
],
100100
"fighter/miifighter/cmn": [
101-
"fighter/miifighter/param/hdr.prc"
101+
"fighter/miifighter/param/hdr.xml"
102102
],
103103
"fighter/sheik/cmn": [
104-
"fighter/sheik/param/hdr.prc"
104+
"fighter/sheik/param/hdr.xml"
105105
],
106106
"fighter/ness/cmn": [
107-
"fighter/ness/param/hdr.prc"
107+
"fighter/ness/param/hdr.xml"
108108
],
109109
"fighter/miigunner/cmn": [
110-
"fighter/miigunner/param/hdr.prc"
110+
"fighter/miigunner/param/hdr.xml"
111111
],
112112
"fighter/falco/cmn": [
113-
"fighter/falco/param/hdr.prc"
113+
"fighter/falco/param/hdr.xml"
114114
],
115115
"fighter/ryu/cmn": [
116-
"fighter/ryu/param/hdr.prc"
116+
"fighter/ryu/param/hdr.xml"
117117
],
118118
"fighter/ken/cmn": [
119-
"fighter/ken/param/hdr.prc"
119+
"fighter/ken/param/hdr.xml"
120120
]
121121
}
122122
}

0 commit comments

Comments
 (0)