Skip to content

Commit

Permalink
chore: Update GDAL to 3.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
REASY committed Aug 23, 2023
1 parent 7a36300 commit a119e31
Show file tree
Hide file tree
Showing 33 changed files with 77 additions and 79 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ repositories {

dependencies {
implementation group: 'net.java.dev.jna', name: 'jna', version: '5.13.0'
implementation files("libs/gdal-3.5.3.jar",
"libs/gdal-3.5.3-javadoc.jar",
"libs/gdal-3.5.3-sources.jar"
implementation files("libs/gdal-3.6.4.jar",
"libs/gdal-3.6.4-javadoc.jar",
"libs/gdal-3.6.4-sources.jar"
)
}

Expand Down
3 changes: 0 additions & 3 deletions libs/gdal-3.5.3-javadoc.jar

This file was deleted.

3 changes: 0 additions & 3 deletions libs/gdal-3.5.3-sources.jar

This file was deleted.

3 changes: 0 additions & 3 deletions libs/gdal-3.5.3.jar

This file was deleted.

3 changes: 3 additions & 0 deletions libs/gdal-3.6.4-javadoc.jar
Git LFS file not shown
3 changes: 3 additions & 0 deletions libs/gdal-3.6.4-sources.jar
Git LFS file not shown
3 changes: 3 additions & 0 deletions libs/gdal-3.6.4.jar
Git LFS file not shown
10 changes: 4 additions & 6 deletions scripts/generate_native_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,20 @@ esac

export SCRIPT_DIR

PROJ_VERSION="9.1.1"
GDAL_VERSION="3.5.3"
PROJ_VERSION="9.2.1"
GDAL_VERSION="3.6.4"

# Build GDAL
"${SCRIPT_DIR}/build_gdal.sh" $PROJ_VERSION $GDAL_VERSION

docker run -it --entrypoint /bin/bash -u $(id -u):$(id -g) \
-v $(pwd)/libs:/java_libs \
docker run -it --entrypoint /bin/bash -v $(pwd)/libs:/java_libs \
qartez-engine/gdal:"$GDAL_VERSION" -c "cp /usr/share/java/gdal-*.jar /java_libs/"

# Build lddtopo
"${SCRIPT_DIR}/build_lddtopo.sh" $GDAL_VERSION

# Analyze dependencies, build DAG, run toposort and copy them to /resource folder
docker run -u $(id -u):$(id -g) \
-v $(pwd)/src/main/resources/:/resources qartez-engine/lddtopo:"$GDAL_VERSION" /usr/share/java/libgdalalljni.so /resources
docker run -v $(pwd)/src/main/resources/:/resources qartez-engine/lddtopo:"$GDAL_VERSION" /usr/share/java/libgdalalljni.so /resources

# Build and test GDAL native library
lib_name=$(./gradlew properties | grep ^name | sed 's/name: //g')
Expand Down
64 changes: 32 additions & 32 deletions src/main/resources/native/linux-x86-64.txt
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
libicudata.so.66
libkeyutils.so.1
libnettle.so.7
liblber-2.4.so.2
libbrotlicommon.so.1
libjpeg.so.8
libbrotlidec.so.1
libffi.so.7
libjbig.so.0
libgmp.so.10
libnghttp2.so.14
libhogweed.so.5
libtasn1.so.6
libresolv.so.2
libz.so.1
libpng16.so.16
liblzma.so.5
libwebp.so.6
libopenjp2.so.7
libfreexl.so.1
libheimbase.so.1
libcom_err.so.2
libnghttp2.so.14
libexpat.so.1
libcrypt.so.1
libbrotlicommon.so.1
libgcc_s.so.1
libunistring.so.2
libidn2.so.0
libpsl.so.5
libjbig.so.0
libtasn1.so.6
libresolv.so.2
libfreexl.so.1
libroken.so.18
libnettle.so.7
libhogweed.so.5
libbrotlidec.so.1
libwind.so.0
libasn1.so.8
libdl.so.2
libkrb5support.so.0
libk5crypto.so.3
libsqlite3.so.0
liblzma.so.5
libgcc_s.so.1
libsasl2.so.2
libzstd.so.1
libp11-kit.so.0
libgnutls.so.30
liblber-2.4.so.2
librtmp.so.1
libcrypto.so.1.1
libssl.so.1.1
libexpat.so.1
libjpeg.so.8
libcom_err.so.2
libwind.so.0
libasn1.so.8
libkrb5support.so.0
libk5crypto.so.3
libkrb5.so.3
libheimbase.so.1
libgssapi_krb5.so.2
libssh.so.4
libhcrypto.so.4
libhx509.so.5
libsasl2.so.2
libopenjp2.so.7
libkrb5.so.26
libzstd.so.1
libtiff.so.5
libheimntlm.so.0
libgssapi.so.3
libldap_r-2.4.so.2
libz.so.1
libpng16.so.16
librtmp.so.1
libtiff.so.5
libgssapi_krb5.so.2
libpq.so.5
libssh.so.4
libcurl-gnutls.so.4
libproj.so.15
libicuuc.so.66
libxml2.so.2
libproj.so.15
libxerces-c-3.2.so
libgeos-3.8.0.so
libgeos_c.so.1
libspatialite.so.7
libproj.so.25
libgdal.so.31
libxerces-c-3.2.so
libgdal.so.32
libgdalalljni.so
4 changes: 2 additions & 2 deletions src/main/resources/native/linux-x86-64/libasn1.so.8
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libcrypto.so.1.1
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libcurl-gnutls.so.4
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libgcc_s.so.1
Git LFS file not shown
3 changes: 0 additions & 3 deletions src/main/resources/native/linux-x86-64/libgdal.so.31

This file was deleted.

3 changes: 3 additions & 0 deletions src/main/resources/native/linux-x86-64/libgdal.so.32
Git LFS file not shown
4 changes: 2 additions & 2 deletions src/main/resources/native/linux-x86-64/libgdalalljni.so
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libgnutls.so.30
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libgssapi.so.3
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libgssapi_krb5.so.2
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libhx509.so.5
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libk5crypto.so.3
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libkrb5.so.26
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libkrb5.so.3
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libkrb5support.so.0
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libnghttp2.so.14
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libpq.so.5
Git LFS file not shown
4 changes: 2 additions & 2 deletions src/main/resources/native/linux-x86-64/libproj.so.25
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libssh.so.4
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libssl.so.1.1
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libtiff.so.5
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libwebp.so.6
Git LFS file not shown
2 changes: 1 addition & 1 deletion src/main/resources/native/linux-x86-64/libxml2.so.2
Git LFS file not shown
4 changes: 2 additions & 2 deletions src/main/resources/proj/proj.db
Git LFS file not shown

0 comments on commit a119e31

Please sign in to comment.