maplibre/martin
1
1
Fork 0
mirror of https://github.com/maplibre/martin.git synced 2024-12-20 05:11:57 +03:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

cleanup cargo optional dep: in features

Browse Source
This commit is contained in:
Yuri Astrakhan 2023-06-16 19:11:13 -04:00
parent 22173e4881
commit a187e6e1da
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -62,10 +62,10 @@ jobs:
rustup target add aarch64-apple-darwin rustup target add aarch64-apple-darwin
# compile without debug symbols # compile without debug symbols
RUSTFLAGS='-C link-arg=-s' cargo build --release --target ${{ matrix.target }} --features=vendored-openssl --package martin RUSTFLAGS='-C link-arg=-s' cargo build --release --target ${{ matrix.target }} --features=vendored-openssl --package martin
RUSTFLAGS='-C link-arg=-s' cargo build --release --target ${{ matrix.target }} --features=tools --package martin-mbtiles RUSTFLAGS='-C link-arg=-s' cargo build --release --target ${{ matrix.target }} --features=cli --package martin-mbtiles
else else
cargo build --release --target ${{ matrix.target }} --features=ssl --package martin cargo build --release --target ${{ matrix.target }} --features=ssl --package martin
cargo build --release --target ${{ matrix.target }} --features=tools --package martin-mbtiles cargo build --release --target ${{ matrix.target }} --features=cli --package martin-mbtiles
fi fi
mkdir target_releases mkdir target_releases
if [[ "${{ runner.os }}" == "Windows" ]]; then if [[ "${{ runner.os }}" == "Windows" ]]; then

2
Cargo.toml
View File

@ -27,7 +27,7 @@ futures = "0.3"
indoc = "2" indoc = "2"
itertools = "0.10" itertools = "0.10"
log = "0.4" log = "0.4"
martin-mbtiles = { path = "./martin-mbtiles", version = "0.2.0", default-features = false } # disable tools martin-mbtiles = { path = "./martin-mbtiles", version = "0.2.0", default-features = false } # disable CLI tools
martin-tile-utils = { path = "./martin-tile-utils", version = "0.1.0" } martin-tile-utils = { path = "./martin-tile-utils", version = "0.1.0" }
num_cpus = "1" num_cpus = "1"
openssl = "0.10" openssl = "0.10"

8
martin-mbtiles/Cargo.toml
View File

@ -10,9 +10,9 @@ repository.workspace = true
license.workspace = true license.workspace = true
[features] [features]
# TODO: Disable "tools" feature in default builds # TODO: Disable "cli" feature in default builds
default = ["tools"] default = ["cli"]
tools = ["anyhow", "clap", "tokio"] cli = ["dep:anyhow", "dep:clap", "dep:tokio"]
[dependencies] [dependencies]
futures.workspace = true futures.workspace = true
@ -38,4 +38,4 @@ path = "src/lib.rs"
[[bin]] [[bin]]
name = "mbtiles" name = "mbtiles"
path = "src/bin/main.rs" path = "src/bin/main.rs"
required-features = ["tools"] required-features = ["cli"]

6
martin/Cargo.toml
View File

@ -23,8 +23,8 @@ path = "src/bin/main.rs"
[features] [features]
default = [] default = []
ssl = ["openssl", "postgres-openssl"] vendored-openssl = ["ssl", "openssl?/vendored"]
vendored-openssl = ["ssl", "openssl/vendored"] ssl = ["dep:openssl", "dep:postgres-openssl"]
bless-tests = [] bless-tests = []
[dependencies] [dependencies]
@ -60,7 +60,7 @@ thiserror.workspace = true
tilejson.workspace = true tilejson.workspace = true
tokio = { workspace = true, features = ["io-std"] } tokio = { workspace = true, features = ["io-std"] }
# Optional dependencies for openssl support # Optional dependencies for ssl support
openssl = { workspace = true, optional = true } openssl = { workspace = true, optional = true }
postgres-openssl = { workspace = true, optional = true } postgres-openssl = { workspace = true, optional = true }