fix up doc building

ocurrent · Jan 24, 2015 · 5bb2459 · 5bb2459
1 parent ab33d8a
commit 5bb2459
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/_oasis b/_oasis
@@ -33,4 +33,4 @@ Document "api"
 
   XOCamlbuildPath:      .
   XOCamlbuildExtraArgs: "-docflags '-colorize-code -short-functors -charset utf-8'"
-  XOCamlbuildLibraries: dockerfile
+  XOCamlbuildLibraries: dockerfile,dockerfile.opam,dockerfile.opam-cmdliner
diff --git a/api.odocl b/api.odocl
@@ -1,4 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: e90cdf80532beb4cd84a1e34d4b59f7b)
+# DO NOT EDIT (digest: 6b77e32f658b6f5de5111e0210411571)
 lib/Dockerfile
+lib/Dockerfile_opam
+lib/Dockerfile_opam_cmdliner
 # OASIS_STOP
diff --git a/lib/META b/lib/META
@@ -1,14 +1,14 @@
 # OASIS_START
-# DO NOT EDIT (digest: fc8fcd5a145f29863d62a569e23df5f1)
-version = "1.0.0"
+# DO NOT EDIT (digest: 3e67533df2a94750e4cdbcad1df91cc4)
+version = "1.1.0"
 description = "OCaml interface for generating Dockerfiles"
 archive(byte) = "dockerfile.cma"
 archive(byte, plugin) = "dockerfile.cma"
 archive(native) = "dockerfile.cmxa"
 archive(native, plugin) = "dockerfile.cmxs"
 exists_if = "dockerfile.cma"
 package "opam-cmdliner" (
- version = "1.0.0"
+ version = "1.1.0"
  description = "OCaml interface for generating Dockerfiles"
  requires = "dockerfile dockerfile.opam cmdliner"
  archive(byte) = "opam-cmdliner.cma"
@@ -19,7 +19,7 @@ package "opam-cmdliner" (
 )
 
 package "opam" (
- version = "1.0.0"
+ version = "1.1.0"
  description = "OCaml interface for generating Dockerfiles"
  requires = "dockerfile"
  archive(byte) = "opam.cma"

diff --git a/mk/Makefile.github b/mk/Makefile.github
@@ -1,7 +1,7 @@
 .PHONY: gh-pages iocamljs
 
 iocamljs-depends:
-	opam pin add iocamljs-kernel git://github.com/andrewray/iocamlserver#static-site
+	opam pin add iocaml git://github.com/andrewray/iocamlserver#static-site
 	opam install iocaml
 
 gh-pages: doc iocamljs-site

diff --git a/notebooks/index.ipynb b/notebooks/index.ipynb
@@ -252,7 +252,7 @@
             }
           ],
           "input": [
-            "print_endline (string_of_t ocaml_image)"
+            "print_endline (string_of_t ocaml_ubuntu_image)"
           ],
           "metadata": {},
           "cell_type": "code",
@@ -276,4 +276,4 @@
   "metadata": { "name": "", "language": "ocaml" },
   "nbformat": 3,
   "nbformat_minor": 0
-}
+}
diff --git a/opam b/opam
@@ -1,5 +1,6 @@
 opam-version: "1.2"
 name: "dockerfile"
+version: "1.1.0"
 maintainer: "Anil Madhavapeddy <[email protected]>"
 authors: "Anil Madhavapeddy <[email protected]>"
 homepage: "https://github.com/avsm/ocaml-dockerfile"

diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 5647180c1f05cd5b370aadb10392b4af) *)
+(* DO NOT EDIT (digest: c1189f70152ef3a99fe15b7ee4669b64) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6695,7 +6695,7 @@ let setup_t =
           alpha_features = ["ocamlbuild_more_args"];
           beta_features = [];
           name = "dockerfile";
-          version = "1.0.0";
+          version = "1.1.0";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -6873,14 +6873,14 @@ let setup_t =
                    })
             ];
           plugins =
-            [(`Extra, "META", Some "0.3"); (`Extra, "DevFiles", Some "0.3")];
+            [(`Extra, "META", Some "0.4"); (`Extra, "DevFiles", Some "0.4")];
           disable_oasis_section = [];
           schema_data = PropList.Data.create ();
           plugin_data = []
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "s\130\014\031\156\137ÓÆB\024õ\158g;\0122";
+     oasis_digest = Some "\146ÆD\029ö¥õ\nCÔ\rÕPD§j";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false