Remove refmterr from direct dependencies and add buildDev rules

revery-ui · Apr 12, 2020 · ea7a60a · ea7a60a
1 parent 2f6c18e
commit ea7a60a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 54 deletions.
diff --git a/bin_js/dune b/bin_js/dune
@@ -10,7 +10,6 @@
         bigarray
         sdl2
         sdl2example
-        console.lib
             ))
 
 (install

diff --git a/example.json b/example.json
@@ -4,23 +4,16 @@
       "run": "esy '@example' x test_sdl2"
   },
   "override": {
-      "build": [
-        [
-          "dune",
-          "build",
-          "-p",
-	  "sdl2,sdl2-example",
-          "-j4"
-        ]
-      ],
+      "build": "dune build -p sdl2,sdl2-example -j4",
+      "buildDev": "refmterr dune build --promote-install-files --root . --only-package sdl2,sdl2-example -j4",
       "install": [
         "esy-installer sdl2.install",
         "esy-installer sdl2-example.install",
         "bash -c \"#{os == 'windows' ? 'cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll \\'$cur__bin\\'': ':'}\"",
         "bash -c \"cp #{esy-sdl2.bin}/*.dll \\'$cur__bin\\' #{os == 'windows' ? '' : '2>/dev/null || true'}\""
       ],
       "dependencies": {
-        "@reason-native/console": "*"
+        "@reason-native/console": "^0.1.0"
       }
   }
 }
diff --git a/js.json b/js.json
@@ -4,31 +4,19 @@
       "run": "esy '@js' x bash -c 'http-server #{self.bin}'"
   },
   "override": {
-      "build": [
-        [
-          "dune",
-          "build",
-          "--root",
-          "."
-        ],
-        [
-          "dune",
-          "build",
-          "--root",
-          ".",
-          "./bin_js/test_sdl2.bc.js"
-        ]
-      ],
-      "install": [
-        "esy-installer sdl2.install",
-        "esy-installer sdl2-example.install"
-      ],
-      "dependencies": {
-        "@opam/js_of_ocaml": "*",
-        "@opam/js_of_ocaml-compiler": "*",
-        "@opam/js_of_ocaml-lwt": "*",
-        "http-server": "*",
-        "@opam/merlin-extend": "0.4"
-      }
-  }
+    "build": "dune build -p sdl2,sdl2-js",
+    "buildDev": "refmterr dune build --promote-install-files --root . --only-package sdl2,sdl2-js",
+    "install": [
+      "esy-installer sdl2.install", "esy-installer sdl2-js.install"
+    ],
+    "dependencies": {
+      "@opam/js_of_ocaml": "*",
+      "@opam/js_of_ocaml-compiler": "*",
+      "@opam/js_of_ocaml-lwt": "*",
+      "http-server": "*",
+      "@opam/lwt_ppx": "^2.0.0",
+      "@opam/merlin-extend": "0.4"
+    }
+  },
+  "dependencies": { "@reason-native/console": "^0.1.0" }
 }
diff --git a/package.json b/package.json
@@ -9,28 +9,18 @@
     "build:byte": "esy '@example' b dune build bin_native/test_sdl2.bc"
   },
   "esy": {
-    "build": [
-      [
-        "dune",
-        "build",
-        "-p",
-        "sdl2"
-      ]
-    ],
-    "install": [
-      "esy-installer sdl2.install"
-    ]
+    "build": "dune build -p sdl2",
+    "buildiDev": "refmterr dune build --root . --only-package sdl2"
   },
   "dependencies": {
-    "@opam/dune": "^1.7.3",
-    "@opam/dune-configurator": "*",
     "@esy-ocaml/reason": "^3.3.7",
-    "refmterr": "^3.1.0",
+    "@opam/dune": ">=1.6 <2.1",
+    "@opam/dune-configurator": "*",
     "esy-sdl2": "^2.0.10006",
-    "esy-cmake": "^0.3.4"
+    "ocaml": ">=4.6.0 <4.11.0"
   },
   "devDependencies": {
-    "ocaml": ">=4.6.0 <4.9.0",
+    "refmterr": "^3.1.0",
     "@opam/ocaml-lsp-server": "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#04733ed"
   }
 }