Port to jbuilder and resync with djs55 repo #3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,4 @@ | ||
| _build/ | ||
| .merlin | ||
| *.install | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| language: c | ||
| sudo: false | ||
| services: | ||
| - docker | ||
| install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh | ||
| script: bash -ex ./.travis-docker.sh | ||
| env: | ||
| global: | ||
| - PACKAGE="fd-send-recv" | ||
| matrix: | ||
| - DISTRO="debian-testing" OCAML_VERSION="4.02.3" | ||
| - DISTRO="ubuntu-14.04" OCAML_VERSION="4.02.3" | ||
| - DISTRO="ubuntu-15.10" OCAML_VERSION="4.02.3" | ||
| - DISTRO="centos-7" OCAML_VERSION="4.02.3" | ||
| - DISTRO="centos-6" OCAML_VERSION="4.02.3" | ||
| - DISTRO="fedora-23" OCAML_VERSION="4.02.3" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,24 @@ | ||
| .PHONY: build release install uninstall clean test doc | ||
|
|
||
| build: | ||
| jbuilder build @install --dev | ||
|
|
||
| release: | ||
| jbuilder build @install | ||
|
|
||
| install: | ||
| jbuilder install | ||
|
|
||
| uninstall: | ||
| jbuilder uninstall | ||
|
|
||
| clean: | ||
| jbuilder clean | ||
|
|
||
| test: | ||
| jbuilder runtest | ||
|
|
||
| # requires odoc | ||
| doc: | ||
| jbuilder build @doc | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| opam-version: "1.2" | ||
| maintainer: "dave@recoil.org" | ||
| authors: [ | ||
| "David Scott" | ||
| "David Sheets" | ||
| "Euan Harris" | ||
| "Vincent Bernardoff" | ||
| ] | ||
| homepage: "https://github.com/xapi-project/ocaml-fd-send-recv" | ||
| bug-reports: "https://github.com/xapi-project/ocaml-fd-send-recv/issues" | ||
| dev-repo: "https://github.com/xapi-project/ocaml-fd-send-recv.git" | ||
| doc: "https://github.com/xapi-project/ocaml-fd-send-recv/blob/master/lib/fd_send_recv.mli" | ||
|
|
||
| tags: [ | ||
| "org:mirage" | ||
| "org:xapi-project" | ||
| ] | ||
| build: [["jbuilder" "build" "-p" name "-j" jobs]] | ||
| build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]] | ||
| depends: [ | ||
| "jbuilder" {build} | ||
| ] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| (library | ||
| ((name fd_send_recv) | ||
| (public_name fd-send-recv) | ||
| (c_names (fd_send_recv_stubs)) | ||
| (libraries (unix)) | ||
| )) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's interesting that we have a separate opam file for the tuntap tests, but I guess this is the best way, since optional dependencies are harmful.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it's annoying but I thought it does no harm. And I like it more than generating additional stuff in the
jbuildfile if a flag is present (mostly because it requires an additional dependency)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree. It's much better than causing loads of unnecessary recompilations.