Provide a bundled flag for gdal-sys

.github/workflows/ci.yml

@@ -62,15 +62,15 @@ jobs:
       - name: Check with Clippy
         run: cargo clippy --all-targets -- -D warnings
       - name: Check with Clippy (--all-features)
-        run: cargo clippy --all-targets --all-features -- -D warnings
+        run: cargo clippy --all-targets --features "default bindgen array" -- -D warnings
       - name: Build
         run: cargo build
       - name: Run tests
         run: cargo test
       - name: Build (--all-features)
-        run: cargo build --all-features
+        run: cargo build  --features "default bindgen array"
       - name: Run tests (--all-features)
-        run: cargo test --all-features -- --nocapture
+        run: cargo test  --features "default bindgen array" -- --nocapture
 
   ubuntu_lts:
     name: "ci ubuntu-lts"
@@ -105,18 +105,63 @@ jobs:
       - name: Check with Clippy
         run: cargo clippy --all-targets -- -D warnings
       - name: Check with Clippy (--all-features)
-        run: cargo clippy --all-targets --all-features -- -D warnings
+        run: cargo clippy --all-targets  --features "default bindgen array" -- -D warnings
       - name: Build
         run: cargo build
       - name: Run tests
         run: cargo test
       - name: Build (--all-features)
-        run: cargo build --all-features
+        run: cargo build  --features "default bindgen array"
       - name: Run tests (--all-features)
-        run: cargo test --all-features -- --nocapture
+        run: cargo test  --features "default bindgen array" -- --nocapture
       - name: Install valgrind and cargo-valgrind
         run: |
           sudo apt-get install valgrind -y
           cargo install cargo-valgrind
       - name: Run --lib tests under valgrind
         run: cargo valgrind test --lib
+  gdal_static:
+    name: "ci gdal-static"
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest # x86_64
+          - macos-14 # aarch64
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install stable
+        run: |
+          rustup install --no-self-update --profile minimal stable
+          rustup component add rustfmt clippy
+      # we need to have the sqlite binary in path for building proj from source
+      - name: Install Sqlite (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          choco install sqlite
+          echo "C:\ProgramData\chocolatey\lib\SQLite\tools" >> $GITHUB_PATH
+          sqlite3 --version
+      # use the minimal driver set for clippy as the other
+      # drivers do not change the rust code
+      # enable `driver_sqlite` to force statically linking libsqlite3 for proj
+      - name: Check with Clippy (bundled)
+        run: cargo clippy --all-targets  --features "gdal-sys/bundled gdal-src gdal-src/driver_sqlite" -- -D warnings
+      # we only build tests here as we have disabled features
+      # that are required for running tests
+      - name: Build bundled gdal (minimal features)
+        if: runner.os == 'Windows'
+        # we use cargo test --no-run here because
+        # tests do not pass due to missing libgeos but we want to have a complete build (including linking)
+        run: cargo test --features "gdal-sys/bundled gdal-src gdal-src/driver_sqlite" --no-run
+      - name: Build bundled gdal (minimal features)
+        if: runner.os != 'Windows'
+        # we use cargo test --no-run here because
+        # tests do not pass due to missing libgeos but we want to have a complete build (including linking)
+        run: cargo test --features "gdal-sys/bundled gdal-src" --no-run
+      - name: Test bundled (all features)
+        run: cargo test --features "gdal-sys/bundled gdal-src gdal-src/all_drivers gdal-src/geos_static"

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "gdal-src/source"]
+	path = gdal-src/source
+	url = https://github.com/OSGeo/gdal

CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Add a `bundled` feature for `gdal-sys` that allows to build and statically link a minimal bundled version of gdal during `cargo build`
+
 ## 0.17
 
 - Added pre-built bindings for GDAL 3.9
@@ -85,6 +87,7 @@
 
    - <https://github.com/georust/gdal/pull/466>
 
+
 - Added `{Display|FromStr} for ResampleAlg` and `ResampleAlg::iter`.
 
    - <https://github.com/georust/gdal/pull/462>

Cargo.toml

@@ -22,6 +22,7 @@ thiserror = "1.0"
 libc = "0.2"
 geo-types = { version = "0.7.11" }
 gdal-sys = { path = "gdal-sys", version = "0.10" }
+gdal-src = { path = "gdal-src", optional = true, default-features = false }
 ndarray = { version = "0.15", optional = true }
 chrono = { version = "0.4.26", default-features = false }
 bitflags = "2.4"
@@ -36,7 +37,7 @@ tempfile = "3.8"
 arrow = { version = "52.0", default-features = false, features = ["ffi"] }
 
 [workspace]
-members = ["gdal-sys"]
+members = ["gdal-src", "gdal-sys"]
 
 # docs.rs-specific configuration
 [package.metadata.docs.rs]
@@ -61,3 +62,6 @@ check-cfg = [
     'cfg(minor_ge_8)',
     'cfg(minor_ge_9)',
 ]
+
+[patch.crates-io]
+proj-sys = { git = "https://github.com/georust/proj", rev = "57c9e80" }

DEVELOPMENT.md

@@ -0,0 +1,17 @@
+# Updating bundled gdal version for gdal-src
+
+Perform the following steps:
+
+```
+git submodule init
+git submodule update
+cd gdal-src/source
+git pull
+git checkout v3.8.3 # corresponds to the tag you want to update to
+cd ../../
+git add gdal-src/source
+git commit -m "Update bundled gdal version to 3.8.4"
+```
+
+These steps assume that there are no fundamental changes to the gdal build system.
+