Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lazy loaded clib #208

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[flake8]
max-line-length = 160
exclude = pygeodiff/tests/*

27 changes: 20 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,26 +120,39 @@ Changes between datasets are read from and written to a [binary changeset format

# Building geodiff

## Deps
Install postgresql client and sqlite3 library, e.g. for Linux
```bash
sudo apt-get install libsqlite3-dev libpq-dev
```
or MacOS (using SQLite from [QGIS deps](https://qgis.org/downloads/macos/deps/)) by defining SQLite variables in
a cmake configuration as following:
```bash
SQLite3_INCLUDE_DIR=/opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}/stage/include
SQLite3_LIBRARY=/opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}/stage/lib/libsqlite3.dylib

alternatively you can build libraries yourself:
for sqlite
- download [autoconf version](https://www.sqlite.org/download.html)
- extract
```
./configure --enable-dynamic-extensions
make
```

Compile geodiff:
```bash
cd geodiff
mkdir build
cd build
cmake .. -DWITH_POSTGRESQL=TRUE

cmake \
-DWITH_POSTGRESQL=TRUE \
-DSQLite3_INCLUDE_DIR=../../sqlite-autoconf-3450000 \
-DSQLite3_LIBRARY=../../sqlite-autoconf-3450000/.libs/libsqlite3.a \
../geodiff

make
```

if you get ```error: use of undeclared identifier 'sqlite3_enable_load_extension'``` make sure
you use sqlite with enabled dynamic extension.

## Development of geodiff

### Running tests
Expand All @@ -148,7 +161,7 @@ C++ tests: run `make test` or `ctest` to run all tests. Alternatively run just a

Python tests: you need to setup GEODIFFLIB with path to .so/.dylib from build step
```bash
GEODIFFLIB=`pwd`/../build/libgeodiff.dylib GEODIFFCLI=`pwd`/build/geodiff pytest
GEODIFFLIB=`pwd`/build/libgeodiff.dylib GEODIFFCLI=`pwd`/build/geodiff pytest
```

### Releasing new version
Expand Down
2 changes: 1 addition & 1 deletion geodiff/src/geodiff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// use scripts/update_version.py to update the version here and in other places at once
const char *GEODIFF_version()
{
return "2.0.4";
return "2.1.0";
}

int GEODIFF_driverCount( GEODIFF_ContextH /*contextHandle*/ )
Expand Down
2 changes: 1 addition & 1 deletion pygeodiff/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
__description__ = "Diff tool for geo-spatial data"
__url__ = "https://github.com/MerginMaps/geodiff"
# use scripts/update_version.py to update the version here and in other places at once
__version__ = "2.0.4"
__version__ = "2.1.0"
__author__ = "Lutra Consulting Ltd."
__author_email__ = "[email protected]"
__maintainer__ = "Lutra Consulting Ltd."
Expand Down
Loading
Loading