From 5a5d3ff96487b119fd6885a9e421f345249b2404 Mon Sep 17 00:00:00 2001 From: Yishuai Li Date: Thu, 10 Nov 2022 12:29:49 +0800 Subject: [PATCH 1/2] polish dune-project --- dune-project | 17 ++++++--------- unison-fsmonitor.opam | 40 +++++++++++++++++++++++++++++++++++ unison-gui.opam | 40 +++++++++++++++++++++++++++++++++++ unison.opam | 49 ++++++++++++++++++++++++++++--------------- 4 files changed, 118 insertions(+), 28 deletions(-) create mode 100644 unison-fsmonitor.opam create mode 100644 unison-gui.opam diff --git a/dune-project b/dune-project index a02cddbea..868e8b779 100644 --- a/dune-project +++ b/dune-project @@ -1,10 +1,10 @@ -(lang dune 2.3) +(lang dune 2.7) (name unison) (version dev) -(generate_opam_files false) +(generate_opam_files true) (license GPL-3.0-or-later) @@ -33,9 +33,7 @@ the changes in each replica to the other. ") (depends (ocaml - (>= 4.08)) - (dune - (>= 2.3)))) + (>= 4.08)))) (package (name unison-gui) @@ -52,9 +50,8 @@ the changes in each replica to the other. (depends (ocaml (>= 4.08)) - (dune - (>= 2.3)) - lablgtk)) + (lablgtk3 + (>= 3.1.0)))) (package (name unison-fsmonitor) @@ -71,6 +68,4 @@ the changes in each replica to the other. ") (depends (ocaml - (>= 4.08)) - (dune - (>= 2.3)))) + (>= 4.08)))) diff --git a/unison-fsmonitor.opam b/unison-fsmonitor.opam new file mode 100644 index 000000000..919bc7f1e --- /dev/null +++ b/unison-fsmonitor.opam @@ -0,0 +1,40 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +version: "dev" +synopsis: "File-synchronization tool for Unix and Windows" +description: """ +This optional add-on for unison monitors file system changes +on all given (relative to root) paths. + +Unison is a file-synchronization tool for Unix and Windows. +It allows two replicas of a collection of files and directories +to be stored on different hosts (or different disks on the same host), +modified separately, and then brought up to date by propagating +the changes in each replica to the other. +""" +maintainer: ["juergen@hoetzel.info"] +authors: ["Trevor Jim" "Benjamin C. Pierce" "Jérôme Vouillon"] +license: "GPL-3.0-or-later" +homepage: "https://www.cis.upenn.edu/~bcpierce/unison/" +doc: "https://github.com/bcpierce00/unison/wiki" +bug-reports: "https://github.com/bcpierce00/unison/issues" +depends: [ + "dune" {>= "2.7"} + "ocaml" {>= "4.08"} + "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/bcpierce00/unison.git" diff --git a/unison-gui.opam b/unison-gui.opam new file mode 100644 index 000000000..00f754929 --- /dev/null +++ b/unison-gui.opam @@ -0,0 +1,40 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +version: "dev" +synopsis: "File-synchronization tool for Unix and Windows" +description: """ +Graphical user interface for Unison. + +Unison is a file-synchronization tool for Unix and Windows. +It allows two replicas of a collection of files and directories +to be stored on different hosts (or different disks on the same host), +modified separately, and then brought up to date by propagating +the changes in each replica to the other. +""" +maintainer: ["juergen@hoetzel.info"] +authors: ["Trevor Jim" "Benjamin C. Pierce" "Jérôme Vouillon"] +license: "GPL-3.0-or-later" +homepage: "https://www.cis.upenn.edu/~bcpierce/unison/" +doc: "https://github.com/bcpierce00/unison/wiki" +bug-reports: "https://github.com/bcpierce00/unison/issues" +depends: [ + "dune" {>= "2.7"} + "ocaml" {>= "4.08"} + "lablgtk3" {>= "3.1.0"} + "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/bcpierce00/unison.git" diff --git a/unison.opam b/unison.opam index b55c6dc92..94db96f3f 100644 --- a/unison.opam +++ b/unison.opam @@ -1,24 +1,39 @@ +# This file is generated by dune, edit dune-project instead opam-version: "2.0" -maintainer: "juergen@hoetzel.info" -authors: [ - "Trevor Jim" - "Benjamin C. Pierce" - "Jérôme Vouillon" -] +version: "dev" +synopsis: "File-synchronization tool for Unix and Windows" +description: """ +Text based user interface for Unison. + +Unison is a file-synchronization tool for Unix and Windows. +It allows two replicas of a collection of files and directories +to be stored on different hosts (or different disks on the same host), +modified separately, and then brought up to date by propagating +the changes in each replica to the other. +""" +maintainer: ["juergen@hoetzel.info"] +authors: ["Trevor Jim" "Benjamin C. Pierce" "Jérôme Vouillon"] license: "GPL-3.0-or-later" homepage: "https://www.cis.upenn.edu/~bcpierce/unison/" +doc: "https://github.com/bcpierce00/unison/wiki" bug-reports: "https://github.com/bcpierce00/unison/issues" -dev-repo: "git://github.com/bcpierce00/unison.git" -build: ["dune" "build" "-p" name "-j" jobs] depends: [ + "dune" {>= "2.7"} "ocaml" {>= "4.08"} - "dune" {>= "2.3"} - "lablgtk3" {>= "3.1.0"} + "odoc" {with-doc} ] -synopsis: "File-synchronization tool for Unix and Windows" -description: """ -Unison is a file-synchronization tool for Unix and Windows. It allows -two replicas of a collection of files and directories to be stored on -different hosts (or different disks on the same host), modified -separately, and then brought up to date by propagating the changes in -each replica to the other.""" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/bcpierce00/unison.git" From c539cbb7fccbb5a067c3f192b69a6a19f262b1e9 Mon Sep 17 00:00:00 2001 From: Yishuai Li Date: Wed, 16 Nov 2022 15:54:37 +0800 Subject: [PATCH 2/2] OPAM: update maintainers and unlink from Dune --- dune-project | 4 +--- unison-fsmonitor.opam | 4 +--- unison-gui.opam | 4 +--- unison.opam | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dune-project b/dune-project index 868e8b779..2d0e92b7a 100644 --- a/dune-project +++ b/dune-project @@ -4,11 +4,9 @@ (version dev) -(generate_opam_files true) - (license GPL-3.0-or-later) -(maintainers "juergen@hoetzel.info") +(maintainers "unisonhackers@lists.seas.upenn.edu") (authors "Trevor Jim" "Benjamin C. Pierce" "J\195\169r\195\180me Vouillon") diff --git a/unison-fsmonitor.opam b/unison-fsmonitor.opam index 919bc7f1e..c53e41e73 100644 --- a/unison-fsmonitor.opam +++ b/unison-fsmonitor.opam @@ -1,4 +1,3 @@ -# This file is generated by dune, edit dune-project instead opam-version: "2.0" version: "dev" synopsis: "File-synchronization tool for Unix and Windows" @@ -12,14 +11,13 @@ to be stored on different hosts (or different disks on the same host), modified separately, and then brought up to date by propagating the changes in each replica to the other. """ -maintainer: ["juergen@hoetzel.info"] +maintainer: ["unisonhackers@lists.seas.upenn.edu"] authors: ["Trevor Jim" "Benjamin C. Pierce" "Jérôme Vouillon"] license: "GPL-3.0-or-later" homepage: "https://www.cis.upenn.edu/~bcpierce/unison/" doc: "https://github.com/bcpierce00/unison/wiki" bug-reports: "https://github.com/bcpierce00/unison/issues" depends: [ - "dune" {>= "2.7"} "ocaml" {>= "4.08"} "odoc" {with-doc} ] diff --git a/unison-gui.opam b/unison-gui.opam index 00f754929..074b1526d 100644 --- a/unison-gui.opam +++ b/unison-gui.opam @@ -1,4 +1,3 @@ -# This file is generated by dune, edit dune-project instead opam-version: "2.0" version: "dev" synopsis: "File-synchronization tool for Unix and Windows" @@ -11,14 +10,13 @@ to be stored on different hosts (or different disks on the same host), modified separately, and then brought up to date by propagating the changes in each replica to the other. """ -maintainer: ["juergen@hoetzel.info"] +maintainer: ["unisonhackers@lists.seas.upenn.edu"] authors: ["Trevor Jim" "Benjamin C. Pierce" "Jérôme Vouillon"] license: "GPL-3.0-or-later" homepage: "https://www.cis.upenn.edu/~bcpierce/unison/" doc: "https://github.com/bcpierce00/unison/wiki" bug-reports: "https://github.com/bcpierce00/unison/issues" depends: [ - "dune" {>= "2.7"} "ocaml" {>= "4.08"} "lablgtk3" {>= "3.1.0"} "odoc" {with-doc} diff --git a/unison.opam b/unison.opam index 94db96f3f..6c065f50b 100644 --- a/unison.opam +++ b/unison.opam @@ -1,4 +1,3 @@ -# This file is generated by dune, edit dune-project instead opam-version: "2.0" version: "dev" synopsis: "File-synchronization tool for Unix and Windows" @@ -11,14 +10,13 @@ to be stored on different hosts (or different disks on the same host), modified separately, and then brought up to date by propagating the changes in each replica to the other. """ -maintainer: ["juergen@hoetzel.info"] +maintainer: ["unisonhackers@lists.seas.upenn.edu"] authors: ["Trevor Jim" "Benjamin C. Pierce" "Jérôme Vouillon"] license: "GPL-3.0-or-later" homepage: "https://www.cis.upenn.edu/~bcpierce/unison/" doc: "https://github.com/bcpierce00/unison/wiki" bug-reports: "https://github.com/bcpierce00/unison/issues" depends: [ - "dune" {>= "2.7"} "ocaml" {>= "4.08"} "odoc" {with-doc} ]