From db44b0355fec5e6653443f59791ac09213536022 Mon Sep 17 00:00:00 2001 From: Sam Gillingham Date: Fri, 15 Dec 2023 11:07:10 +1000 Subject: [PATCH] get ready for version 1.5.3 --- ArcGIS/arcgis.iss | 2 +- ArcGIS/arcpro.iss | 2 +- CMakeLists.txt | 2 +- Changes.txt | 9 ++++++++ CreateDistribution.txt | 2 +- Dockerfile.buildgdal | 42 +++++++++++++++++++++++++++++++++++ ERDAS_Imagine/install2011.iss | 2 +- ERDAS_Imagine/install2015.iss | 2 +- 8 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 Dockerfile.buildgdal diff --git a/ArcGIS/arcgis.iss b/ArcGIS/arcgis.iss index 1121ad3..e6c2ec8 100644 --- a/ArcGIS/arcgis.iss +++ b/ArcGIS/arcgis.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "KEA for ArcGIS" -#define MyAppVersion "1.5.2" +#define MyAppVersion "1.5.3" #define MyAppPublisher "Landcare Research NZ" #define MyAppURL "http://kealib.org/" #define MyOutputFilename "setup_kea_arcgis_" + GetDateTimeString('yyyymmdd', '', '') diff --git a/ArcGIS/arcpro.iss b/ArcGIS/arcpro.iss index 780f8b6..a0214ff 100644 --- a/ArcGIS/arcpro.iss +++ b/ArcGIS/arcpro.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "KEA for ArcPro" -#define MyAppVersion "1.5.2" +#define MyAppVersion "1.5.3" #define MyAppPublisher "Landcare Research NZ" #define MyAppURL "http://kealib.org/" #define MyOutputFilename "setup_kea_arcpro_" + GetDateTimeString('yyyymmdd', '', '') diff --git a/CMakeLists.txt b/CMakeLists.txt index 90f64d6..ada21e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ set (PROJECT_GDAL_DIR gdal) # The version number. set (LIBKEA_VERSION_MAJOR 1) set (LIBKEA_VERSION_MINOR 5) -set (LIBKEA_VERSION_PATCH 2) +set (LIBKEA_VERSION_PATCH 3) set (LIBKEA_VERSION "${LIBKEA_VERSION_MAJOR}.${LIBKEA_VERSION_MINOR}.${LIBKEA_VERSION_PATCH}") set (LIBKEA_PACKAGE_VERSION "${LIBKEA_VERSION_MAJOR}.${LIBKEA_VERSION_MINOR}.${LIBKEA_VERSION_PATCH}") set (LIBKEA_PACKAGE_STRING "LibKEA ${LIBKEA_VERSION_MAJOR}.${LIBKEA_VERSION_MINOR}.${LIBKEA_VERSION_PATCH}") diff --git a/Changes.txt b/Changes.txt index 2e4ed74..84757d2 100644 --- a/Changes.txt +++ b/Changes.txt @@ -1,3 +1,12 @@ +1.5.3 +----- + +* Add support for /vsi file systems with GDAL support is built as a plugin +* Fix H5Cpp.h includes +* Fix Kealib interface target +* Export Kealib CMake package with Kealib::Kealib +* Add C++11 as build requirement in CMake + 1.5.2 ----- diff --git a/CreateDistribution.txt b/CreateDistribution.txt index 2e68d43..727cdcb 100644 --- a/CreateDistribution.txt +++ b/CreateDistribution.txt @@ -18,7 +18,7 @@ How to create a distribution of kealib. 6. Export an environment variable with the version to make the following commands easier UPDATE AS NEEDED: - export KEAVER=1.5.2 + export KEAVER=1.5.3 7. Use "git tag" to add a version number tag, e.g. diff --git a/Dockerfile.buildgdal b/Dockerfile.buildgdal new file mode 100644 index 0000000..257bee1 --- /dev/null +++ b/Dockerfile.buildgdal @@ -0,0 +1,42 @@ +FROM ubuntu:22.04 + +# Needed in case tzdata gets upgraded +ENV TZ=Australia/Brisbane +ARG DEBIAN_FRONTEND=noninteractive + +# Use Aussie mirrors +RUN sed -i 's/http:\/\/archive./http:\/\/au.archive./g' /etc/apt/sources.list + +# Update Ubuntu software stack and install base GDAL stack +RUN apt-get update +RUN apt-get upgrade -y +RUN apt-get install -y wget g++ cmake libhdf5-dev libproj-dev libgeos-dev + +RUN apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* + +COPY . /tmp/kealib +RUN cd /tmp/kealib \ + && mkdir build \ + && cd build \ + && cmake .. \ + && make -j2 \ + && make install \ + && cd ../.. \ + && rm -rf kealib + +RUN cd /tmp \ + && wget https://github.com/OSGeo/gdal/releases/download/v3.8.1/gdal-3.8.1.tar.gz \ + && tar xf gdal-3.8.1.tar.gz \ + && cd gdal-3.8.1 \ + && mkdir build \ + && cd build \ + && cmake .. \ + && make -j2 \ + && make install \ + && cd .. \ + && rm -rf gdal-3.8.1 gdal-3.8.1.tar.gz + +ENV LD_LIBRARY_PATH=/usr/local/lib +#ENV GDAL_DRIVER_PATH=/usr/local/lib/gdalplugins +RUN which gdal_translate +RUN gdal_translate --formats | grep KEA diff --git a/ERDAS_Imagine/install2011.iss b/ERDAS_Imagine/install2011.iss index 806dfe2..e5bec64 100644 --- a/ERDAS_Imagine/install2011.iss +++ b/ERDAS_Imagine/install2011.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "KEA for ERDAS Imagine" -#define MyAppVersion "1.5.2" +#define MyAppVersion "1.5.3" #define MyAppPublisher "Landcare Research NZ" #define MyAppURL "http://kealib.org/" #define MyOutputFilename "setup_kea_erdas2011_" + GetDateTimeString('yyyymmdd', '', '') diff --git a/ERDAS_Imagine/install2015.iss b/ERDAS_Imagine/install2015.iss index bbba1d9..43f4a4e 100644 --- a/ERDAS_Imagine/install2015.iss +++ b/ERDAS_Imagine/install2015.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "KEA for ERDAS Imagine" -#define MyAppVersion "1.5.2" +#define MyAppVersion "1.5.3" #define MyAppPublisher "Landcare Research NZ" #define MyAppURL "http://kealib.org/" #define MyOutputFilename "setup_kea_erdas2015_" + GetDateTimeString('yyyymmdd', '', '')