From 429547f24b901c73517475f9abfe82c77e4f061d Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Thu, 17 Nov 2022 16:34:11 +0100 Subject: [PATCH 1/2] port to opamlib 2.1 --- bin/opam2web.ml | 4 +++- opam2web.opam | 10 ++++------ src/o2wPackage.ml | 19 +++++++++++-------- src/o2wStatistics.ml | 2 ++ src/o2wUniverse.ml | 42 +++++++++++++++++++++++++++++------------- 5 files changed, 49 insertions(+), 28 deletions(-) diff --git a/bin/opam2web.ml b/bin/opam2web.ml index ff51a72..adf8fc1 100644 --- a/bin/opam2web.ml +++ b/bin/opam2web.ml @@ -257,8 +257,10 @@ let default_cmd = let () = + OpamArg.preinit_opam_env_variables (); + OpamArg.init_opam_env_variabes OpamCLIVersion.Sourced.current; OpamFormatConfig.init (); - OpamStd.Config.init (); + OpamCoreConfig.init (); OpamRepositoryConfig.init (); OpamSolverConfig.init (); OpamStateConfig.init (); diff --git a/opam2web.opam b/opam2web.opam index 09500df..6404d15 100644 --- a/opam2web.opam +++ b/opam2web.opam @@ -13,14 +13,12 @@ depends: [ "cow" {>= "2.3.0"} "js_of_ocaml" {>= "3.3.0"} "js_of_ocaml-ppx" - "opam-core" {>= "2.0.0" & < "2.1.0~"} - "opam-format" {>= "2.0.0" & < "2.1.0~"} - "opam-state" {>= "2.0.0" & < "2.1.0~"} - "opam-client" {>= "2.0.0" & < "2.1.0~"} - "opam-file-format" {>="2.1.0" & < "2.1.1"} + "opam-core" {>= "2.1.0"} + "opam-format" {>= "2.1.0"} + "opam-state" {>= "2.1.0"} + "opam-client" {>= "2.1.0"} "cohttp-lwt-unix" "yojson" {>= "1.6.0"} - "opam-file-format" {< "2.1.1"} "cmdliner" {>= "1.0.4"} "omd" {>= "1.3.1" & < "2.0.0~"} ] diff --git a/src/o2wPackage.ml b/src/o2wPackage.ml index e5489ca..f9f4e4b 100644 --- a/src/o2wPackage.ml +++ b/src/o2wPackage.ml @@ -20,6 +20,8 @@ open O2wTypes open OpamStateTypes open OpamStd.Option.Op +module OpamPrinter = OpamPrinter.FullPos + let ( ++ ) = Html.( ++ ) let compare_alphanum = OpamPackage.compare @@ -136,10 +138,10 @@ let html_atom ~prefix st pkg (name, f) = Some (html_of_formula (function | Constraint (op, FString s) -> - Html.string (OpamPrinter.relop op) ++ + Html.string (OpamPrinter.relop_kind op) ++ Html.span ~cls:"package-version" (Html.string s) | Constraint (op, v) -> - Html.string (OpamPrinter.relop op) ++ + Html.string (OpamPrinter.relop_kind op) ++ Html.span ~cls:"label" (Html.string (OpamFilter.to_string v)) | Filter f -> Html.span ~cls:"label" (Html.string (OpamFilter.to_string f))) @@ -471,14 +473,15 @@ let to_html ~prefix univ pkg = OpamPackage.Map.mem pkg (OpamRepositoryName.Map.find r univ.st.switch_repos.repo_opams))) >>| OpamRepositoryState.get_repo univ.st.switch_repos >>= fun r -> - OpamFile.Repo.read_opt (OpamRepositoryPath.repo r.repo_root) >>= + OpamFile.Repo.read_opt + (OpamRepositoryPath.repo + (OpamRepositoryState.get_repo_root univ.st.switch_repos r)) >>= OpamFile.Repo.upstream >>= fun upstream -> - OpamFile.OPAM.metadata_dir pkg_opam >>| fun pkgdir -> + OpamFile.OPAM.metadata_dir pkg_opam >>= (function + | Some _repo_name, rel -> Some rel + | _, _ -> None) >>| fun pkg_rel -> let base = Uri.of_string upstream in - let rel = - OpamFilename.remove_prefix r.repo_root OpamFilename.Op.(pkgdir // "opam") - in - let url = Uri.(resolve "" base (of_string rel)) in + let url = Uri.(resolve "" base (of_string pkg_rel)) in let loc = Uri.to_string url in mk_tr (Some ("Edit", Html.a ~title:"Edit this package description" ~href:url diff --git a/src/o2wStatistics.ml b/src/o2wStatistics.ml index 2cecc2c..d8777c1 100644 --- a/src/o2wStatistics.ml +++ b/src/o2wStatistics.ml @@ -29,7 +29,9 @@ module FloM = let compare a b = int_of_float (a -. b) let to_string = string_of_float let to_json _ = `Null + let of_json _ = None end) +module OpamPrinter = OpamPrinter.FullPos let empty_stats = { pkg_stats = OPM.empty; diff --git a/src/o2wUniverse.ml b/src/o2wUniverse.ml index c57ff8b..85ca221 100644 --- a/src/o2wUniverse.ml +++ b/src/o2wUniverse.ml @@ -50,7 +50,7 @@ let dates universe = in let dates = List.fold_right (fun repo dates -> - let repo_def = + let _repo_def = OpamRepositoryName.Map.find repo universe.switch_repos.repositories in let command = [ @@ -59,8 +59,11 @@ let dates universe = ] in let repo_name = OpamRepositoryName.to_string repo in try - let times = OpamFilename.in_dir - (OpamFilename.dirname_dir (OpamRepositoryPath.packages_dir repo_def.repo_root)) + let times = + OpamFilename.in_dir + (OpamFilename.dirname_dir + (OpamRepositoryPath.packages_dir + (OpamRepositoryState.get_root universe.switch_repos repo))) (fun () -> OpamSystem.read_command_output command) in parse_git_commit_times dates times @@ -195,25 +198,38 @@ let load_opam_state repo_roots = repo_roots in let repositories = - List.fold_left (fun acc (repo_name, repo_root) -> - let repo = OpamRepositoryBackend.local repo_root in - OpamRepositoryName.Map.add repo_name { repo with repo_name } acc) + List.fold_left (fun map (repo_name, _) -> + let repo = OpamTypes.{ + repo_name; repo_url = OpamUrl.empty; repo_trust = None + } in + OpamRepositoryName.Map.add repo_name repo map) OpamRepositoryName.Map.empty repo_roots in let repos_definitions = - OpamRepositoryName.Map.map (fun r -> - OpamFile.Repo.safe_read (OpamRepositoryPath.repo r.repo_root)) - repositories + List.fold_left (fun map (repo_name, repo_root) -> + OpamRepositoryName.Map.add repo_name + (OpamFile.Repo.safe_read (OpamRepositoryPath.repo repo_root)) + map) + OpamRepositoryName.Map.empty repo_roots in let repo_opams = - OpamRepositoryName.Map.map (fun r -> - OpamRepositoryState.load_repo_opams r) - repositories + List.fold_left (fun map (repo_name, repo_root) -> + OpamRepositoryName.Map.add repo_name + (OpamRepositoryState.load_opams_from_dir repo_name repo_root) + map) + OpamRepositoryName.Map.empty repo_roots + in + let repos_tmp = + let repos_tmp = Hashtbl.create 2 in + List.iter (fun (repo_name, repo_root) -> + Hashtbl.add repos_tmp repo_name (lazy repo_root)) + repo_roots; + repos_tmp in let rt = { repos_global = gt; repos_lock = OpamSystem.lock_none; - repositories; repos_definitions; repo_opams; + repositories; repos_definitions; repo_opams; repos_tmp; } in OpamSwitchState.load_virtual ~repos_list:(fst (List.split repo_roots)) gt rt From 6b36e9761d62aeade4c326b82e105c2aa81e8d09 Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Thu, 17 Nov 2022 16:57:59 +0100 Subject: [PATCH 2/2] use correct opam wording --- README.md | 8 ++++---- bin/opam2web.ml | 2 +- opam2web.opam | 4 ++-- src/js_search/search.ml | 2 +- src/o2wBlog.ml | 2 +- src/o2wBlog.mli | 2 +- src/o2wDocumentation.ml | 2 +- src/o2wDocumentation.mli | 2 +- src/o2wGlobals.ml | 2 +- src/o2wGlobals.mli | 2 +- src/o2wHome.ml | 4 ++-- src/o2wHome.mli | 2 +- src/o2wJson.ml | 2 +- src/o2wJson.mli | 2 +- src/o2wMisc.ml | 2 +- src/o2wMisc.mli | 2 +- src/o2wPackage.ml | 2 +- src/o2wPackage.mli | 2 +- src/o2wStatistics.ml | 2 +- src/o2wStatistics.mli | 2 +- src/o2wTemplate.ml | 2 +- src/o2wTemplate.mli | 2 +- src/o2wTypes.mli | 4 ++-- src/o2wUniverse.ml | 2 +- src/o2wUniverse.mli | 2 +- src/opamfUniverse.ml | 2 +- src/opamfUniverse.mli | 2 +- src/template.ml | 2 +- src/template.mli | 2 +- 29 files changed, 35 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 8bc2b87..7393738 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ opam2web ======== -A tool to generate a website from an OPAM universe +A tool to generate a website from an opam universe -This utility creates a static website from an OPAM universe, listing all -available packages and their details. A homepage and OPAM documentation is +This utility creates a static website from an opam universe, listing all +available packages and their details. A homepage and opam documentation is included as well. The latest release of opam2web is available via @@ -112,7 +112,7 @@ opam2web --help opam2web -o website path:~/myrepo local:default ``` will generate the HTML files corresponding to the repository located in -`~/myrepo` and the remote named `default` in the local OPAM installation. +`~/myrepo` and the remote named `default` in the local opam installation. Resulting files will be located in the `website` directory. diff --git a/bin/opam2web.ml b/bin/opam2web.ml index adf8fc1..15278a3 100644 --- a/bin/opam2web.ml +++ b/bin/opam2web.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/opam2web.opam b/opam2web.opam index 6404d15..c46c1e4 100644 --- a/opam2web.opam +++ b/opam2web.opam @@ -30,7 +30,7 @@ build: [ dev-repo: "git+https://github.com/ocaml/opam2web.git" synopsis: "Tool to generate the opam.ocaml.org website" description: """ -This utility creates a static website from an OPAM universe, listing all -available packages and their details. A homepage and OPAM documentation is +This utility creates a static website from an opam universe, listing all +available packages and their details. A homepage and opam documentation is included as well. """ diff --git a/src/js_search/search.ml b/src/js_search/search.ml index 3ddefcf..e483db5 100644 --- a/src/js_search/search.ml +++ b/src/js_search/search.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wBlog.ml b/src/o2wBlog.ml index 441247a..33ee17b 100644 --- a/src/o2wBlog.ml +++ b/src/o2wBlog.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wBlog.mli b/src/o2wBlog.mli index 253abca..c371c90 100644 --- a/src/o2wBlog.mli +++ b/src/o2wBlog.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wDocumentation.ml b/src/o2wDocumentation.ml index 11e41da..4c57035 100644 --- a/src/o2wDocumentation.ml +++ b/src/o2wDocumentation.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wDocumentation.mli b/src/o2wDocumentation.mli index 7a7c4b5..3a7572b 100644 --- a/src/o2wDocumentation.mli +++ b/src/o2wDocumentation.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wGlobals.ml b/src/o2wGlobals.ml index b30e966..592a1a1 100644 --- a/src/o2wGlobals.ml +++ b/src/o2wGlobals.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wGlobals.mli b/src/o2wGlobals.mli index 9ca026d..17bee73 100644 --- a/src/o2wGlobals.mli +++ b/src/o2wGlobals.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wHome.ml b/src/o2wHome.ml index b65efb7..e72917b 100644 --- a/src/o2wHome.ml +++ b/src/o2wHome.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) @@ -43,7 +43,7 @@ let make_datasets universe = let nb_packages = OpamPackage.Set.cardinal latest_packages in { nb_packages; last10_updates; top10_pkgs } -(* OPAM website homepage *) +(* Opam website homepage *) let to_html ~content_dir ~news ?statistics ds = let updates_last10 = let mk_update_li (pkg, update_tm) = diff --git a/src/o2wHome.mli b/src/o2wHome.mli index 92e9466..061eae1 100644 --- a/src/o2wHome.mli +++ b/src/o2wHome.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wJson.ml b/src/o2wJson.ml index 645d16a..e7a7e8e 100644 --- a/src/o2wJson.ml +++ b/src/o2wJson.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wJson.mli b/src/o2wJson.mli index d7385a8..381d7aa 100644 --- a/src/o2wJson.mli +++ b/src/o2wJson.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wMisc.ml b/src/o2wMisc.ml index 8da878b..3e050b7 100644 --- a/src/o2wMisc.ml +++ b/src/o2wMisc.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wMisc.mli b/src/o2wMisc.mli index 96dd31d..5051da4 100644 --- a/src/o2wMisc.mli +++ b/src/o2wMisc.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wPackage.ml b/src/o2wPackage.ml index f9f4e4b..4d41a94 100644 --- a/src/o2wPackage.ml +++ b/src/o2wPackage.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wPackage.mli b/src/o2wPackage.mli index 8952ecf..1c3a45e 100644 --- a/src/o2wPackage.mli +++ b/src/o2wPackage.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wStatistics.ml b/src/o2wStatistics.ml index d8777c1..518444d 100644 --- a/src/o2wStatistics.ml +++ b/src/o2wStatistics.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wStatistics.mli b/src/o2wStatistics.mli index 3a5d11b..8c92e35 100644 --- a/src/o2wStatistics.mli +++ b/src/o2wStatistics.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wTemplate.ml b/src/o2wTemplate.ml index 291bda3..684d6de 100644 --- a/src/o2wTemplate.ml +++ b/src/o2wTemplate.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wTemplate.mli b/src/o2wTemplate.mli index 61d20b5..133cc3f 100644 --- a/src/o2wTemplate.mli +++ b/src/o2wTemplate.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wTypes.mli b/src/o2wTypes.mli index cc5e01d..74c16a7 100644 --- a/src/o2wTypes.mli +++ b/src/o2wTypes.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) @@ -112,7 +112,7 @@ type log_referrer = | Internal_ref of string | No_ref -(** A high-level, OPAM-repository specific type for a apache log entry *) +(** A high-level, opam-repository specific type for a apache log entry *) type log_entry = { log_timestamp: float; log_host: string; diff --git a/src/o2wUniverse.ml b/src/o2wUniverse.ml index 85ca221..b2c1fb9 100644 --- a/src/o2wUniverse.ml +++ b/src/o2wUniverse.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/o2wUniverse.mli b/src/o2wUniverse.mli index b8905f6..3256ac4 100644 --- a/src/o2wUniverse.mli +++ b/src/o2wUniverse.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/opamfUniverse.ml b/src/opamfUniverse.ml index 3ee3fa3..d5fedfb 100644 --- a/src/opamfUniverse.ml +++ b/src/opamfUniverse.ml @@ -8,7 +8,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/opamfUniverse.mli b/src/opamfUniverse.mli index 5e1fefd..f6fcef6 100644 --- a/src/opamfUniverse.mli +++ b/src/opamfUniverse.mli @@ -8,7 +8,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/template.ml b/src/template.ml index bcf6a32..a6d0108 100644 --- a/src/template.ml +++ b/src/template.ml @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *) diff --git a/src/template.mli b/src/template.mli index 9c6a686..a67d1de 100644 --- a/src/template.mli +++ b/src/template.mli @@ -7,7 +7,7 @@ (* GNU Lesser General Public License version 3.0 with linking *) (* exception. *) (* *) -(* OPAM is distributed in the hope that it will be useful, but WITHOUT *) +(* Opam is distributed in the hope that it will be useful, but WITHOUT *) (* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *) (* or FITNESS FOR A PARTICULAR PURPOSE.See the GNU General Public *) (* License for more details. *)