From 6e2fdd4468582b964988fe80a87b4a9ebffce8ec Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Tue, 24 Dec 2024 12:04:08 +0900 Subject: [PATCH] Update dune to 3.17 Signed-off-by: Sora Morimoto --- dune | 4 +++ dune-project | 35 +++++++++++++++++++++- ocsigenserver.opam | 58 ++++++++++++++++++------------------- ocsigenserver.opam.template | 33 +++++++++++++++++++++ 4 files changed, 100 insertions(+), 30 deletions(-) create mode 100644 dune create mode 100644 ocsigenserver.opam.template diff --git a/dune b/dune new file mode 100644 index 000000000..f749468dd --- /dev/null +++ b/dune @@ -0,0 +1,4 @@ +(env + (_ + (flags + (:standard -w -69)))) diff --git a/dune-project b/dune-project index 96db75ac0..46399983b 100644 --- a/dune-project +++ b/dune-project @@ -1,2 +1,35 @@ -(lang dune 2.7) +(lang dune 3.17) (name ocsigenserver) +(version 6.0.0) + +(generate_opam_files true) + +(license "LGPL-2.1-only WITH OCaml-LGPL-linking-exception") +(authors "Ocsigen team ") +(maintainers "Ocsigen team ") +(source (github ocsigen/ocsigenserver)) +(homepage "http://ocsigen.org/ocsigenserver") + +(package + (name ocsigenserver) + (synopsis "A full-featured and extensible Web server") + (description + "Ocsigen Server is a Web Server that can be used either as a library for OCaml or as an executable (taking its configuration from a file). It has a very powerful extension mechanism that makes it very easy to plug your own OCaml modules for generating pages. Many extensions are already implemented, like a reverse proxy, content compression, access control, authentication, etc.") + (depends + (ocaml (>= 4.08.1)) + (camlzip (>= 1.04)) + (cohttp-lwt-unix (and (>= 5.0) (< 6.0))) + (conduit-lwt-unix (and (>= 2.0) (< 7.0))) + cryptokit + (ipaddr (>= 2.1)) + (lwt (>= 3.0)) + lwt_log + lwt_react + lwt_ssl + ocamlfind + (re (>= 1.11)) + react + (ssl (>= 0.5.8)) + xml-light) + (conflicts + (pgocaml (< 2.2)))) diff --git a/ocsigenserver.opam b/ocsigenserver.opam index b5c112cb3..14db6226f 100644 --- a/ocsigenserver.opam +++ b/ocsigenserver.opam @@ -1,13 +1,36 @@ +# This file is generated by dune, edit dune-project instead opam-version: "2.0" -name: "ocsigenserver" version: "6.0.0" -maintainer: "dev@ocsigen.org" synopsis: "A full-featured and extensible Web server" -description: "Ocsigen Server is a Web Server that can be used either as a library for OCaml or as an executable (taking its configuration from a file). It has a very powerful extension mechanism that makes it very easy to plug your own OCaml modules for generating pages. Many extensions are already implemented, like a reverse proxy, content compression, access control, authentication, etc." -authors: "dev@ocsigen.org" -homepage: "http://ocsigen.org/ocsigenserver/" -bug-reports: "https://github.com/ocsigen/ocsigenserver/issues/" +description: + "Ocsigen Server is a Web Server that can be used either as a library for OCaml or as an executable (taking its configuration from a file). It has a very powerful extension mechanism that makes it very easy to plug your own OCaml modules for generating pages. Many extensions are already implemented, like a reverse proxy, content compression, access control, authentication, etc." +maintainer: ["Ocsigen team "] +authors: ["Ocsigen team "] license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" +homepage: "http://ocsigen.org/ocsigenserver" +bug-reports: "https://github.com/ocsigen/ocsigenserver/issues" +depends: [ + "dune" {>= "3.17"} + "ocaml" {>= "4.08.1"} + "camlzip" {>= "1.04"} + "cohttp-lwt-unix" {>= "5.0" & < "6.0"} + "conduit-lwt-unix" {>= "2.0" & < "7.0"} + "cryptokit" + "ipaddr" {>= "2.1"} + "lwt" {>= "3.0"} + "lwt_log" + "lwt_react" + "lwt_ssl" + "ocamlfind" + "re" {>= "1.11"} + "react" + "ssl" {>= "0.5.8"} + "xml-light" + "odoc" {with-doc} +] +conflicts: [ + "pgocaml" {< "2.2"} +] dev-repo: "git+https://github.com/ocsigen/ocsigenserver.git" build: [ [ @@ -42,26 +65,3 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] install:[make "install.files"] -depends: [ - "ocaml" {>= "4.08.1"} - "dune" {>= "2.7"} - "ocamlfind" - "base-unix" - "base-threads" - "react" - "ssl" {>= "0.5.8"} - "lwt" {>= "3.0.0"} - "lwt_ssl" - "lwt_react" - "lwt_log" - "re" {>= "1.11.0"} - "cryptokit" - "ipaddr" {>= "2.1"} - "cohttp-lwt-unix" {>= "5.0.0" & < "6.0"} - "conduit-lwt-unix" {>= "2.0.0" & < "7.0"} - "xml-light" - "camlzip" {>= "1.04"} -] -conflicts: [ - "pgocaml" {< "2.2"} -] diff --git a/ocsigenserver.opam.template b/ocsigenserver.opam.template new file mode 100644 index 000000000..09d8559d2 --- /dev/null +++ b/ocsigenserver.opam.template @@ -0,0 +1,33 @@ +build: [ + [ + "sh" + "configure" + "--prefix" + "%{prefix}%" + "--ocsigen-user" + "%{user}%" + "--ocsigen-group" + "%{group}%" + "--commandpipe" + "%{lib}%/ocsigenserver/var/run/ocsigenserver_command" + "--logdir" + "%{lib}%/ocsigenserver/var/log/ocsigenserver" + "--mandir" + "%{man}%/man1" + "--docdir" + "%{lib}%/ocsigenserver/share/doc/ocsigenserver" + "--commandpipe" + "%{lib}%/ocsigenserver/var/run/ocsigenserver_command" + "--staticpagesdir" + "%{lib}%/ocsigenserver/var/www" + "--datadir" + "%{lib}%/ocsigenserver/var/lib/ocsigenserver" + "--temproot" + "" + "--sysconfdir" + "%{lib}%/ocsigenserver/etc/ocsigenserver" + ] + [make "-C" "src" "confs"] + ["dune" "build" "-p" name "-j" jobs] +] +install:[make "install.files"]