From 5408978c2ed5ffb4da885f742cd808bc0b518021 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Thu, 28 Mar 2019 17:18:25 +0100
Subject: [dune] Fix shim quoting and add coqc wrapper.

The quoting was incorrect thus scripts didn't properly work.
---
 dev/shim/dune | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'dev')

diff --git a/dev/shim/dune b/dev/shim/dune
index 39b4ef492c..e307848292 100644
--- a/dev/shim/dune
+++ b/dev/shim/dune
@@ -7,7 +7,19 @@
   (with-outputs-to coqtop-prelude
    (progn
     (echo "#!/usr/bin/env bash\n")
-    (bash "echo \"$(pwd)/%{bin:coqtop} -coqlib $(pwd)/%{project_root}\" \"$@\"")
+    (bash "echo \"$(pwd)/%{bin:coqtop} -coqlib $(pwd)/%{project_root}\" \\$@")
+    (run chmod +x %{targets})))))
+
+(rule
+ (targets coqc-prelude)
+ (deps
+  %{bin:coqc}
+  %{project_root}/theories/Init/Prelude.vo)
+ (action
+  (with-outputs-to coqc-prelude
+   (progn
+    (echo "#!/usr/bin/env bash\n")
+    (bash "echo \"$(pwd)/%{bin:coqc} -coqlib $(pwd)/%{project_root}\" \\$@")
     (run chmod +x %{targets})))))
 
 (rule
@@ -20,7 +32,7 @@
   (with-outputs-to %{targets}
    (progn
     (echo "#!/usr/bin/env bash\n")
-    (bash "echo \"$(pwd)/%{bin:coqtop.byte} -coqlib $(pwd)/%{project_root}\" \"$@\"")
+    (bash "echo \"$(pwd)/%{bin:coqtop.byte} -coqlib $(pwd)/%{project_root}\" \\$@")
     (run chmod +x %{targets})))))
 
 (rule
@@ -36,5 +48,5 @@
   (with-outputs-to coqide-prelude
    (progn
     (echo "#!/usr/bin/env bash\n")
-    (bash "echo \"$(pwd)/%{bin:coqide} -coqlib $(pwd)/%{project_root}\" \"$@\"")
+    (bash "echo \"$(pwd)/%{bin:coqide} -coqlib $(pwd)/%{project_root}\" \\$@")
     (run chmod +x %{targets})))))
-- 
cgit v1.2.3