This repository has been archived by the owner on Nov 26, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 27
switch to dune #45
Open
cyberhuman
wants to merge
5
commits into
dsheets:master
Choose a base branch
from
ahrefs:dune
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+167
−182
Open
switch to dune #45
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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,5 +1,2 @@ | ||
_build/ | ||
*.native | ||
*.byte | ||
setup.log | ||
setup.data | ||
/_build/ | ||
.merlin |
This file contains 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,2 @@ | ||
(lang dune 1.5) | ||
(name sodium) |
This file contains 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,12 @@ | ||
(library | ||
(name sodium) | ||
(public_name sodium) | ||
(libraries ctypes sodium.storage sodium.generated) | ||
(c_library_flags :standard -lsodium) | ||
(modules :standard \ sodium_storage)) | ||
|
||
(library | ||
(name sodium_storage) | ||
(public_name sodium.storage) | ||
(libraries ctypes) | ||
(modules sodium_storage)) |
This file was deleted.
Oops, something went wrong.
This file contains 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 was deleted.
Oops, something went wrong.
This file contains 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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains 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,55 @@ | ||
(library | ||
(name sodium_generated) | ||
(public_name sodium.generated) | ||
(libraries ctypes.stubs sodium_bindings) | ||
(modules sodium_generated) | ||
(c_names sodium_stubs)) | ||
|
||
(library | ||
(name sodium_bindings) | ||
(public_name sodium.bindings) | ||
(libraries ctypes sodium_storage sodium_types) | ||
(modules sodium_bindings sodium_types_detected)) | ||
|
||
(library | ||
(name sodium_types) | ||
(public_name sodium.types) | ||
(libraries ctypes) | ||
(modules sodium_types)) | ||
|
||
(executable | ||
(name sodium_bindgen) | ||
(libraries ctypes ctypes.stubs sodium_bindings sodium_storage) | ||
(modules sodium_bindgen) | ||
(flags :standard -w -33)) | ||
|
||
(executable | ||
(name sodium_typegen) | ||
(libraries ctypes ctypes.stubs sodium_types) | ||
(modules sodium_typegen) | ||
(flags :standard -w -33)) | ||
|
||
(rule | ||
(targets sodium_types_detect.c) | ||
(action | ||
(run ./sodium_typegen.bc))) | ||
|
||
(rule | ||
(deps sodium_types_detect.c) | ||
(targets sodium_types_detect) | ||
(action (bash "cc -I \"$(ocamlfind query ctypes)\" -I \"$(ocamlc -where)\" -o sodium_types_detect sodium_types_detect.c"))) | ||
|
||
(rule | ||
(deps sodium_types_detect) | ||
(targets sodium_types_detected.ml) | ||
(action | ||
(with-stdout-to | ||
sodium_types_detected.ml | ||
(progn | ||
(echo "[@@@warning \"-9-27\"]") | ||
(run ./sodium_types_detect))))) | ||
|
||
(rule | ||
(targets sodium_generated.ml sodium_stubs.c) | ||
(action | ||
(run ./sodium_bindgen.bc))) |
This file contains 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 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 was deleted.
Oops, something went wrong.
This file contains 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,14 @@ | ||
(executable | ||
(name test_sodium) | ||
(libraries oUnit sodium) | ||
(flags :standard -w -27)) | ||
|
||
(alias | ||
(name runtest) | ||
(deps nacl_runner) | ||
(action (run ./test_sodium.exe))) | ||
|
||
(rule | ||
(deps nacl_runner.c) | ||
(targets nacl_runner) | ||
(action (bash "cc -lsodium -o nacl_runner nacl_runner.c"))) |
This file contains 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 was deleted.
Oops, something went wrong.
This file contains 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,67 @@ | ||
lib: [ | ||
"_build/install/default/lib/sodium/META" {"META"} | ||
"_build/install/default/lib/sodium/bindings/sodium.bindings.dune" {"bindings/sodium.bindings.dune"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings.a" {"bindings/sodium_bindings.a"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings.cma" {"bindings/sodium_bindings.cma"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings.cmi" {"bindings/sodium_bindings.cmi"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings.cmt" {"bindings/sodium_bindings.cmt"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings.cmx" {"bindings/sodium_bindings.cmx"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings.cmxa" {"bindings/sodium_bindings.cmxa"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings.cmxs" {"bindings/sodium_bindings.cmxs"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings.ml" {"bindings/sodium_bindings.ml"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings__.cmi" {"bindings/sodium_bindings__.cmi"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings__.cmt" {"bindings/sodium_bindings__.cmt"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings__.cmx" {"bindings/sodium_bindings__.cmx"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings__.ml" {"bindings/sodium_bindings__.ml"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings__Sodium_types_detected.cmi" {"bindings/sodium_bindings__Sodium_types_detected.cmi"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings__Sodium_types_detected.cmt" {"bindings/sodium_bindings__Sodium_types_detected.cmt"} | ||
"_build/install/default/lib/sodium/bindings/sodium_bindings__Sodium_types_detected.cmx" {"bindings/sodium_bindings__Sodium_types_detected.cmx"} | ||
"_build/install/default/lib/sodium/bindings/sodium_types_detected.ml" {"bindings/sodium_types_detected.ml"} | ||
"_build/install/default/lib/sodium/generated/libsodium_generated_stubs.a" {"generated/libsodium_generated_stubs.a"} | ||
"_build/install/default/lib/sodium/generated/sodium.generated.dune" {"generated/sodium.generated.dune"} | ||
"_build/install/default/lib/sodium/generated/sodium_generated.a" {"generated/sodium_generated.a"} | ||
"_build/install/default/lib/sodium/generated/sodium_generated.cma" {"generated/sodium_generated.cma"} | ||
"_build/install/default/lib/sodium/generated/sodium_generated.cmi" {"generated/sodium_generated.cmi"} | ||
"_build/install/default/lib/sodium/generated/sodium_generated.cmt" {"generated/sodium_generated.cmt"} | ||
"_build/install/default/lib/sodium/generated/sodium_generated.cmx" {"generated/sodium_generated.cmx"} | ||
"_build/install/default/lib/sodium/generated/sodium_generated.cmxa" {"generated/sodium_generated.cmxa"} | ||
"_build/install/default/lib/sodium/generated/sodium_generated.cmxs" {"generated/sodium_generated.cmxs"} | ||
"_build/install/default/lib/sodium/generated/sodium_generated.ml" {"generated/sodium_generated.ml"} | ||
"_build/install/default/lib/sodium/opam" {"opam"} | ||
"_build/install/default/lib/sodium/sodium.a" {"sodium.a"} | ||
"_build/install/default/lib/sodium/sodium.cma" {"sodium.cma"} | ||
"_build/install/default/lib/sodium/sodium.cmi" {"sodium.cmi"} | ||
"_build/install/default/lib/sodium/sodium.cmt" {"sodium.cmt"} | ||
"_build/install/default/lib/sodium/sodium.cmti" {"sodium.cmti"} | ||
"_build/install/default/lib/sodium/sodium.cmx" {"sodium.cmx"} | ||
"_build/install/default/lib/sodium/sodium.cmxa" {"sodium.cmxa"} | ||
"_build/install/default/lib/sodium/sodium.cmxs" {"sodium.cmxs"} | ||
"_build/install/default/lib/sodium/sodium.dune" {"sodium.dune"} | ||
"_build/install/default/lib/sodium/sodium.ml" {"sodium.ml"} | ||
"_build/install/default/lib/sodium/sodium.mli" {"sodium.mli"} | ||
"_build/install/default/lib/sodium/storage/sodium.storage.dune" {"storage/sodium.storage.dune"} | ||
"_build/install/default/lib/sodium/storage/sodium_storage.a" {"storage/sodium_storage.a"} | ||
"_build/install/default/lib/sodium/storage/sodium_storage.cma" {"storage/sodium_storage.cma"} | ||
"_build/install/default/lib/sodium/storage/sodium_storage.cmi" {"storage/sodium_storage.cmi"} | ||
"_build/install/default/lib/sodium/storage/sodium_storage.cmt" {"storage/sodium_storage.cmt"} | ||
"_build/install/default/lib/sodium/storage/sodium_storage.cmx" {"storage/sodium_storage.cmx"} | ||
"_build/install/default/lib/sodium/storage/sodium_storage.cmxa" {"storage/sodium_storage.cmxa"} | ||
"_build/install/default/lib/sodium/storage/sodium_storage.cmxs" {"storage/sodium_storage.cmxs"} | ||
"_build/install/default/lib/sodium/storage/sodium_storage.ml" {"storage/sodium_storage.ml"} | ||
"_build/install/default/lib/sodium/types/sodium.types.dune" {"types/sodium.types.dune"} | ||
"_build/install/default/lib/sodium/types/sodium_types.a" {"types/sodium_types.a"} | ||
"_build/install/default/lib/sodium/types/sodium_types.cma" {"types/sodium_types.cma"} | ||
"_build/install/default/lib/sodium/types/sodium_types.cmi" {"types/sodium_types.cmi"} | ||
"_build/install/default/lib/sodium/types/sodium_types.cmt" {"types/sodium_types.cmt"} | ||
"_build/install/default/lib/sodium/types/sodium_types.cmx" {"types/sodium_types.cmx"} | ||
"_build/install/default/lib/sodium/types/sodium_types.cmxa" {"types/sodium_types.cmxa"} | ||
"_build/install/default/lib/sodium/types/sodium_types.cmxs" {"types/sodium_types.cmxs"} | ||
"_build/install/default/lib/sodium/types/sodium_types.ml" {"types/sodium_types.ml"} | ||
] | ||
doc: [ | ||
"_build/install/default/doc/sodium/CHANGES" | ||
"_build/install/default/doc/sodium/README.md" | ||
] | ||
stublibs: [ | ||
"_build/install/default/lib/stublibs/dllsodium_generated_stubs.so" | ||
] |
This file contains 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
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.
this file should not be commited?