From b6fc71977aa901db9a8b7f56d8048b3174bdb391 Mon Sep 17 00:00:00 2001 From: Thibaut Mattio Date: Fri, 4 Jun 2021 16:27:16 +0200 Subject: [PATCH] Split the opam plugin in an Generate OCaml projects. Usage: spin COMMAND Available Commands: config Update the current user's configuration ls List the official templates new Generate a new project from a template Useful options: --help Show manual page --v, --verbose Increase verbosity --version Show spin version For a complete documentation, refer to the manual with `spin --help`. Use `spin COMMAND --help` for help on a single command. package. --- CHANGES.md | 6 ++++++ bin/dune | 2 ++ dune-project | 11 +++++++++++ opam-spin.opam | 32 ++++++++++++++++++++++++++++++++ opam-spin.opam.template | 1 + spin.opam | 4 ++-- spin.opam.template | 14 -------------- 7 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 opam-spin.opam create mode 100644 opam-spin.opam.template delete mode 100644 spin.opam.template diff --git a/CHANGES.md b/CHANGES.md index 5585a1a..9894ef0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +# 0.8.1 + +## Changed + +- Split the opam plugin in an `opam-spin` package. + # 0.8.0 ## Added diff --git a/bin/dune b/bin/dune index 1880ac1..a27b71f 100644 --- a/bin/dune +++ b/bin/dune @@ -1,6 +1,7 @@ (executable (name main) (public_name spin) + (package spin) (libraries spin spin_std cmdliner fmt fmt.tty logs.fmt logs.cli) (flags (:standard -open Spin_std))) @@ -9,5 +10,6 @@ (install (section bin) + (package opam-spin) (files (main.exe as opam-spin))) diff --git a/dune-project b/dune-project index 6cb86fd..462fecb 100644 --- a/dune-project +++ b/dune-project @@ -43,3 +43,14 @@ fpath cmdliner logs)) + +(package + (name opam-spin) + (synopsis "Opam plugin for Spin, the OCaml project generator") + (description "Opam plugin for Spin, the OCaml project generator") + (depends + (ocaml + (>= 4.10.0)) + dune + (spin + (= :version)))) diff --git a/opam-spin.opam b/opam-spin.opam new file mode 100644 index 0000000..4d6e805 --- /dev/null +++ b/opam-spin.opam @@ -0,0 +1,32 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Opam plugin for Spin, the OCaml project generator" +description: "Opam plugin for Spin, the OCaml project generator" +maintainer: ["Thibaut Mattio"] +authors: ["Thibaut Mattio"] +license: "ISC" +homepage: "https://github.com/tmattio/spin" +doc: "https://tmattio.github.io/spin/" +bug-reports: "https://github.com/tmattio/spin/issues" +depends: [ + "ocaml" {>= "4.10.0"} + "dune" {>= "2.7"} + "spin" {= version} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/tmattio/spin.git" +flags: plugin diff --git a/opam-spin.opam.template b/opam-spin.opam.template new file mode 100644 index 0000000..0d8a42b --- /dev/null +++ b/opam-spin.opam.template @@ -0,0 +1 @@ +flags: plugin diff --git a/spin.opam b/spin.opam index 7df609e..e44b4c2 100644 --- a/spin.opam +++ b/spin.opam @@ -26,7 +26,6 @@ depends: [ "cmdliner" "logs" ] -dev-repo: "git+https://github.com/tmattio/spin.git" build: [ ["dune" "subst"] {dev} [ @@ -37,7 +36,8 @@ build: [ "-j" jobs "@install" + "@runtest" {with-test} "@doc" {with-doc} ] ] -flags: plugin +dev-repo: "git+https://github.com/tmattio/spin.git" diff --git a/spin.opam.template b/spin.opam.template deleted file mode 100644 index cbd99b7..0000000 --- a/spin.opam.template +++ /dev/null @@ -1,14 +0,0 @@ -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -flags: plugin