Merge pull request #191 from avsm/fix-build

avsm · web-flow · commit bf2bbae5fa6b · 2021-04-09T11:18:08.000+01:00
update build to dune 2.0 and upper bound opam-lib
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,5 @@
+* Update to dune 2.0 build.
+
 1.5.0 (2017-06-24):
 * Use opam-lib ≥ 1.3.0.
 * Many layout and package index fixes.
diff --git a/bin/dune b/bin/dune
@@ -1,4 +1,5 @@
 (executable
+ (modes byte exe)
  (name opam2web)
  (public_name opam2web)
  (libraries opam2web))
diff --git a/dune-project b/dune-project
@@ -1,2 +1,5 @@
-(lang dune 1.0)
+(lang dune 2.0)
+
 (name opam2web)
+
+(formatting disabled)
diff --git a/ext/dune b/ext/dune
@@ -1,45 +1,52 @@
 (install
  (section share)
  (files
-   (css/bootstrap.min.css as css/bootstrap.min.css)
-   (css/bootstrap-responsive.css as css/bootstrap-responsive.css)
-   (css/bootstrap.css as css/bootstrap.css)
-   (css/bootstrap-responsive.min.css as css/bootstrap-responsive.min.css)
-   (css/site.css as css/site.css)
-   (css/docs.css as css/docs.css)
-   (css/opam2web.css as css/opam2web.css)
-   (js/bootstrap.js as js/bootstrap.js)
-   (js/bootstrap.min.js as js/bootstrap.min.js)
-   (js/google-code-prettify/lang-ml.js as js/google-code-prettify/lang-ml.js)
-   (js/google-code-prettify/lang-css.js as js/google-code-prettify/lang-css.js)
-   (js/google-code-prettify/lang-vhdl.js as js/google-code-prettify/lang-vhdl.js)
-   (js/google-code-prettify/lang-go.js as js/google-code-prettify/lang-go.js)
-   (js/google-code-prettify/lang-xq.js as js/google-code-prettify/lang-xq.js)
-   (js/google-code-prettify/lang-sql.js as js/google-code-prettify/lang-sql.js)
-   (js/google-code-prettify/lang-n.js as js/google-code-prettify/lang-n.js)
-   (js/google-code-prettify/lang-lisp.js as js/google-code-prettify/lang-lisp.js)
-   (js/google-code-prettify/lang-scala.js as js/google-code-prettify/lang-scala.js)
-   (js/google-code-prettify/prettify.js as js/google-code-prettify/prettify.js)
-   (js/google-code-prettify/lang-proto.js as js/google-code-prettify/lang-proto.js)
-   (js/google-code-prettify/lang-lua.js as js/google-code-prettify/lang-lua.js)
-   (js/google-code-prettify/lang-apollo.js as js/google-code-prettify/lang-apollo.js)
-   (js/google-code-prettify/prettify.css as js/google-code-prettify/prettify.css)
-   (js/google-code-prettify/lang-vb.js as js/google-code-prettify/lang-vb.js)
-   (js/google-code-prettify/lang-wiki.js as js/google-code-prettify/lang-wiki.js)
-   (js/google-code-prettify/lang-tex.js as js/google-code-prettify/lang-tex.js)
-   (js/google-code-prettify/lang-hs.js as js/google-code-prettify/lang-hs.js)
-   (js/google-code-prettify/lang-yaml.js as js/google-code-prettify/lang-yaml.js)
-   (js/google-code-prettify/lang-clj.js as js/google-code-prettify/lang-clj.js)
-   (js/site.js as js/site.js)
-   (js/jquery.js as js/jquery.js)
-   (img/opam.svg as img/opam.svg)
-   (img/opam.png as img/opam.png)
-   (img/github.png as img/github.png)
-   (img/GitHub-Mark-32px.png as img/GitHub-Mark-32px.png)
-   (img/camel_rider.png as img/camel_rider.png)
-   (img/favicon.png as img/favicon.png)
-   (img/glyphicons-halflings.png as img/glyphicons-halflings.png)
-   (img/glyphicons-halflings-white.png as img/glyphicons-halflings-white.png)
-   (img/ocamlpro.png as img/ocamlpro.png)
-   (img/ocaml.png as img/ocaml.png)
-))
+  (css/bootstrap.min.css as css/bootstrap.min.css)
+  (css/bootstrap-responsive.css as css/bootstrap-responsive.css)
+  (css/bootstrap.css as css/bootstrap.css)
+  (css/bootstrap-responsive.min.css as css/bootstrap-responsive.min.css)
+  (css/site.css as css/site.css)
+  (css/docs.css as css/docs.css)
+  (css/opam2web.css as css/opam2web.css)
+  (js/bootstrap.js as js/bootstrap.js)
+  (js/bootstrap.min.js as js/bootstrap.min.js)
+  (js/google-code-prettify/lang-ml.js as js/google-code-prettify/lang-ml.js)
+  (js/google-code-prettify/lang-css.js as js/google-code-prettify/lang-css.js)
+  (js/google-code-prettify/lang-vhdl.js as
+    js/google-code-prettify/lang-vhdl.js)
+  (js/google-code-prettify/lang-go.js as js/google-code-prettify/lang-go.js)
+  (js/google-code-prettify/lang-xq.js as js/google-code-prettify/lang-xq.js)
+  (js/google-code-prettify/lang-sql.js as js/google-code-prettify/lang-sql.js)
+  (js/google-code-prettify/lang-n.js as js/google-code-prettify/lang-n.js)
+  (js/google-code-prettify/lang-lisp.js as
+    js/google-code-prettify/lang-lisp.js)
+  (js/google-code-prettify/lang-scala.js as
+    js/google-code-prettify/lang-scala.js)
+  (js/google-code-prettify/prettify.js as js/google-code-prettify/prettify.js)
+  (js/google-code-prettify/lang-proto.js as
+    js/google-code-prettify/lang-proto.js)
+  (js/google-code-prettify/lang-lua.js as js/google-code-prettify/lang-lua.js)
+  (js/google-code-prettify/lang-apollo.js as
+    js/google-code-prettify/lang-apollo.js)
+  (js/google-code-prettify/prettify.css as
+    js/google-code-prettify/prettify.css)
+  (js/google-code-prettify/lang-vb.js as js/google-code-prettify/lang-vb.js)
+  (js/google-code-prettify/lang-wiki.js as
+    js/google-code-prettify/lang-wiki.js)
+  (js/google-code-prettify/lang-tex.js as js/google-code-prettify/lang-tex.js)
+  (js/google-code-prettify/lang-hs.js as js/google-code-prettify/lang-hs.js)
+  (js/google-code-prettify/lang-yaml.js as
+    js/google-code-prettify/lang-yaml.js)
+  (js/google-code-prettify/lang-clj.js as js/google-code-prettify/lang-clj.js)
+  (js/site.js as js/site.js)
+  (js/jquery.js as js/jquery.js)
+  (img/opam.svg as img/opam.svg)
+  (img/opam.png as img/opam.png)
+  (img/github.png as img/github.png)
+  (img/GitHub-Mark-32px.png as img/GitHub-Mark-32px.png)
+  (img/camel_rider.png as img/camel_rider.png)
+  (img/favicon.png as img/favicon.png)
+  (img/glyphicons-halflings.png as img/glyphicons-halflings.png)
+  (img/glyphicons-halflings-white.png as img/glyphicons-halflings-white.png)
+  (img/ocamlpro.png as img/ocamlpro.png)
+  (img/ocaml.png as img/ocaml.png)))
diff --git a/opam2web.opam b/opam2web.opam
@@ -4,24 +4,25 @@ authors: "The opam team"
 homepage: "https://github.com/ocaml/opam2web"
 bug-reports: "https://github.com/ocaml/opam2web/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
-  "dune"
+  "ocaml" {>= "4.08.0"}
+  "dune" {>="2.0.0"}
   "opam-lib" {>= "1.3.0"}
   "opamfu" {>= "0.1.2"}
   "re"
   "uri" {>= "1.3.11"}
   "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-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"}
   "cohttp-lwt-unix"
   "yojson" {>= "1.6.0"}
   "opam-file-format" {< "2.1.1"}
   "cmdliner" {>= "1.0.4"}
-  "omd" {>= "1.3.1"}
+  "omd" {>= "1.3.1" & < "2.0.0~"}
 ]
 build: [
 #  ["dune" "subst"] {pinned}
diff --git a/src/dune b/src/dune
@@ -3,4 +3,5 @@
  (wrapped false)
  (public_name opam2web)
  (modules_without_implementation o2wTypes)
- (libraries str omd cow opam-core opam-format opam-state opam-client cmdliner apalog yojson))
+ (libraries str omd cow opam-core opam-format opam-state opam-client cmdliner
+   apalog yojson))
diff --git a/src/js_search/dune b/src/js_search/dune
@@ -1,4 +1,5 @@
 (executable
+ (modes js)
  (name search)
  (libraries js_of_ocaml)
  (preprocess
@@ -10,4 +11,5 @@
 
 (install
  (section share)
- (files (search.bc.js as js/search.js)))
+ (files
+  (search.bc.js as js/search.js)))
diff --git a/src/opam2web.mllib b/src/opam2web.mllib

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+* Update to dune 2.0 build.`
	`2`	`+`
`1`	`3`	`1.5.0 (2017-06-24):`
`2`	`4`	`* Use opam-lib ≥ 1.3.0.`
`3`	`5`	`* Many layout and package index fixes.`