From 6aca5b671f29a14ff7e06c81e8f765168287410c Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 30 May 2020 14:01:42 +0100 Subject: [PATCH] Use dhall.abnf directly instead of via symlink Because windows doesn't support symlinks properly --- dhall/build.rs | 4 ++-- dhall/src/syntax/text/dhall.abnf | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 120000 dhall/src/syntax/text/dhall.abnf diff --git a/dhall/build.rs b/dhall/build.rs index 7ca4f218..71c634b9 100644 --- a/dhall/build.rs +++ b/dhall/build.rs @@ -157,7 +157,7 @@ fn make_test_module( } fn generate_tests() -> std::io::Result<()> { - // To force regeneration of the test list, `touch dhall-lang/standard/dhall.abnf` + // To force regeneration of the test list, `touch dhall/build.rs` let out_dir = env::var("OUT_DIR").unwrap(); let parser_tests_path = Path::new(&out_dir).join("spec_tests.rs"); @@ -348,7 +348,7 @@ fn generate_tests() -> std::io::Result<()> { fn convert_abnf_to_pest() -> std::io::Result<()> { let out_dir = env::var("OUT_DIR").unwrap(); - let abnf_path = "src/syntax/text/dhall.abnf"; + let abnf_path = "../dhall-lang/standard/dhall.abnf"; let visibility_path = "src/syntax/text/dhall.pest.visibility"; let grammar_path = Path::new(&out_dir).join("dhall.pest"); println!("cargo:rerun-if-changed={}", abnf_path); diff --git a/dhall/src/syntax/text/dhall.abnf b/dhall/src/syntax/text/dhall.abnf deleted file mode 120000 index 4a95034e..00000000 --- a/dhall/src/syntax/text/dhall.abnf +++ /dev/null @@ -1 +0,0 @@ -../../../../dhall-lang/standard/dhall.abnf \ No newline at end of file