Skip to content

Conversation

lindig
Copy link

@lindig lindig commented Jul 5, 2024

This is just some cleanup to access modern Dune features. If you prefer a different code formatting I can adjust to that, of course. I tried to pick something that is not controversial.

dune-project Outdated
"Implementation of the xenstore protocol in OCaml. This is an\n alternative implementation to the implementation in the Xen project.")
(depends
(dune
(>= "2.0"))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dune recommends to leave a dependency on dune out: it'll automatically add a dependency based on the 'lang' version declared in dune-project.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

opam-version: "2.0"
maintainer: "dave@recoil.org"
synopsis: "Xenstore protocol in pure OCam"
description: """
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There used to be a longer description here, see the previous .opam file, can we keep it?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh - missed it. Will fix

Christian Lindig added 2 commits July 5, 2024 12:04
* Move to Dune 2.0
* Generate OPam file from dune-project
* New Makefile target: format

Signed-off-by: Christian Lindig <christian.lindig@cloud.com>
Signed-off-by: Christian Lindig <christian.lindig@cloud.com>
Signed-off-by: Christian Lindig <christian.lindig@cloud.com>
Copy link
Collaborator

@edwintorok edwintorok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks good in general. I don't have a particular opinion on what ocamlformat settings should be used, what matters to me is that formatting is consistent within a project, and using ocamlformat ensures that.

If @freddy77 is working on more patches to ocaml-xenstore, then probably a good idea to rebase that work once this PR is merged to avoid conflicts due to formatting
(although not a big problem if a PR is created on the old code, we should be able to reformat the PR using the merge-fmt tool).

@freddy77
Copy link
Contributor

freddy77 commented Jul 5, 2024

Thanks, looks good in general. I don't have a particular opinion on what ocamlformat settings should be used, what matters to me is that formatting is consistent within a project, and using ocamlformat ensures that.

If @freddy77 is working on more patches to ocaml-xenstore, then probably a good idea to rebase that work once this PR is merged to avoid conflicts due to formatting (although not a big problem if a PR is created on the old code, we should be able to reformat the PR using the merge-fmt tool).

No problem merging this in, maximum I'll reformat my code too and rebase on it.

Comment on lines +23 to +24


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: why these empty lines?

@freddy77
Copy link
Contributor

freddy77 commented Nov 7, 2024

@lindig @edwintorok why this was not merged? Can we merge it ?

@edwintorok
Copy link
Collaborator

edwintorok commented Nov 7, 2024

I don't have permission to merge PRs on this repo, I'm not sure who does (this is an upstream Mirage project, not a XenServer or XAPI project). As you can see my tick is grey, instead of green.

@edwintorok
Copy link
Collaborator

edwintorok commented Nov 7, 2024

It looks like your previous PR got merged by @palainp, perhaps he can help merge this PR too?

@palainp
Copy link
Member

palainp commented Nov 7, 2024

Sorry all, I missed that one, I merge now :)

@palainp palainp merged commit 5afa2f9 into mirage:main Nov 7, 2024
1 check passed
@palainp
Copy link
Member

palainp commented Nov 7, 2024

Thank you!

And BTW, looking at #53 (comment), feel free to ping me when there are enough changes to cut a new release :)

psafont added a commit to psafont/opam-repository that referenced this pull request May 28, 2025
CHANGES:

* minor performance fixes (mirage/ocaml-xenstore#53 by freddy77)
* use dune 2.0 (mirage/ocaml-xenstore#54 by lindig)
* require OCaml 4.13 (mirage/ocaml-xenstore#56 by last-genius)
* Add support `XS_DIRECTORY_PART` to the client (mirage/ocaml-xenstore#55 by last-genius)
* Add x-maintenance-intent to opam  metadata (mirage/ocaml-xenstore#57 by hannesm)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants