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

Update the JNI build, without API change for now #957

Merged
merged 5 commits into from Apr 30, 2018

Conversation

Projects
None yet
2 participants
@desruisseaux
Contributor

desruisseaux commented Apr 27, 2018

This is a first round of #903 task without API change yet. It includes a port of a bug fix provided by Even Rouault with opengeospatial/geoapi#26, together with an upgrade of the build system:

  • Invocation of javah is no longer necessary (this is now part of javac).
  • Replacement of doxygen by javadoc for generating the Java documentation.

The README file has been updated accordingly and opportunistically migrated to Markdown syntax for better integration with GitHub.

desruisseaux added some commits Apr 27, 2018

Apply the opengeospatial/geoapi#26 patch.
Update contributor names in copyright header.
Update the Ant build.xml script for:
- Generating the C header file during javac task.
- Provide more accurate information in META-INF/MANIFEST.MF.
- Merge tasks intended to be executed together.

The src/org_proj4_PJ.h file has been re-generated with the most recent Java compiler.
Renamed jniwrap/README as README.md for better integration with GitHub.
Reformatted the README.md content for Markdown syntax.
Updated some content to reflect the changes applied in build.xml file.

@kbevers kbevers merged commit da677f2 into OSGeo:master Apr 30, 2018

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 77.524%
Details

@kbevers kbevers added this to the 5.1.0 milestone Apr 30, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment