From 94c1af6bbe80a7d636b382fae7d189ee81ada33e Mon Sep 17 00:00:00 2001 From: Christophe Troestler Date: Thu, 8 Dec 2016 10:26:02 +0100 Subject: [PATCH 1/6] Enable again tests on oasis 0.4.8 --- packages/oasis/oasis.0.4.8/opam | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/oasis/oasis.0.4.8/opam b/packages/oasis/oasis.0.4.8/opam index 4472237fb95..88fdc6504d6 100644 --- a/packages/oasis/oasis.0.4.8/opam +++ b/packages/oasis/oasis.0.4.8/opam @@ -3,7 +3,7 @@ maintainer: "Sylvain Le Gall " authors: [ "Sylvain Le Gall" ] license: "LGPL-2.1 with OCaml linking exception" homepage: "http://oasis.forge.ocamlcore.org/" -dev-repo: "git://github.com/ocaml/oasis.git#opam/testing" +dev-repo: "git://github.com/ocaml/oasis.git" bug-reports: "http://oasis.forge.ocamlcore.org/" build: [ ["ocaml" "setup.ml" "-configure" "--prefix" prefix] @@ -13,21 +13,30 @@ install: ["ocaml" "setup.ml" "-install"] remove: [ ["ocaml" "%{etc}%/oasis/_oasis_remove_.ml" "%{etc}%/oasis"] ] +build-test: [ + ["ocaml" "setup.ml" "-configure" "--enable-tests"] + ["ocaml" "setup.ml" "-build"] + ["ocaml" "setup.ml" "-test"] +] build-doc: [ "ocaml" "setup.ml" "-doc" ] depends: [ "base-unix" + "camlp4" {test} + "expect" {test & >= "0.0.4"} + "fileutils" {test & >= "0.4.2"} "ocamlbuild" "ocamlfind" {>= "1.3.1"} "ocamlify" {build} - "ocamlmod" {build} + "ocamlmod" {build & test} + "omake" {test} + "ounit" {test & >= "2.0.0"} + "pcre" {test} ] depopts: [ "benchmark" - "expect" ] conflicts: [ "benchmark" {< "1.2"} - "expect" {< "0.0.4"} "oasis-mirage" {= "0.3.0"} "oasis-mirage" {= "0.3.0a"} ] From 3b4eafeffb9c4c6972e8bdfebf4b2b22f2c226c6 Mon Sep 17 00:00:00 2001 From: Christophe Troestler Date: Thu, 8 Dec 2016 12:30:23 +0100 Subject: [PATCH 2/6] oasis: Remove the "& test" to the "ocamlmod" dependency --- packages/oasis/oasis.0.4.8/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/oasis/oasis.0.4.8/opam b/packages/oasis/oasis.0.4.8/opam index 88fdc6504d6..776489a5961 100644 --- a/packages/oasis/oasis.0.4.8/opam +++ b/packages/oasis/oasis.0.4.8/opam @@ -27,7 +27,7 @@ depends: [ "ocamlbuild" "ocamlfind" {>= "1.3.1"} "ocamlify" {build} - "ocamlmod" {build & test} + "ocamlmod" {build} "omake" {test} "ounit" {test & >= "2.0.0"} "pcre" {test} From 489196ca66fa98330d8874df0e4b80108001e152 Mon Sep 17 00:00:00 2001 From: Christophe Troestler Date: Thu, 8 Dec 2016 13:55:23 +0100 Subject: [PATCH 3/6] oasis: Use the #opam/testing branch of the Git repo --- packages/oasis/oasis.0.4.8/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/oasis/oasis.0.4.8/opam b/packages/oasis/oasis.0.4.8/opam index 776489a5961..3a749f87f84 100644 --- a/packages/oasis/oasis.0.4.8/opam +++ b/packages/oasis/oasis.0.4.8/opam @@ -3,7 +3,7 @@ maintainer: "Sylvain Le Gall " authors: [ "Sylvain Le Gall" ] license: "LGPL-2.1 with OCaml linking exception" homepage: "http://oasis.forge.ocamlcore.org/" -dev-repo: "git://github.com/ocaml/oasis.git" +dev-repo: "git://github.com/ocaml/oasis.git#opam/testing" bug-reports: "http://oasis.forge.ocamlcore.org/" build: [ ["ocaml" "setup.ml" "-configure" "--prefix" prefix] From 007f61b0c1c9590365908b6ddf083dcaaf1c08ef Mon Sep 17 00:00:00 2001 From: Christophe Troestler Date: Thu, 8 Dec 2016 23:53:37 +0100 Subject: [PATCH 4/6] oasis: Do not use the obsolete _oasis_remove_.ml --- packages/oasis/oasis.0.4.8/files/_oasis_remove_.ml | 7 ------- packages/oasis/oasis.0.4.8/files/oasis.install | 1 - packages/oasis/oasis.0.4.8/opam | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 packages/oasis/oasis.0.4.8/files/_oasis_remove_.ml diff --git a/packages/oasis/oasis.0.4.8/files/_oasis_remove_.ml b/packages/oasis/oasis.0.4.8/files/_oasis_remove_.ml deleted file mode 100644 index 0d23853fc00..00000000000 --- a/packages/oasis/oasis.0.4.8/files/_oasis_remove_.ml +++ /dev/null @@ -1,7 +0,0 @@ -open Printf - -let () = - let dir = Sys.argv.(1) in - (try Sys.chdir dir - with _ -> eprintf "Cannot change directory to %s\n%!" dir); - exit (Sys.command "ocaml setup.ml -uninstall") diff --git a/packages/oasis/oasis.0.4.8/files/oasis.install b/packages/oasis/oasis.0.4.8/files/oasis.install index c6cfc2de587..075d45291eb 100644 --- a/packages/oasis/oasis.0.4.8/files/oasis.install +++ b/packages/oasis/oasis.0.4.8/files/oasis.install @@ -2,5 +2,4 @@ etc: [ "setup.ml" "setup.data" "setup.log" - "_oasis_remove_.ml" ] diff --git a/packages/oasis/oasis.0.4.8/opam b/packages/oasis/oasis.0.4.8/opam index 3a749f87f84..65b94066a58 100644 --- a/packages/oasis/oasis.0.4.8/opam +++ b/packages/oasis/oasis.0.4.8/opam @@ -11,7 +11,7 @@ build: [ ] install: ["ocaml" "setup.ml" "-install"] remove: [ - ["ocaml" "%{etc}%/oasis/_oasis_remove_.ml" "%{etc}%/oasis"] + ["ocaml" "%{etc}%/oasis/setup.ml" "-C" "%{etc}%/oasis" "-uninstall"] ] build-test: [ ["ocaml" "setup.ml" "-configure" "--enable-tests"] From 7aa60cc93324ffd8b96e9cc3f5763551803b9782 Mon Sep 17 00:00:00 2001 From: Christophe Troestler Date: Sat, 10 Dec 2016 11:01:33 +0100 Subject: [PATCH 5/6] oasis: Sync the bug-reports URL with the _oasis file --- packages/oasis/oasis.0.4.8/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/oasis/oasis.0.4.8/opam b/packages/oasis/oasis.0.4.8/opam index 65b94066a58..65102fd5ff6 100644 --- a/packages/oasis/oasis.0.4.8/opam +++ b/packages/oasis/oasis.0.4.8/opam @@ -4,7 +4,7 @@ authors: [ "Sylvain Le Gall" ] license: "LGPL-2.1 with OCaml linking exception" homepage: "http://oasis.forge.ocamlcore.org/" dev-repo: "git://github.com/ocaml/oasis.git#opam/testing" -bug-reports: "http://oasis.forge.ocamlcore.org/" +bug-reports: "https://forge.ocamlcore.org/tracker/?func=add&group_id=54&atid=291" build: [ ["ocaml" "setup.ml" "-configure" "--prefix" prefix] ["ocaml" "setup.ml" "-build"] From 24710259d20636b23e80541b71bc8bb2e676a330 Mon Sep 17 00:00:00 2001 From: Christophe Troestler Date: Sun, 25 Dec 2016 10:45:00 +0100 Subject: [PATCH 6/6] Update old ANSITerminal packages --- packages/ANSITerminal/ANSITerminal.0.6.2/descr | 3 ++- packages/ANSITerminal/ANSITerminal.0.6.2/opam | 11 +++++++++-- packages/ANSITerminal/ANSITerminal.0.6.3/opam | 9 ++++++++- packages/ANSITerminal/ANSITerminal.0.6/opam | 4 +++- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/packages/ANSITerminal/ANSITerminal.0.6.2/descr b/packages/ANSITerminal/ANSITerminal.0.6.2/descr index 4a47dd9d531..35f153b9c33 100644 --- a/packages/ANSITerminal/ANSITerminal.0.6.2/descr +++ b/packages/ANSITerminal/ANSITerminal.0.6.2/descr @@ -1,4 +1,5 @@ -Allow to use the colors and cursor movements on ANSI terminals +Basic control of ANSI compliant terminals and the windows shell. + ANSITerminal is a module allowing to use the colors and cursor movements on ANSI terminals. It also works on the windows shell (but this part is currently work in progress). diff --git a/packages/ANSITerminal/ANSITerminal.0.6.2/opam b/packages/ANSITerminal/ANSITerminal.0.6.2/opam index 0e91c8551d3..8c2e4b9058c 100644 --- a/packages/ANSITerminal/ANSITerminal.0.6.2/opam +++ b/packages/ANSITerminal/ANSITerminal.0.6.2/opam @@ -11,10 +11,17 @@ build: [ ["ocaml" "setup.ml" "-configure" "--prefix" prefix] ["ocaml" "setup.ml" "-build"] ] +install: ["ocaml" "setup.ml" "-install"] remove: [["ocamlfind" "remove" "ANSITerminal"]] +build-test: [ + ["ocaml" "setup.ml" "-configure" "--enable-tests"] + ["ocaml" "setup.ml" "-build"] + ["ocaml" "setup.ml" "-test"] +] +build-doc: [ "ocaml" "setup.ml" "-doc" ] depends: [ - "ocamlfind" + "base-unix" "ocamlbuild" {build} + "ocamlfind" {build} ] -install: ["ocaml" "setup.ml" "-install"] available: [ocaml-version < "4.05.0"] diff --git a/packages/ANSITerminal/ANSITerminal.0.6.3/opam b/packages/ANSITerminal/ANSITerminal.0.6.3/opam index 0e91c8551d3..e6044d8fde9 100644 --- a/packages/ANSITerminal/ANSITerminal.0.6.3/opam +++ b/packages/ANSITerminal/ANSITerminal.0.6.3/opam @@ -11,10 +11,17 @@ build: [ ["ocaml" "setup.ml" "-configure" "--prefix" prefix] ["ocaml" "setup.ml" "-build"] ] +install: ["ocaml" "setup.ml" "-install"] remove: [["ocamlfind" "remove" "ANSITerminal"]] +build-test: [ + ["ocaml" "setup.ml" "-configure" "--enable-tests"] + ["ocaml" "setup.ml" "-build"] + ["ocaml" "setup.ml" "-test"] +] +build-doc: [ "ocaml" "setup.ml" "-doc" ] depends: [ "ocamlfind" "ocamlbuild" {build} + "ocamlfind" {build} ] -install: ["ocaml" "setup.ml" "-install"] available: [ocaml-version < "4.05.0"] diff --git a/packages/ANSITerminal/ANSITerminal.0.6/opam b/packages/ANSITerminal/ANSITerminal.0.6/opam index d45b8d862a9..e2b0e095251 100644 --- a/packages/ANSITerminal/ANSITerminal.0.6/opam +++ b/packages/ANSITerminal/ANSITerminal.0.6/opam @@ -12,10 +12,12 @@ build: [ ["ocaml" "setup.ml" "-configure" "--prefix" prefix] ["ocaml" "setup.ml" "-build"] ] +install: ["ocaml" "setup.ml" "-install"] remove: [["ocamlfind" "remove" "ANSITerminal"]] depends: [ "ocamlfind" "oasis" {build & >= "0.3.0" & < "0.4.7"} "ocamlbuild" {build} + "ocamlfind" {build} ] -install: ["ocaml" "setup.ml" "-install"] +available: [ocaml-version < "4.05.0"]