Bugfix: Dune 2.x proofing (onivim#1443)

* point to the right install files * Dependency: dune -> ^2.0.0
leavengood · Mar 8, 2020 · 39b8de1 · 39b8de1
1 parent 843c0c2
commit 39b8de1
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
diff --git a/bench.json b/bench.json
@@ -9,8 +9,8 @@
         "reperf": "^1.3.0"
       },
       "install": [
-          "esy-installer Oni2.install",
-          "esy-installer OniBench.install"
+          "esy-installer #{self.target_dir}/default/Oni2.install",
+          "esy-installer #{self.target_dir}/default/OniBench.install"
       ]
   }
 }
diff --git a/esy.lock/index.json b/esy.lock/index.json
diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json
diff --git a/integrationtest.json b/integrationtest.json
@@ -6,8 +6,8 @@
   "override": {
       "build": ["dune build -p Oni2,OniIntegrationTests -j4"],
       "install": [
-          "esy-installer Oni2.install",
-          "esy-installer OniIntegrationTests.install"
+          "esy-installer #{self.target_dir}/default/Oni2.install",
+          "esy-installer #{self.target_dir}/default/OniIntegrationTests.install"
       ]
   }
 }
diff --git a/package.json b/package.json
@@ -194,7 +194,7 @@
     "@esy-ocaml/reason": "3.5.2",
     "@opam/camomile": "^1.0.1",
     "@opam/charInfo_width": "*",
-    "@opam/dune": "*",
+    "@opam/dune": "^2.0.0",
     "@opam/lwt": "*",
     "@opam/ocamlbuild": "*",
     "@opam/ppx_deriving": "*",

diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json
diff --git a/test.json b/test.json
@@ -13,8 +13,8 @@
         "@reason-native/rely": "1.3.1"
       },
       "install": [
-          "esy-installer Oni2.install",
-          "esy-installer OniUnitTestRunner.install"
+          "esy-installer #{self.target_dir}/default/Oni2.install",
+          "esy-installer #{self.target_dir}/default/OniUnitTestRunner.install"
       ]
   }
 }