chore: move opam files to opam/ directory

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
ocaml · Jun 23, 2023 · a3091d7 · a3091d7
1 parent 4ea5720
commit a3091d7
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 61 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -81,7 +81,7 @@ jobs:
           git config --global user.email github-actions[bot]@users.noreply.github.com
 
       # Install ocamlfind-secondary and ocaml-secondary-compiler, if needed
-      - run: opam install ./dune.opam --deps-only --with-test
+      - run: opam install ./opam/dune.opam --deps-only --with-test
 
       - name: Install system deps on macOS
         run: brew install coreutils pkg-config file
@@ -101,7 +101,7 @@ jobs:
         if: ${{ matrix.os != 'windows-latest' && matrix.skip_test == false }}
 
       - name: Install deps on Win32
-        run: opam install ./dune-configurator.opam --deps-only --with-test
+        run: opam install ./opam/dune-configurator.opam --deps-only --with-test
         if: ${{ matrix.os == 'windows-latest' && matrix.skip_test == false }}
 
       - name: Run test suite on Unix
@@ -113,7 +113,7 @@ jobs:
         if: ${{ matrix.os == 'windows-latest' && matrix.skip_test == false }}
 
       - name: Build configurator
-        run: opam install ./dune-configurator.opam
+        run: opam install ./opam/dune-configurator.opam
         if: ${{ matrix.configurator == true }}
 
   dkml-current:
@@ -190,7 +190,7 @@ jobs:
           git config --global user.email github-actions[bot]@users.noreply.github.com
 
       # Install ocamlfind-secondary and ocaml-secondary-compiler, if needed
-      - run: opam install ./dune.opam --deps-only --with-test
+      - run: opam install ./opam/dune.opam --deps-only --with-test
 
       - name: Install deps on Unix
         run: |

diff --git a/dune-file b/dune-file
@@ -2,48 +2,6 @@
 
 (data_only_dirs _boot)
 
-(rule
- (copy dune-private-libs.opam.template dune-configurator.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template dune-glob.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template dune-action-plugin.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template dune-build-info.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template dune-site.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template dune-rpc.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template stdune.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template dyn.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template ordering.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template dune-rpc-lwt.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template fiber.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template xdg.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template ocamlc-loc.opam.template))
-
-(rule
- (copy dune-private-libs.opam.template chrome-trace.opam.template))
-
 (env
  (_
   (flags :standard -alert -unstable)

diff --git a/dune-project b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.5)
+(lang dune 3.8)
 ;          ^^^
 ; When changing the version, don't forget to regenerate *.opam files
 ; by running [dune build].
@@ -10,6 +10,8 @@
 
 (strict_package_deps false)
 
+(opam_file_location inside_opam_directory)
+
 ; Reserved for Dune itself. This is to help with the bootstrap
 (using dune-bootstrap-info 0.1)
 

diff --git a/chrome-trace.opam → opam/chrome-trace.opam b/chrome-trace.opam → opam/chrome-trace.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "ocaml" {>= "4.08.0"}
   "odoc" {with-doc}
 ]

diff --git a/opam/dune b/opam/dune
@@ -0,0 +1,41 @@
+(rule
+ (copy dune-private-libs.opam.template dune-configurator.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-glob.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-action-plugin.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-build-info.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-site.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-rpc.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template stdune.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dyn.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template ordering.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-rpc-lwt.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template fiber.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template xdg.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template ocamlc-loc.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template chrome-trace.opam.template))
diff --git a/dune-action-plugin.opam → opam/dune-action-plugin.opam b/dune-action-plugin.opam → opam/dune-action-plugin.opam
@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "dune-glob" {= version}
   "csexp" {>= "1.5.0"}
   "ppx_expect" {with-test}

diff --git a/dune-build-info.opam → opam/dune-build-info.opam b/dune-build-info.opam → opam/dune-build-info.opam
@@ -16,7 +16,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]

diff --git a/dune-configurator.opam → opam/dune-configurator.opam b/dune-configurator.opam → opam/dune-configurator.opam
@@ -18,7 +18,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "ocaml" {>= "4.04.0"}
   "base-unix"
   "csexp" {>= "1.5.0"}

diff --git a/dune-glob.opam → opam/dune-glob.opam b/dune-glob.opam → opam/dune-glob.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "stdune" {= version}
   "dyn"
   "ordering"

diff --git a/dune-private-libs.opam → opam/dune-private-libs.opam b/dune-private-libs.opam → opam/dune-private-libs.opam
@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "csexp" {>= "1.5.0"}
   "pp" {>= "1.1.0"}
   "dyn" {= version}

diff --git a/dune-private-libs.opam.template → opam/dune-private-libs.opam.template b/dune-private-libs.opam.template → opam/dune-private-libs.opam.template
diff --git a/dune-rpc-lwt.opam → opam/dune-rpc-lwt.opam b/dune-rpc-lwt.opam → opam/dune-rpc-lwt.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "dune-rpc" {= version}
   "result" {>= "1.5"}
   "csexp" {>= "1.5.0"}

diff --git a/dune-rpc.opam → opam/dune-rpc.opam b/dune-rpc.opam → opam/dune-rpc.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "csexp"
   "ordering"
   "dyn"

diff --git a/dune-site.opam → opam/dune-site.opam b/dune-site.opam → opam/dune-site.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "dune-private-libs" {= version}
   "odoc" {with-doc}
 ]

diff --git a/dune.opam → opam/dune.opam b/dune.opam → opam/dune.opam
diff --git a/dune.opam.template → opam/dune.opam.template b/dune.opam.template → opam/dune.opam.template
diff --git a/dyn.opam → opam/dyn.opam b/dyn.opam → opam/dyn.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "ocaml" {>= "4.08.0"}
   "ordering" {= version}
   "pp" {>= "1.1.0"}

diff --git a/ocamlc-loc.opam → opam/ocamlc-loc.opam b/ocamlc-loc.opam → opam/ocamlc-loc.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "ocaml" {>= "4.08.0"}
   "dyn" {= version}
   "odoc" {with-doc}

diff --git a/ordering.opam → opam/ordering.opam b/ordering.opam → opam/ordering.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "ocaml" {>= "4.08.0"}
   "odoc" {with-doc}
 ]

diff --git a/stdune.opam → opam/stdune.opam b/stdune.opam → opam/stdune.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "ocaml" {>= "4.08.0"}
   "base-unix"
   "dyn" {= version}

diff --git a/xdg.opam → opam/xdg.opam b/xdg.opam → opam/xdg.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.8"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]