[Git][debian-gis-team/gdal-grass][upstream] New upstream version 3.5.0~rc1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri May 6 20:33:40 BST 2022
Bas Couwenberg pushed to branch upstream at Debian GIS Project / gdal-grass
Commits:
8823ea34 by Bas Couwenberg at 2022-05-06T16:34:56+02:00
New upstream version 3.5.0~rc1
- - - - -
11 changed files:
- + .github/workflows/apt.txt
- + .github/workflows/build_ubuntu.sh
- + .github/workflows/test_simple.sh
- + .github/workflows/ubuntu.yml
- Makefile.in
- − VERSION
- grass.cpp
- ogrgrass.h
- ogrgrassdatasource.cpp
- ogrgrassdriver.cpp
- ogrgrasslayer.cpp
Changes:
=====================================
.github/workflows/apt.txt
=====================================
@@ -0,0 +1,6 @@
+gdal-bin
+grass
+grass-dev
+libgdal-dev
+libpq-dev
+pkg-config
=====================================
.github/workflows/build_ubuntu.sh
=====================================
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# fail on non-zero return code from a subprocess
+set -e
+
+# print commands
+set -x
+
+if [ -z "$1" ]; then
+ echo "Usage: $0 GDAL_AUTOLOAD_DIR"
+ exit 1
+fi
+
+# non-existent variables as an errors
+set -u
+
+# versionless in future?
+GRASS=grass$(pkg-config --modversion grass | cut -d. -f1,2 | sed 's+\.++g')
+
+export GDAL_AUTOLOAD_DIR=$1
+
+./configure \
+ --prefix=/usr \
+ --with-autoload=${GDAL_AUTOLOAD_DIR} \
+ --with-grass=/usr/lib/${GRASS} \
+ --with-postgres-includes=$(pg_config --includedir)
+
+make
+make install
=====================================
.github/workflows/test_simple.sh
=====================================
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# fail on non-zero return code from a subprocess
+set -e
+
+# print commands
+set -x
+
+if [ -z "$1" ]; then
+ echo "Usage: $0 GDAL_AUTOLOAD_DIR"
+ exit 1
+fi
+
+# non-existent variables as an errors
+set -u
+
+export GDAL_AUTOLOAD_DIR=$1
+export GDAL_DRIVER_PATH=${GDAL_AUTOLOAD_DIR}
+
+# add small GRASS GIS dataset for tests
+(mkdir -p $HOME/grassdata && \
+ cd $HOME/grassdata/ && \
+ wget -c --quiet https://grass.osgeo.org/sampledata/north_carolina/nc_spm_08_micro.zip && \
+ unzip nc_spm_08_micro.zip && \
+ rm -f nc_spm_08_micro.zip )
+
+# Using LD_LIBRARY_PATH workaround for GRASS GIS < 7.8.8
+export LD_LIBRARY_PATH=$(grass --config path)/lib
+
+# test GRASS GIS raster map
+gdalinfo $HOME/grassdata/nc_spm_08_micro/PERMANENT/cellhd/elevation
+
+# test GRASS GIS vector map
+ogrinfo -so -al $HOME/grassdata/nc_spm_08_micro/PERMANENT/vector/firestations/head
=====================================
.github/workflows/ubuntu.yml
=====================================
@@ -0,0 +1,23 @@
+name: Build on Ubuntu
+on: [push]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout at v3
+ - name: Get dependencies
+ run: |
+ sudo apt-get update -y
+ sudo apt-get install -y wget git gawk findutils
+ xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \
+ sudo apt-get install -y --no-install-recommends --no-install-suggests
+ - name: Create GDAL_AUTOLOAD directory
+ run: |
+ mkdir $HOME/gdalplugins
+ - name: Build
+ run: .github/workflows/build_ubuntu.sh $HOME/gdalplugins
+ - name: Test executing of GDAL with driver on GRASS maps
+ run: .github/workflows/test_simple.sh $HOME/gdalplugins
+
=====================================
Makefile.in
=====================================
@@ -34,10 +34,10 @@ distclean: clean
$(GLIBNAME): grass.o
- $(LD_SHARED) $(LDFLAGS) grass.o $(LIBS) -o $(GLIBNAME)
+ $(LD_SHARED) $(LDFLAGS) grass.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,"@GRASS_GISBASE@/lib"
$(OLIBNAME): ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o
- $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME)
+ $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,"@GRASS_GISBASE@/lib"
%.o: %.cpp
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
=====================================
VERSION deleted
=====================================
@@ -1 +0,0 @@
-3.4.3
=====================================
grass.cpp
=====================================
@@ -57,7 +57,7 @@ char *GPJ_grass_to_wkt( const struct Key_Value *,
#define GRASS_MAX_COLORS 100000 // what is the right value
-CPL_CVSID("$Id: grass.cpp a832da5b936bac8438f9c50e7c20e563fd94c9ff 2020-09-22 13:06:27 +0200 Markus Neteler $")
+CPL_CVSID("$Id$")
/************************************************************************/
/* Grass2CPLErrorHook() */
=====================================
ogrgrass.h
=====================================
@@ -1,5 +1,5 @@
/******************************************************************************
- * $Id: ogrgrass.h a832da5b936bac8438f9c50e7c20e563fd94c9ff 2020-09-22 13:06:27 +0200 Markus Neteler $
+ * $Id$
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Private definitions for OGR/GRASS driver.
=====================================
ogrgrassdatasource.cpp
=====================================
@@ -31,7 +31,7 @@
#include "cpl_conv.h"
#include "cpl_string.h"
-CPL_CVSID("$Id: ogrgrassdatasource.cpp a832da5b936bac8438f9c50e7c20e563fd94c9ff 2020-09-22 13:06:27 +0200 Markus Neteler $")
+CPL_CVSID("$Id$")
/************************************************************************/
=====================================
ogrgrassdriver.cpp
=====================================
@@ -30,7 +30,7 @@
#include "cpl_conv.h"
#include "cpl_string.h"
-CPL_CVSID("$Id: ogrgrassdriver.cpp 1761acd90777d5bcc49eddbc13c193098f0ed40b 2020-10-01 12:12:00 +0200 Even Rouault $")
+CPL_CVSID("$Id$")
/************************************************************************/
/* ~OGRGRASSDriver() */
=====================================
ogrgrasslayer.cpp
=====================================
@@ -31,7 +31,7 @@
#include "ogrgrass.h"
#include "cpl_conv.h"
-CPL_CVSID("$Id: ogrgrasslayer.cpp 5163a8056bee931f5bc8e72676d90092cdd1d760 2021-08-12 22:25:24 +0200 Even Rouault $")
+CPL_CVSID("$Id$")
/************************************************************************/
/* OGRGRASSLayer() */
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/commit/8823ea342ce84b99630ca7d790ecea5e4dec10ff
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/commit/8823ea342ce84b99630ca7d790ecea5e4dec10ff
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220506/4405199f/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list