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.

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

use dune in the Makefile and remove ocamlbuild #1665

Merged
merged 23 commits into from
Jul 26, 2023

Conversation

zapashcanon
Copy link
Contributor

Hi,

As discussed in #1664, I switched everything from ocamlbuild to dune, I removed winmake.bat along the way. I made a lot of simplifications in the Makefile but also removed a few things: we don't build the bytecode version anymore and we don't copy the executable at the root anymore.

Copy link
Member

@rossberg rossberg left a comment

Choose a reason for hiding this comment

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

Changes look good mostly, but you may have been a bit over-aggressive in deleting stuff. At least I wouldn't know how to build the opam library package anymore after this. ;)

Is there a way to avoid and work around the renaming main.ml→wasm.ml? IMO it's bad design that dune assumes this.

interpreter/Makefile Outdated Show resolved Hide resolved
interpreter/README.md Outdated Show resolved Hide resolved
interpreter/Makefile Show resolved Hide resolved
interpreter/Makefile Show resolved Hide resolved
interpreter/README.md Show resolved Hide resolved
interpreter/Makefile Show resolved Hide resolved
@zapashcanon zapashcanon force-pushed the makefile branch 2 times, most recently from cd163ee to 4ee754b Compare June 20, 2023 17:27
@zapashcanon
Copy link
Contributor Author

Is there a way to avoid and work around the renaming main.ml→wasm.ml? IMO it's bad design that dune assumes this.

I did something for this. Everything should be OK now @rossberg. :)

Copy link
Member

@rossberg rossberg left a comment

Choose a reason for hiding this comment

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

Cool, thanks!

interpreter/Makefile Outdated Show resolved Hide resolved
interpreter/Makefile Show resolved Hide resolved
interpreter/Makefile Outdated Show resolved Hide resolved
interpreter/wasm.opam Show resolved Hide resolved
interpreter/.gitignore Show resolved Hide resolved
interpreter/Makefile Outdated Show resolved Hide resolved
Copy link
Member

@rossberg rossberg left a comment

Choose a reason for hiding this comment

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

Sorry, I had somehow lost this PR.

interpreter/Makefile Outdated Show resolved Hide resolved
interpreter/Makefile Show resolved Hide resolved
interpreter/wasm.opam Show resolved Hide resolved
@zapashcanon
Copy link
Contributor Author

It should be good now @rossberg ?

Copy link
Member

@rossberg rossberg left a comment

Choose a reason for hiding this comment

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

Thanks!

interpreter/Makefile Outdated Show resolved Hide resolved
interpreter/Makefile Outdated Show resolved Hide resolved
interpreter/Makefile Outdated Show resolved Hide resolved
interpreter/Makefile Outdated Show resolved Hide resolved
Co-authored-by: Andreas Rossberg <rossberg@mpi-sws.org>
interpreter/Makefile Outdated Show resolved Hide resolved
@rossberg rossberg merged commit 653938a into WebAssembly:main Jul 26, 2023
@rossberg
Copy link
Member

I merged it, thanks for taking this.

foolip added a commit to foolip/spec that referenced this pull request Oct 6, 2023
It ought to not be needed after WebAssembly#1665.
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