Merge branch 'master' into add-windows-ci

f-f · Oct 14, 2018 · 74c4737 · 74c4737
2 parents 9b1fa99 + e4f7a79
commit 74c4737
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/project.clj b/project.clj
@@ -24,7 +24,9 @@
                  [f-f/instaparse "1.4.9-patch-alt"]]
   :plugins [[lein-shell "0.5.0"]
             [lein-cloverage "1.0.13" :exclusions [instaparse]]]
-  :prep-tasks [["shell" "cp" "dhall-lang/standard/dhall.abnf" "resources/"] "javac" "compile"]
+  :prep-tasks [["shell" "scripts/copy-abnf"] "javac" "compile"]
+  :shell {:commands {"scripts/copy-abnf"
+                     {:windows ["cmd" "/c" "scripts\\\\copy-abnf"]}}}
   :profiles {:dev {:dependencies [[org.clojure/test.check "0.10.0-alpha2"]]
                    :plugins [[com.jakemccrary/lein-test-refresh "0.22.0"]]}
              :uberjar {:aot :all}}

diff --git a/scripts/copy-abnf b/scripts/copy-abnf
@@ -0,0 +1 @@
+cp dhall-lang/standard/dhall.abnf resources/
diff --git a/scripts/copy-abnf.cmd b/scripts/copy-abnf.cmd
@@ -0,0 +1 @@
+copy dhall-lang\standard\dhall.abnf resources\