diff options
| author | Martin Desruisseaux <martin.desruisseaux@geomatys.com> | 2018-05-12 18:43:11 +0200 |
|---|---|---|
| committer | Martin Desruisseaux <martin.desruisseaux@geomatys.com> | 2018-05-12 18:43:11 +0200 |
| commit | 0f6b52eb186dbf813ccd3049806300c9c13931d2 (patch) | |
| tree | 0b082d78c08d840db2ef6fb762311db0e9942fe6 /jniwrap | |
| parent | 864b315f530cb26b3d9638b711c957baf0238d9e (diff) | |
| download | PROJ-0f6b52eb186dbf813ccd3049806300c9c13931d2.tar.gz PROJ-0f6b52eb186dbf813ccd3049806300c9c13931d2.zip | |
Be more careful about the files that we move to C 'src' directory:
since there is no header files starting with "org_" except JNI files,
moving the "org_*.h" file should guarantee that we will not overwrite
non-JNI file. The use of wildcard is for "org_osgeo_..." which may be
added in a future version.
This commit also opportunistically fixes minimum Ant version number
in documentation.
Diffstat (limited to 'jniwrap')
| -rw-r--r-- | jniwrap/README.md | 2 | ||||
| -rw-r--r-- | jniwrap/build.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jniwrap/README.md b/jniwrap/README.md index 5ff5a7fd..9cc97dac 100644 --- a/jniwrap/README.md +++ b/jniwrap/README.md @@ -56,7 +56,7 @@ Beyond the ones already put by PROJ, you need: * For compilation: * Java 9+, the Java standard development kit version 9 or above - * Ant 1.9.8+, to run the build. + * Ant 1.10+, to run the build. * For execution: * If a Java version less than the current version on the local machine is desired, add a `release` attribute in the `javac` task of `build.xml` before to compile. diff --git a/jniwrap/build.xml b/jniwrap/build.xml index 62eb536d..be82d411 100644 --- a/jniwrap/build.xml +++ b/jniwrap/build.xml @@ -27,7 +27,7 @@ <!-- Move the .h files generated by javac. --> <move todir="../src"> <fileset dir="${src}/${module}"> - <include name="**/*.h"/> + <include name="org_*.h"/> </fileset> </move> |