CHANGES.md

+v1.0.1 2019-07-19 Zagreb
+------------------------
+
+- Require OCaml 4.03 and handle various stdlib deprecations.
+- Drop `result` dependency.
+- Fix an upcoming `Fmt` incompability.
+- Addition of `synopsis` and `description` fields to the
+  opam file generated for the tarball.
+
+v1.0.0 2018-10-14 Zagreb
+------------------------
+
+- Support (only) for opam-publish v2.0.0. The `--pkg-opam-dir` option
+  of `topkg opam` to indicate the old-style opam package directory to
+  submit is renamed to `--opam-publish-file` to indicate the opam file
+  to submit.
+- Add `topkg opam publish` command, alias of `topkg opam submit`.
+- Toy github delegate: make curl follow redirects. Before obscure
+  failures would result when repos got moved around (#120). Thanks
+  to Richard Mortier for the report.
+- Fix infinite loop in `Topkg.OS.File.write_subst`. This could result
+  in `topkg distrib` never finishing (#128). Thanks to Christophe
+  Troestler for reporting and Jérémie Dimino for the patch.
+- Add `.ps` and `.eps` files to default watermarking excludes.
+  Thanks Christophe Troestler for the suggestion (#128).
+- Use `command -v` rather than `type` to check for tool existence.
+  Thanks to Hannes Mehnert for the patch.
+
+v0.9.1 2017-10-16 Zagreb
+------------------------
+
+- Make `topkg build` return a non-zero exit code when the build
+  fails. Thanks to Etienne Millon for the patch.
+- Improve `topkg doc` for `jbuilder` users. Thanks to Thomas
+  Gazagnaire for the patch.
+- `ocamlbuild` users: default to parallel builds. This can
+  be controlled via the `--jobs` command line argument. Thanks
+  to Edwin Török for the patch.
+
 v0.9.0 La Forclaz (VS)
 ----------------------
 

README.md

 Topkg — The transitory OCaml software packager
 -------------------------------------------------------------------------------
-v0.9.0
+v1.0.1
 
 Topkg is a packager for distributing OCaml software. It provides an
 API to describe the files a package installs in a given build
@@ -27,7 +27,6 @@ Topkg-care is distributed under the ISC license it depends on
 [webbrowser]: http://erratique.ch/software/webbrowser
 
 Home page: http://erratique.ch/software/topkg  
-Contact: Daniel Bünzli `<daniel.buenzl i@erratique.ch>`
 
 ## Installation
 

_tags

-true : bin_annot, safe_string, package(bytes result)
+true : bin_annot, safe_string
 
 <src> : include
 

pkg/META

 description = "The transitory OCaml software packager"
-version = "0.9.0"
-requires = "bytes result"
+version = "1.0.1"
+requires = ""
 archive(byte) = "topkg.cma"
 archive(native) = "topkg.cmxa"
 plugin(byte) = "topkg.cma"
@@ -9,7 +9,7 @@ plugin(native) = "topkg.cmxs"
 package "care" (
   directory = "../topkg-care"
   description = "Topkg package care tools"
-  version = "0.9.0"
+  version = "1.0.1"
   requires = "topkg opam-format cmdliner bos.setup"
   archive(byte) = "topkg_care.cma"
   archive(native) = "topkg_care.cmxa"

pkg/pkg.ml

@@ -2,8 +2,6 @@
 #use "topfind"
 
 (* Bootstrap from source, note #mod_use is 4.01 *)
-#require "bytes"
-#require "result"
 #directory "src"
 #mod_use "topkg_result.ml"
 #mod_use "topkg_string.ml"
@@ -12,9 +10,9 @@
 #mod_use "topkg_cmd.ml"
 #mod_use "topkg_os.ml"
 #mod_use "topkg_vcs.ml"
+#mod_use "topkg_codec.ml"
 #mod_use "topkg_conf.ml"
 #mod_use "topkg_fexts.ml"
-#mod_use "topkg_codec.ml"
 #mod_use "topkg_opam.ml"
 #mod_use "topkg_test.ml"
 #mod_use "topkg_install.ml"

src-bin/bistro.ml

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 open Bos_setup

src-bin/bistro.mli

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 (** The [bistro] command. *)

src-bin/browse.ml

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 open Bos_setup

src-bin/browse.mli

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 (** The [browse] command. *)

src-bin/build.ml

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 open Bos_setup

src-bin/build.mli

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 (** The [build] command. *)

src-bin/clean.ml

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 open Bos_setup

src-bin/clean.mli

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 (** The [clean] command. *)

src-bin/cli.ml

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 open Bos_setup
@@ -122,7 +122,7 @@ let setup style_renderer log_level cwd =
   Topkg.Log.set_level (logs_to_topkg_log_level log_level);
   Logs.set_level log_level;
   Logs.set_reporter (Logs_fmt.reporter ~app:Fmt.stdout ());
-  Logs.info (fun m -> m "topkg v0.9.0 running");
+  Logs.info (fun m -> m "topkg v1.0.1 running");
   match cwd with
   | None -> `Ok ()
   | Some dir ->

src-bin/cli.mli

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 (** {!Cmdliner} and common definitions for commands. *)

src-bin/distrib.ml

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 open Bos_setup

src-bin/distrib.mli

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 (** The [distrib] command. *)

src-bin/doc.ml

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 open Bos_setup
@@ -24,6 +24,9 @@ let copy_assets src_dir dst_dir =
       |> Logs.on_error_msg ~use:(fun () -> ())
   | _ -> ()
   in
+  OS.Dir.exists src_dir >>= function
+  | false -> Ok ()
+  | true  ->
       OS.Dir.contents src_dir
       >>= fun files -> List.iter (copy_asset dst_dir) files; Ok ()
 
@@ -52,8 +55,7 @@ let build_doc pkg pkg_name build_dir dev =
   let out = OS.Cmd.to_stdout in
   let doc_dir = Fpath.v "doc" in
   let odocl = Fpath.(doc_dir / (if dev then "dev.odocl" else "api.odocl")) in
-  OS.File.must_exist odocl
-  >>= fun _ -> Ok Fpath.(set_ext ".docdir" odocl / "index.html")
+  Ok Fpath.(set_ext ".docdir" odocl / "index.html")
   >>= fun target -> Ok (doc_build_args pkg_name build_dir dev target)
   >>= fun args -> OS.Dir.current ()
   >>= fun dir -> Topkg_care.Pkg.build pkg ~dir ~args ~out

src-bin/doc.mli

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 (** The [doc] command. *)

src-bin/help.ml

 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli. All rights reserved.
    Distributed under the ISC license, see terms at the end of the file.
-   topkg v0.9.0
+   topkg v1.0.1
   ---------------------------------------------------------------------------*)
 
 let topkg_manual = "Topkg manual"
-let version = "v0.9.0"
+let version = "v1.0.1"
 
 (* Help manuals *)
 
@@ -115,7 +115,7 @@ topkg log commit";
         opam package description in the build directory with:";
     `Pre "topkg opam pkg";
     `P "then simply submit it to the opam repository with:";
-    `Pre "topkg opam publish";
+    `Pre "topkg opam submit";
     `P "The latter does nothing more than invoking opam-publish-submit(1) on
         the package description generated earlier.";
     `P "Congratulations. You are done. Ditch your computer.";