Skip to content

Conversation

@redianthus
Copy link
Member

@redianthus
Copy link
Member Author

As you can see, I got rid of the Makefile, this allows to build everyting with dune and a small script in OCaml (src/libc/script.ml).

I also moved all the dune-site stuff directly where the files live (for instance we have a src/libc/include/dune now).

I also moved the instrumentor stuff into libc, it is not really related to the libc but let's say this folder is for all C related stuff.

@@ -1 +1,4 @@
available: (arch = "x86_32" | arch = "x86_64" | arch = "arm64") & os != "win32"
depexts: [
["llvm" "clang" "lld" "wabt"] {os-family = "debian"}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
["llvm" "clang" "lld" "wabt"] {os-family = "debian"}
["llvm" "clang" "lld" "wabt"] {os-family = "debian"}
["llvm" "wabt"] {os-family = "osx"}

CI is failing, and it appears to be because we're not specifying the dependencies here. However, I'm not quite sure if these are the only packages required for macOS. Additionally, I couldn't find mentions of lld or clang in Homebrew packages, so I assume they must be included in llvm.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks. I added this line directly myself as running dune b owi.opam was needed to generate the new owi.opam file...

Let's see if this is enough 😅

Copy link
Collaborator

Choose a reason for hiding this comment

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

This appears to have done nothing 😅

I was looking at the os-family available in here and perhaps wrongfully assumed osx would work. Inspecting the CI, it looks like it's looking for os-family = "homebrew"? I have no current way to test this tho, sorry.

...
# Detecting depexts using vars: arch=x86_64, os=macos, os-distribution=homebrew, os-family=homebrew
...

Copy link
Member Author

Choose a reason for hiding this comment

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

Well, still not. Let's merge as the CI is green on Linux. We'll fix macOS later.

Copy link
Collaborator

Choose a reason for hiding this comment

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

At least it's installing wabt and llvm not. But it's still saying opt: command not found

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes I saw... @krtab is going to have a look.

@redianthus redianthus changed the title add owi c command add owi c command and examples for all subcommands Jan 16, 2024
@redianthus
Copy link
Member Author

redianthus commented Jan 16, 2024

I removed the Quick-start section of the README and wrote a short example of all sub-commands we have. It is much better now IMO.

You can see how it renders on my fork.

@redianthus redianthus merged commit a0bf4d7 into OCamlPro:main Jan 16, 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