Use dune beta18's modules_without_implementation

jhwoodyatt · Mar 23, 2018 · 549397c · 549397c
1 parent 3b5a9ee
commit 549397c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/.travis-ci.sh b/.travis-ci.sh
@@ -44,7 +44,7 @@ install-bootstrap () {
         #      to force a recompile.
         pin_package jbuilder --kind=version '1.0+beta18.1'
         check_pins
-        opam install ocamlfind ocamlbuild cohttp cohttp-lwt-unix 'lwt>=3.1.0' ssl cmdliner dose3 opam-file-format re 'jbuilder>=1.0+beta14' 'mccs>=1.1+4' --yes
+        opam install ocamlfind ocamlbuild cohttp cohttp-lwt-unix 'lwt>=3.1.0' ssl cmdliner dose3 opam-file-format re 'jbuilder>=1.0+beta18' 'mccs>=1.1+4' --yes
         # Allow use of ocamlfind packages in ~/local/lib
         FINDCONF=$(ocamlfind printconf conf)
         sed "s%^path=.*%path=\"$HOME/local/lib:$(opam config var lib)\"%" $FINDCONF >$FINDCONF.1

diff --git a/opam-client.opam b/opam-client.opam
@@ -23,6 +23,6 @@ depends: [
   "opam-solver" {= "2.0.0~rc"}
   "re" {>= "1.7.2"}
   "cmdliner" {>= "0.9.8"}
-  "jbuilder" {build & >= "1.0+beta17"}
+  "jbuilder" {build & >= "1.0+beta18"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/opam-devel.opam b/opam-devel.opam
@@ -22,7 +22,7 @@ build-test: [make "tests"]
 depends: [
   "opam-client" {= "2.0.0~rc"}
   "cmdliner" {>= "0.9.8"}
-  "jbuilder" {build & >= "1.0+beta17"}
+  "jbuilder" {build & >= "1.0+beta18"}
 ]
 post-messages: [
 "The development version of opam has been successfuly compiled into %{lib}%/%{name}%. You should not run it from there, please install the binaries to your PATH, e.g. with

diff --git a/opam-format.opam b/opam-format.opam
@@ -21,6 +21,6 @@ build: [
 depends: [
   "opam-core" {= "2.0.0~rc"}
   "opam-file-format" {>= "2.0.0~beta5"}
-  "jbuilder" {build & >= "1.0+beta17"}
+  "jbuilder" {build & >= "1.0+beta18"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/opam-state.opam b/opam-state.opam
@@ -20,6 +20,6 @@ build: [
 ]
 depends: [
   "opam-repository" {= "2.0.0~rc"}
-  "jbuilder" {build & >= "1.0+beta17"}
+  "jbuilder" {build & >= "1.0+beta18"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/src/format/jbuild b/src/format/jbuild
@@ -5,14 +5,8 @@
    (public_name opam-format)
    (synopsis "OCaml Package Manager file format handling library")
    (libraries (opam-core opam-file-format re))
+   (modules_without_implementation (OpamTypes))
    (flags (:standard (:include ../ocaml-flags-standard.sexp) (:include ../ocaml-context-flags.sexp)))
    (wrapped false)))
 
 (ocamllex (opamLineLexer))
-
-(rule
-  (with-stdout-to opamTypes.ml
-    (progn
-      (echo "module rec OpamTypes : sig\n")
-      (cat opamTypes.mli)
-      (echo "\nend = OpamTypes\ninclude OpamTypes\n"))))
diff --git a/src/state/jbuild b/src/state/jbuild
@@ -5,15 +5,9 @@
    (public_name opam-state)
    (libraries (opam-repository))
    (synopsis "OCaml Package Manager instance management library")
+   (modules_without_implementation (OpamStateTypes))
    (flags (:standard (:include ../ocaml-flags-standard.sexp) (:include ../ocaml-context-flags.sexp)))
    (wrapped false)))
 
 (rule
   (with-stdout-to opamScript.ml (run ocaml ${path:../../shell/crunch.ml} ${path:complete.sh} ${path:complete.zsh} ${path:prompt.sh})))
-
-(rule
-  (with-stdout-to opamStateTypes.ml
-    (progn
-      (echo "[@@@warning \"-a\"]\nmodule rec OpamStateTypes : sig\n")
-      (cat opamStateTypes.mli)
-      (echo "\nend = OpamStateTypes\ninclude OpamStateTypes\n"))))