Merge pull request #1035 from shonfeder/1034/dune-2

Update to dune 2

.github/workflows/workflow.yml

@@ -91,7 +91,7 @@ jobs:
 
       - run: opam install lwt_react lwt --deps-only --with-test
 
-      - run: opam install lwt_ppx lwt_ppx_let --deps-only --with-test
+      - run: opam install lwt_ppx --deps-only --with-test
         if: ${{ matrix.ppx == true }}
 
       - run: opam exec -- dune build --only-packages lwt_react,lwt
@@ -104,9 +104,6 @@ jobs:
       - run: opam exec -- dune runtest --only-packages lwt_ppx
         if: ${{ matrix.ppx == true }}
 
-      - run: opam exec -- make ppx_let-test
-        if: ${{ matrix.ppx == true }}
-
   lint-opam:
     runs-on: ubuntu-latest
 

.gitignore

@@ -30,8 +30,3 @@ lib/
 
 # Wikidoc output.
 /docs/api/
-
-# Junk from packaging tests.
-*.cm*
-*.o
-a.out

Makefile

@@ -44,32 +44,6 @@ doc-api-html: build
 doc-api-wiki: build
 	$(MAKE) -C docs api/wiki/index.wiki
 
-# Packaging tests. These are run with Lwt installed by OPAM, typically during
-# CI. To run locally, run the install-for-packaging-test target first.
-.PHONY: packaging-test
-packaging-test:
-	ocamlfind query lwt
-	for TEST in `ls -d test/packaging/*/*` ; \
-	do \
-	    $(MAKE) -wC $$TEST || exit 1 ; \
-		echo ; \
-		echo ; \
-	done
-
-.PHONY: install-for-packaging-test
-install-for-packaging-test: clean
-	opam pin add --yes --no-action lwt .
-	opam pin add --yes --no-action lwt_ppx .
-	opam pin add --yes --no-action lwt_react .
-	opam reinstall --yes lwt lwt_ppx lwt_react
-
-.PHONY: uninstall-after-packaging-test
-uninstall-after-packaging-test:
-	opam remove --yes lwt lwt_ppx lwt_react
-	opam pin remove --yes lwt
-	opam pin remove --yes lwt_ppx
-	opam pin remove --yes lwt_react
-
 # ppx_let integration test.
 .PHONY : ppx_let-test
 ppx_let-test :
@@ -81,10 +55,6 @@ clean :
 	dune clean
 	rm -fr docs/api
 	rm -f src/unix/discover_arguments
-	for TEST in `ls -d test/packaging/*/*` ; \
-	do \
-	    $(MAKE) -wC $$TEST clean ; \
-	done
 	rm -rf _coverage/
 
 EXPECTED_FILES := \

dune-project

@@ -1,4 +1,4 @@
-(lang dune 1.12)
+(lang dune 2.0)
 
 (name lwt)
 
@@ -12,21 +12,13 @@
 (source (github ocsigen/lwt))
 (documentation "https://ocsigen.org/lwt")
 
-(package
- (name lwt_ppx_let)
- (synopsis "Dummy package context for ppx_let tests")
- (description "Internal package used to partition ppx_let tests.")
- (depends
-  (ocaml (>= 4.08))
-  (ppx_let :with-test)
-  lwt))
-
 (package
  (name lwt_ppx)
  (synopsis "PPX syntax for Lwt, providing something similar to async/await from JavaScript")
  (depends
   (ocaml (>= 4.08))
   (ppxlib (>= 0.16.0))
+  (ppx_let :with-test)
   lwt))
 
 (package

lwt.opam

@@ -20,7 +20,7 @@ homepage: "https://github.com/ocsigen/lwt"
 doc: "https://ocsigen.org/lwt"
 bug-reports: "https://github.com/ocsigen/lwt/issues"
 depends: [
-  "dune" {>= "1.12"}
+  "dune" {>= "2.0"}
   "ocaml" {>= "4.08"}
   "cppo" {build & >= "1.1.0"}
   "ocamlfind" {dev & >= "1.7.3-1"}
@@ -54,4 +54,3 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-available: os-family != "windows" | "ocaml-version" < "5.2"

lwt_ppx.opam

@@ -11,11 +11,13 @@ homepage: "https://github.com/ocsigen/lwt"
 doc: "https://ocsigen.org/lwt"
 bug-reports: "https://github.com/ocsigen/lwt/issues"
 depends: [
-  "dune" {>= "1.12"}
+  "dune" {>= "2.0"}
   "ocaml" {>= "4.08"}
   "ppxlib" {>= "0.16.0"}
+  "ppx_let" {with-test}
   "lwt"
 ]
+dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
   ["dune" "subst"] {dev}
   [
@@ -30,4 +32,3 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/ocsigen/lwt.git"

lwt_ppx.opam.template

@@ -0,0 +1,14 @@
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]

lwt_react.opam

@@ -10,12 +10,13 @@ homepage: "https://github.com/ocsigen/lwt"
 doc: "https://ocsigen.org/lwt"
 bug-reports: "https://github.com/ocsigen/lwt/issues"
 depends: [
-  "dune" {>= "1.12"}
+  "dune" {>= "2.0"}
   "ocaml" {>= "4.08"}
   "cppo" {build & >= "1.1.0"}
   "lwt" {>= "3.0.0"}
   "react" {>= "1.0.0"}
 ]
+dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
   ["dune" "subst"] {dev}
   [
@@ -30,4 +31,3 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/ocsigen/lwt.git"

lwt_react.opam.template

@@ -0,0 +1,14 @@
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]