aboutsummaryrefslogtreecommitdiff
path: root/jniwrap
diff options
context:
space:
mode:
authorMartin Desruisseaux <martin.desruisseaux@geomatys.com>2018-05-12 16:25:54 +0200
committerMartin Desruisseaux <martin.desruisseaux@geomatys.com>2018-05-12 16:25:54 +0200
commit54f0513aed8a82e75f6442b4b03900c47f1c3621 (patch)
tree504f2654b7af561a108c149f69285738fd882090 /jniwrap
parent1830abc903c74b228de918a2830324006df7176a (diff)
downloadPROJ-54f0513aed8a82e75f6442b4b03900c47f1c3621.tar.gz
PROJ-54f0513aed8a82e75f6442b4b03900c47f1c3621.zip
Set the "PROJ bridge to JNI" version number to 3.0 and document its relationship with PROJ version number.
Diffstat (limited to 'jniwrap')
-rw-r--r--jniwrap/README.md20
-rw-r--r--jniwrap/build.xml7
2 files changed, 23 insertions, 4 deletions
diff --git a/jniwrap/README.md b/jniwrap/README.md
index e5748cda..d8435725 100644
--- a/jniwrap/README.md
+++ b/jniwrap/README.md
@@ -3,13 +3,30 @@
This is the third release of JNI wrappers for the main PROJ functions.
The first release of JNI wrappers were created by http://www.hydrologis.com.
The second release of JNI wrappers were created by http://www.geoapi.org.
+This release is compatible with any PROJ versions from 4.9 to 5
+provided that PROJ has been compiled as described below.
## What is "PROJ bridge to Java"
-_Proj bridge to Java_ is a small library of Java classes that wrap a few PROJ functions
+_PROJ bridge to Java_ is a small library of Java classes that wrap a few PROJ functions
by using the Java Native Interface (JNI). The main Java class is `org.proj4.PJ`.
+A Java code example is given in the _Usage & a fast example_ section below.
+
+
+
+### Versions
+
+The PROJ bridge to Java does not follow the same version numbers than the main PROJ library
+since the same JAR file can be compatible with a range of PROJ versions.
+Version compatibility is given below:
+
+
+Java bridge | Compatible with PROJ library
+----------- | ----------------------------
+2.0 and 3.0 | 4.9 to 5+
+1.0 | 4.4.9 to 4.8
@@ -43,6 +60,7 @@ Beyond the ones already put by PROJ, you need:
* 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.
+ * Proj version 4.9 or more recent compiled with the `--with-jni` option.
diff --git a/jniwrap/build.xml b/jniwrap/build.xml
index 6e4703ec..62eb536d 100644
--- a/jniwrap/build.xml
+++ b/jniwrap/build.xml
@@ -9,7 +9,7 @@
<property name="classes" value="${out}/classes"/>
<property name="javadoc" value="${out}/apidocs"/>
<property name="module" value="org.osgeo.proj"/>
- <property name="version" value="5.1"/>
+ <property name="version" value="3.0"/> <!-- See "Versions" section in README.md -->
<!-- *******************************************
Compile (default target).
@@ -20,8 +20,9 @@
<mkdir dir="${classes}"/>
<javac modulesourcepath="${src}" destdir="${classes}" encoding="UTF-8" nativeheaderdir="${src}"
createMissingPackageInfoClass = "false"
- includeAntRuntime = "false"
- includes = "org/**/*.java"/>
+ includeAntRuntime = "false">
+ <compilerarg line="--module-version ${version}"/>
+ </javac>
<!-- Move the .h files generated by javac. -->
<move todir="../src">