Skip to content

Conversation

@edwintorok
Copy link
Contributor

Use the simplest solution: copy *.opam to *.opam.template so that we get exactly the same opam files as before, and only declare the names in dune-project.

This will allow us to merge subprojects that already use dune-project to generate opam files (such as xapi-stdext), and we can gradually move opam files to be generated by dune. However first we should drop the opam files that we do not need, which will be partially done in #4939

This is best reviewed using git log -1 --stat which shows that all the .opam.template files are copies:

cohttp-posix.opam                                                       |   2 ++
 cohttp-posix.opam => cohttp-posix.opam.template                         |   0
 dune-project                                                            | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 ezxenstore.opam                                                         |   2 ++
 ezxenstore.opam => ezxenstore.opam.template                             |   0
 forkexec.opam                                                           |   2 ++
 forkexec.opam => forkexec.opam.template                                 |   0
 gzip.opam                                                               |   2 ++
 gzip.opam => gzip.opam.template                                         |   0
[....]

(there are 2 files where there is a 16 line diff, it looks like the old opam files lacked a 'build' rule).

Use the simplest solution: copy *.opam to *.opam.template so that we get exactly the same opam files as before,
and only declare the names in dune-project.

This will allow us to merge subprojects that already use dune-project to generate opam files (such as xapi-stdext),
and we can gradually move opam files to be generated by dune.
However first we should drop the opam files that we do not need,
which will be partially done in xapi-project#4939

Signed-off-by: Edwin Török <edwin.torok@cloud.com>
@lindig lindig self-requested a review January 22, 2024 15:14
Copy link
Contributor

@lindig lindig left a comment

Choose a reason for hiding this comment

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

With this approach we can gradually move information into the dune files and give up the templates.

@edwintorok edwintorok merged commit 2a991fe into xapi-project:master Jan 22, 2024
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.

3 participants