diff --git a/.gitignore b/.gitignore index 3645a61..d30050a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /target **/*.rs.bk *.dem +!/test_data/*.dem *.svg *.data* *.iml diff --git a/codegen.nix b/codegen.nix index acb47e3..75dca41 100644 --- a/codegen.nix +++ b/codegen.nix @@ -4,7 +4,7 @@ lib, }: let inherit (lib.sources) sourceByRegex; - src = sourceByRegex ./. ["Cargo.*" "(src|benches|tests|test_data)(/.*)?"]; + src = sourceByRegex ./. ["Cargo.*" "(src|benches)(/.*)?"]; in rustPlatform.buildRustPackage { pname = "demostf-parser-codegen"; diff --git a/overlay.nix b/overlay.nix index 882603f..915c97a 100644 --- a/overlay.nix +++ b/overlay.nix @@ -2,11 +2,11 @@ final: prev: { demostf-parser = final.callPackage ./parser.nix {}; demostf-parser-codegen = final.callPackage ./codegen.nix {}; demostf-parser-codegen-events = final.runCommand "gameevent_gen.rs" {} '' - ${final.demostf-parser-codegen}/bin/generate ${./test_data/small.dem} events > $out + ${final.demostf-parser-codegen}/bin/codegen ${./test_data/short-2024.dem} events > $out ${final.rustfmt}/bin/rustfmt $out ''; demostf-parser-codegen-props = final.runCommand "sendprop_gen.rs" {} '' - ${final.demostf-parser-codegen}/bin/generate ${./test_data/small.dem} props > $out + ${final.demostf-parser-codegen}/bin/codegen ${./test_data/short-2024.dem} props > $out ${final.rustfmt}/bin/rustfmt $out ''; } diff --git a/test_data/short-2024.dem b/test_data/short-2024.dem new file mode 100644 index 0000000..8035884 Binary files /dev/null and b/test_data/short-2024.dem differ