Revision: 6582
          http://sourceforge.net/p/jump-pilot/code/6582
Author:   edso
Date:     2020-10-06 19:59:37 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
setup gdal support for debian/ubuntu, installing libgdal-java should suffice 
now to have gdal image loaders up and running
working on osx support when gdal is installed via homebrew

Modified Paths:
--------------
    core/trunk/scripts/oj_linux.sh

Modified: core/trunk/scripts/oj_linux.sh
===================================================================
--- core/trunk/scripts/oj_linux.sh      2020-10-05 19:55:24 UTC (rev 6581)
+++ core/trunk/scripts/oj_linux.sh      2020-10-06 19:59:37 UTC (rev 6582)
@@ -266,19 +266,28 @@
 # allow jre to find executable binaries located under the native folder
 export PATH="$JUMP_NATIVE_DIR:$PATH"
 
-# generate gdal settings
-export GDAL_DATA="$JUMP_NATIVE_DIR/gdal-linux-data"
-GDALPATH="$JUMP_NATIVE_DIR/gdal-linux-$JAVA_ARCH"
-NATIVE_PATH="$GDALPATH:$GDALPATH/lib:$GDALPATH/java:$NATIVE_PATH"
-CLASSPATH="$GDALPATH/java/gdal.jar:$CLASSPATH"
-
 # export (DY)LD_LIBRARY_PATH depending on platform
 if [ "$(basename "$0")" = "oj_macosx.command" ]; then
-  ## Export environment variables for C-coded functions.
+  ## add lib/native/[arch/] to lib path
   export DYLD_LIBRARY_PATH="$NATIVE_PATH:$DYLD_LIBRARY_PATH"
   echo ---DYLD_LIBRARY_PATH---
   echo $DYLD_LIBRARY_PATH
 else
+  ## generate gdal & other native libs settings
+  GDALPATH="$JUMP_NATIVE_DIR/gdal-linux-$JAVA_ARCH"
+  # debian/ubuntu need package libgdal-java
+  # it keeps java bindings in /usr/share/java
+  # and jni libs in /usr/lib/jni, gdal-data in /usr/share/gdal
+  # let's add those locations for convenience sake but prefer lib/native
+  [ -e "$JUMP_NATIVE_DIR/gdal-linux-data" ] && \
+  export GDAL_DATA="$JUMP_NATIVE_DIR/gdal-linux-data" || \
+  export GDAL_DATA="/usr/share/gdal/"
+  echo ---GDAL_DATA---
+  echo $GDAL_DATA
+
+  
NATIVE_PATH="$GDALPATH:$GDALPATH/lib:$GDALPATH/java:$NATIVE_PATH:/usr/lib/jni"
+  CLASSPATH="$GDALPATH/java/gdal.jar:/usr/share/java/gdal.jar:$CLASSPATH"
+
   export LD_LIBRARY_PATH="$NATIVE_PATH:$LD_LIBRARY_PATH"
   echo ---LD_LIBRARY_PATH---
   echo $LD_LIBRARY_PATH



_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel

Reply via email to