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

Jump to bottom

Fix the opam-devel package + various fixes #4229

Merged
merged 4 commits into from
Jul 10, 2020
Merged

Fix the opam-devel package + various fixes #4229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcfa2ab
Untag dune as a build dependency
kit-ty-kate Jun 10, 2020
5a1fabf
Revert "make: remove opam-%.install target"
kit-ty-kate Jun 10, 2020
47745d9
Fix compilation for opam-devel
kit-ty-kate Jun 10, 2020
f76ebdf
Add entries to changelog
kit-ty-kate Jun 30, 2020
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: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ opam-devel.install: $(DUNE_DEP)
$(DUNE) build $(DUNE_ARGS) -p opam opam.install
sed -e "s/bin:/libexec:/" opam.install > $@

opam-%.install: $(DUNE_DEP)
$(DUNE) build $(DUNE_ARGS) -p opam-$* $@

.PHONY: build-opam-installer
build-opam-installer: $(DUNE_DEP)
$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS)$(DUNE_PROMOTE_ARG) opam-installer.install
Expand Down
2 changes: 1 addition & 1 deletion master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Possibly scripts breaking changes are prefixed with ✘
* Fix atoms formula restriction with `--all` [#4221 @rjbou - fix #4218]

## Build
* Opam file build using dune, removal of opam-%.install makefile target [#4178 @rjbou - fix #4173]
* Opam file build using dune, removal of opam-%.install makefile target [#4178 @rjbou #4229 @kit-ty-kate - fix #4173]
* Use version var in opam file instead of equal current version number in opamlib dependencies [#4178 @rjbou]
* ext: fix extlib url [#4248 @rjbou]

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 @@ -27,6 +27,6 @@ depends: [
"opam-repository" {= version}
"re" {>= "1.9.0"}
"cmdliner" {>= "0.9.8"}
"dune" {build & >= "1.2.1"}
"dune" {>= "1.2.1"}
]
available: ocaml-version >= "4.02.3"
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 @@ -25,7 +25,7 @@ depends: [
"base-bigarray"
"ocamlgraph"
"re" {>= "1.9.0"}
"dune" {build & >= "1.2.1"}
"dune" {>= "1.2.1"}
"cppo" {build}
]
conflicts: "extlib-compat"
Expand Down
4 changes: 2 additions & 2 deletions opam-devel.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ bug-reports: "https://github.com/ocaml/opam/issues"
dev-repo: "https://github.com/ocaml/opam.git"
build: [
["./configure" "--disable-checks" "--prefix" prefix]
["dune" "build" "-p" name "-j" jobs]
[make "%{name}%.install"]
]
build-test: [make "tests"]
depends: [
"opam-client" {= version}
"cmdliner" {>= "0.9.8"}
"dune" {build & >= "1.2.1"}
"dune" {>= "1.2.1"}
]
post-messages: [
"The development version of opam has been successfully compiled into %{lib}%/%{name}%. You should not run it from there, please install the binaries to your PATH, e.g. with
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 @@ -23,6 +23,6 @@ build: [
depends: [
"opam-core" {= version}
"opam-file-format" {>= "2.0.0~rc2"}
"dune" {build & >= "1.2.1"}
"dune" {>= "1.2.1"}
]
available: ocaml-version >= "4.02.3"
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 @@ -23,6 +23,6 @@ build: [
depends: [
"opam-format" {= version}
"cmdliner" {>= "0.9.8"}
"dune" {build & >= "1.2.1"}
"dune" {>= "1.2.1"}
]
available: ocaml-version >= "4.02.3"
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 @@ -22,6 +22,6 @@ build: [
]
depends: [
"opam-format" {= version}
"dune" {build & >= "1.2.1"}
"dune" {>= "1.2.1"}
]
available: ocaml-version >= "4.02.3"
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 @@ -25,7 +25,7 @@ depends: [
"mccs" {>= "1.1+9"}
"dose3" {>= "5"}
"cudf" {>= "0.7"}
"dune" {build & >= "1.2.1"}
"dune" {>= "1.2.1"}
]
depopts: "z3"
conflicts: [ "z3" {< "4.8.4"} ]
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 @@ -22,6 +22,6 @@ build: [
]
depends: [
"opam-repository" {= version}
"dune" {build & >= "1.2.1"}
"dune" {>= "1.2.1"}
]
available: ocaml-version >= "4.02.3"