Skip to content

Do not export unnecessary symbols + port to dune + Windows fixes#42

Merged
djs55 merged 4 commits intodjs55:masterfrom
nojb:master
Feb 7, 2020
Merged

Do not export unnecessary symbols + port to dune + Windows fixes#42
djs55 merged 4 commits intodjs55:masterfrom
nojb:master

Conversation

@nojb
Copy link
Copy Markdown
Contributor

@nojb nojb commented Jul 15, 2019

Hello!

I made a number of small fixes to ocaml-sha which you may be interested in integrating:

  1. it turns out that some of the symbols in sha{1,256,512}c.c clash with symbols exported by camlpdf, which makes it impossible to link both together. To work around this issue I inline sha{1,256,512}c.c inside the header sha{1,256,512}.h and declare all functions to be static. The files are small enough that this is not too messy.

  2. Port to dune from jbuilder

  3. Some Windows fixes which allow to compile on Windows out-of-the-box.

Thanks!

nojb added 3 commits July 15, 2019 18:01
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@XVilka
Copy link
Copy Markdown

XVilka commented Nov 25, 2019

With dune 2.0 integration sha blocks dune upgrade by depending on jbuilder.transition. So merging this PR is very important.

@XVilka
Copy link
Copy Markdown

XVilka commented Jan 22, 2020

Could you please fix the opam file too?

+ opam lint -
[WARNING] Failed checks on sha package definition from source at file:///tmp/opam-ci-192:
             error 57: Synopsis and description must not be both empty
Errors.
             error 57: Synopsis and description must not be both empty
'unset TESTS; OPAMYES=1 export OPAMYES; set -uex; cp sha.opam /tmp/opam-ci-192 && opam show /tmp/opam-ci-192 --raw | opam lint -' exited 1. Terminating with 1
The command "bash ./.travis-docker.sh" exited with 1.

@djs55 ping?

@nojb
Copy link
Copy Markdown
Contributor Author

nojb commented Jan 22, 2020

Could you please fix the opam file too?

Fixed, thanks.

@XVilka
Copy link
Copy Markdown

XVilka commented Jan 22, 2020

Still missing the description or synopsis though.

@andyli
Copy link
Copy Markdown

andyli commented Feb 7, 2020

Can this be prioritized? The latest version of dune gives error for jbuilder projects.

Error: jbuild files are no longer supported, please convert this file to a
dune file instead.
Note: You can use "dune upgrade" to convert your project to dune.

@djs55
Copy link
Copy Markdown
Owner

djs55 commented Feb 7, 2020

Thanks and sorry for the delay. I'll merge this and see what else needs to be done before a release.

@djs55 djs55 merged commit db5da34 into djs55:master Feb 7, 2020
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