Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to (lang dune 3.0) #6154

Closed
wants to merge 1 commit into from
Closed

Upgrade to (lang dune 3.0) #6154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(lang dune 2.0)
(lang dune 3.0)
(name opam)

(implicit_transitive_deps true)
(using directory-targets 0.1)

(package (name opam-core))
(package (name opam-format))
Expand Down
2 changes: 1 addition & 1 deletion opam-client.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ depends: [
"opam-repository" {= version}
"re" {>= "1.10.0"}
"cmdliner" {>= "1.1.0"}
"dune" {>= "2.0.0"}
"dune" {>= "3.0.0"}
]
conflicts: [
"extlib" {< "1.7.8"}
Expand Down
2 changes: 1 addition & 1 deletion opam-core.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ depends: [
"base-unix"
"ocamlgraph"
"re" {>= "1.9.0"}
"dune" {>= "2.0.0"}
"dune" {>= "3.0.0"}
"sha" {>= "1.13"}
"jsonm"
"swhid_core"
Expand Down
2 changes: 1 addition & 1 deletion opam-devel.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ depends: [
"ocaml" {>= "4.08.0"}
"opam-client" {= version}
"cmdliner" {>= "1.1.0"}
"dune" {>= "2.0.0"}
"dune" {>= "3.0.0"}
"conf-openssl" {with-test}
"conf-diffutils" {with-test}
]
Expand Down
2 changes: 1 addition & 1 deletion opam-format.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ depends: [
"opam-core" {= version}
"opam-file-format" {>= "2.1.4"}
"re" {>= "1.9.0"}
"dune" {>= "2.0.0"}
"dune" {>= "3.0.0"}
]
2 changes: 1 addition & 1 deletion opam-installer.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ depends: [
"ocaml" {>= "4.08.0"}
"opam-format" {= version}
"cmdliner" {>= "0.9.8"}
"dune" {>= "2.0.0"}
"dune" {>= "3.0.0"}
]
2 changes: 1 addition & 1 deletion opam-repository.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ build: [
depends: [
"ocaml" {>= "4.08.0"}
"opam-format" {= version}
"dune" {>= "2.0.0"}
"dune" {>= "3.0.0"}
]
2 changes: 1 addition & 1 deletion opam-solver.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ depends: [
"dose3" {>= "6.1"}
"cudf" {>= "0.7"}
"re" {>= "1.9.0"}
"dune" {>= "2.0.0"}
"dune" {>= "3.0.0"}
"opam-0install-cudf" {>= "0.4"}
]
depopts: [
Expand Down
2 changes: 1 addition & 1 deletion opam-state.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ depends: [
"opam-repository" {= version}
"re" {>= "1.9.0"}
"spdx_licenses" {>= "1.0.0"}
"dune" {>= "2.0.0"}
"dune" {>= "3.0.0"}
]
60 changes: 30 additions & 30 deletions tests/reftests/dune.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1953,15 +1953,15 @@
(run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:working-dir.test} %{read-lines:testing-env}))))

(rule
(targets opam-repo-N0REP0)
(targets (dir opam-repo-N0REP0))
(action
(progn
(run mkdir -p %{targets}/packages)
(write-file repo "opam-version:\"2.0\"")
(run cp repo %{targets}/repo))))

(rule
(targets root-N0REP0)
(targets (dir root-N0REP0))
(deps opam-root-version)
(action
(progn
Expand All @@ -1975,14 +1975,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/0070613707.tar.gz)))

(rule
(targets opam-repo-0070613707)
(targets (dir opam-repo-0070613707))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-0070613707.tar.gz} --strip-components=1))))

(rule
(targets root-0070613707)
(targets (dir root-0070613707))
(deps opam-root-version)
(action
(progn
Expand All @@ -1996,14 +1996,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/009e00fa.tar.gz)))

(rule
(targets opam-repo-009e00fa)
(targets (dir opam-repo-009e00fa))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-009e00fa.tar.gz} --strip-components=1))))

(rule
(targets root-009e00fa)
(targets (dir root-009e00fa))
(deps opam-root-version)
(action
(progn
Expand All @@ -2017,14 +2017,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/11ea1cb.tar.gz)))

(rule
(targets opam-repo-11ea1cb)
(targets (dir opam-repo-11ea1cb))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-11ea1cb.tar.gz} --strip-components=1))))

(rule
(targets root-11ea1cb)
(targets (dir root-11ea1cb))
(deps opam-root-version)
(action
(progn
Expand All @@ -2038,14 +2038,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/297366c.tar.gz)))

(rule
(targets opam-repo-297366c)
(targets (dir opam-repo-297366c))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-297366c.tar.gz} --strip-components=1))))

(rule
(targets root-297366c)
(targets (dir root-297366c))
(deps opam-root-version)
(action
(progn
Expand All @@ -2059,14 +2059,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/3235916.tar.gz)))

(rule
(targets opam-repo-3235916)
(targets (dir opam-repo-3235916))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-3235916.tar.gz} --strip-components=1))))

(rule
(targets root-3235916)
(targets (dir root-3235916))
(deps opam-root-version)
(action
(progn
Expand All @@ -2080,14 +2080,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/7090735c.tar.gz)))

(rule
(targets opam-repo-7090735c)
(targets (dir opam-repo-7090735c))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-7090735c.tar.gz} --strip-components=1))))

(rule
(targets root-7090735c)
(targets (dir root-7090735c))
(deps opam-root-version)
(action
(progn
Expand All @@ -2101,14 +2101,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/7371c1d9.tar.gz)))

(rule
(targets opam-repo-7371c1d9)
(targets (dir opam-repo-7371c1d9))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-7371c1d9.tar.gz} --strip-components=1))))

(rule
(targets root-7371c1d9)
(targets (dir root-7371c1d9))
(deps opam-root-version)
(action
(progn
Expand All @@ -2122,14 +2122,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/a5d7cdc0.tar.gz)))

(rule
(targets opam-repo-a5d7cdc0)
(targets (dir opam-repo-a5d7cdc0))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-a5d7cdc0.tar.gz} --strip-components=1))))

(rule
(targets root-a5d7cdc0)
(targets (dir root-a5d7cdc0))
(deps opam-root-version)
(action
(progn
Expand All @@ -2143,14 +2143,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/ad4dd344.tar.gz)))

(rule
(targets opam-repo-ad4dd344)
(targets (dir opam-repo-ad4dd344))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-ad4dd344.tar.gz} --strip-components=1))))

(rule
(targets root-ad4dd344)
(targets (dir root-ad4dd344))
(deps opam-root-version)
(action
(progn
Expand All @@ -2164,14 +2164,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/c1842d168d.tar.gz)))

(rule
(targets opam-repo-c1842d168d)
(targets (dir opam-repo-c1842d168d))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-c1842d168d.tar.gz} --strip-components=1))))

(rule
(targets root-c1842d168d)
(targets (dir root-c1842d168d))
(deps opam-root-version)
(action
(progn
Expand All @@ -2185,14 +2185,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a.tar.gz)))

(rule
(targets opam-repo-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a)
(targets (dir opam-repo-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a.tar.gz} --strip-components=1))))

(rule
(targets root-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a)
(targets (dir root-c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a))
(deps opam-root-version)
(action
(progn
Expand All @@ -2206,14 +2206,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/c1d23f0e.tar.gz)))

(rule
(targets opam-repo-c1d23f0e)
(targets (dir opam-repo-c1d23f0e))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-c1d23f0e.tar.gz} --strip-components=1))))

(rule
(targets root-c1d23f0e)
(targets (dir root-c1d23f0e))
(deps opam-root-version)
(action
(progn
Expand All @@ -2227,14 +2227,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/de897adf36c4230dfea812f40c98223b31c4521a.tar.gz)))

(rule
(targets opam-repo-de897adf36c4230dfea812f40c98223b31c4521a)
(targets (dir opam-repo-de897adf36c4230dfea812f40c98223b31c4521a))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-de897adf36c4230dfea812f40c98223b31c4521a.tar.gz} --strip-components=1))))

(rule
(targets root-de897adf36c4230dfea812f40c98223b31c4521a)
(targets (dir root-de897adf36c4230dfea812f40c98223b31c4521a))
(deps opam-root-version)
(action
(progn
Expand All @@ -2248,14 +2248,14 @@
(action (run curl --silent -Lo %{targets} https://github.com/ocaml/opam-repository/archive/f372039d.tar.gz)))

(rule
(targets opam-repo-f372039d)
(targets (dir opam-repo-f372039d))
(action
(progn
(run mkdir -p %{targets})
(run tar -C %{targets} -xzf %{dep:opam-archive-f372039d.tar.gz} --strip-components=1))))

(rule
(targets root-f372039d)
(targets (dir root-f372039d))
(deps opam-root-version)
(action
(progn
Expand Down
6 changes: 3 additions & 3 deletions tests/reftests/gen.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ let archive_download_rule archive_hash =
let default_repo_rule =
Format.sprintf {|
(rule
(targets %s)
(targets (dir %s))
(action
(progn
(run mkdir -p %%{targets}/packages)
Expand All @@ -64,7 +64,7 @@ let default_repo_rule =
let archive_unpack_rule archive_hash =
Format.sprintf {|
(rule
(targets %s)
(targets (dir %s))
(action
(progn
(run mkdir -p %%{targets})
Expand All @@ -74,7 +74,7 @@ let archive_unpack_rule archive_hash =
let opam_init_rule archive_hash =
Format.sprintf {|
(rule
(targets %s)
(targets (dir %s))
(deps opam-root-version)
(action
(progn
Expand Down
Loading