Fabio Valentini
1 year ago
parent
9d5b89dba2
commit
afb7fedb96
@ -1,37 +0,0 @@
|
||||
From 5daffba8dd7b00739507c74b5ce28d18597e7be9 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Wed, 16 Mar 2022 12:10:07 +0100
|
||||
Subject: [PATCH] build: remove automated integration test generation
|
||||
|
||||
---
|
||||
build.rs | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/build.rs b/build.rs
|
||||
index 71399d4..cc4c687 100644
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -1,7 +1,6 @@
|
||||
use std::env;
|
||||
use std::fs;
|
||||
use std::io::{self, Write};
|
||||
-use std::path::Path;
|
||||
use clap::Shell;
|
||||
|
||||
mod sq_cli {
|
||||
@@ -11,12 +10,6 @@ mod sq_cli {
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=build.rs");
|
||||
|
||||
- // XXX: Revisit once
|
||||
- // https://github.com/rust-lang/rust/issues/44732 is stabilized.
|
||||
-
|
||||
- subplot_build::codegen(Path::new("sq-subplot.md"))
|
||||
- .expect("failed to generate code with Subplot");
|
||||
-
|
||||
let mut sq = sq_cli::configure(
|
||||
clap::App::new("sq").set_term_width(80),
|
||||
cfg!(feature = "autocrypt"),
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
From af8d0e678603bc922ba2249d05872f08a596136d Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Tue, 19 Dec 2023 18:56:57 +0100
|
||||
Subject: [PATCH] fix building shell completions and man pages
|
||||
|
||||
---
|
||||
build.rs | 10 ++++------
|
||||
1 file changed, 4 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/build.rs b/build.rs
|
||||
index 1a844ad..be4e686 100644
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -25,16 +25,14 @@ fn main() {
|
||||
dump_help(sq.clone()).unwrap();
|
||||
|
||||
// Generate shell completions
|
||||
- let outdir = match env::var_os("CARGO_TARGET_DIR") {
|
||||
- None => return,
|
||||
- Some(outdir) => outdir,
|
||||
- };
|
||||
+ let out_dir = std::path::PathBuf::from(
|
||||
+ std::env::var_os("OUT_DIR").ok_or(std::io::ErrorKind::NotFound).unwrap());
|
||||
|
||||
- fs::create_dir_all(&outdir).unwrap();
|
||||
+ fs::create_dir_all(&out_dir).unwrap();
|
||||
|
||||
for shell in &[Shell::Bash, Shell::Fish, Shell::Zsh, Shell::PowerShell,
|
||||
Shell::Elvish] {
|
||||
- let path = clap_complete::generate_to(*shell, &mut sq, "sq", &outdir).unwrap();
|
||||
+ let path = clap_complete::generate_to(*shell, &mut sq, "sq", &out_dir).unwrap();
|
||||
println!("cargo:warning=completion file is generated: {:?}", path);
|
||||
};
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,57 +1,72 @@
|
||||
--- sequoia-sq-0.26.0/Cargo.toml 1970-01-01T00:00:01+00:00
|
||||
+++ sequoia-sq-0.26.0/Cargo.toml 2023-04-14T10:24:21.873221+00:00
|
||||
@@ -23,6 +23,7 @@
|
||||
categories = ["cryptography", "authentication", "command-line-utilities"]
|
||||
license = "GPL-2.0-or-later"
|
||||
repository = "https://gitlab.com/sequoia-pgp/sequoia"
|
||||
+exclude = ["man-*", "Makefile", "sq-subplot.md", "subplot/"]
|
||||
|
||||
[[bin]]
|
||||
name = "sq"
|
||||
@@ -50,12 +51,12 @@
|
||||
version = "5.0"
|
||||
|
||||
[dependencies.sequoia-autocrypt]
|
||||
-version = "0.24"
|
||||
+version = "0.25"
|
||||
optional = true
|
||||
default-features = false
|
||||
--- sequoia-sq-0.32.0/Cargo.toml 1970-01-01T00:00:01+00:00
|
||||
+++ sequoia-sq-0.32.0/Cargo.toml 2023-12-19T16:57:04.024891+00:00
|
||||
@@ -44,6 +44,12 @@
|
||||
]
|
||||
license = "LGPL-2.0-or-later"
|
||||
repository = "https://gitlab.com/sequoia-pgp/sequoia-sq"
|
||||
+exclude = [
|
||||
+ "/deny.toml",
|
||||
+ "/Dockerfile",
|
||||
+ "/sq.subplot",
|
||||
+ "/sq-subplot.md",
|
||||
+]
|
||||
|
||||
[dependencies.sequoia-net]
|
||||
-version = "0.24"
|
||||
+version = "0.27"
|
||||
default-features = false
|
||||
[profile.release]
|
||||
debug = true
|
||||
@@ -76,10 +82,6 @@
|
||||
[dependencies.dirs]
|
||||
version = "5"
|
||||
|
||||
[dependencies.sequoia-openpgp]
|
||||
@@ -71,17 +72,7 @@
|
||||
-[dependencies.dot-writer]
|
||||
-version = "0.1.3"
|
||||
-optional = true
|
||||
-
|
||||
[dependencies.humantime]
|
||||
version = "2"
|
||||
|
||||
[dependencies.tokio]
|
||||
version = "1.13.1"
|
||||
-[dev-dependencies.assert_cmd]
|
||||
-version = "2.0.4"
|
||||
@@ -143,14 +145,8 @@
|
||||
[dev-dependencies.assert_cmd]
|
||||
version = "2"
|
||||
|
||||
-[dev-dependencies.fehler]
|
||||
-version = "1.0.0"
|
||||
-
|
||||
-[dev-dependencies.predicates]
|
||||
-version = "2"
|
||||
[dev-dependencies.predicates]
|
||||
version = ">=2, <4"
|
||||
-
|
||||
-[dev-dependencies.subplotlib]
|
||||
-version = "0.1.0"
|
||||
[build-dependencies.clap]
|
||||
version = "2.33"
|
||||
-version = ">=0.7, <0.10"
|
||||
|
||||
@@ -89,13 +80,9 @@
|
||||
version = "1.0.0"
|
||||
[build-dependencies.anyhow]
|
||||
version = "1.0.18"
|
||||
@@ -189,29 +185,19 @@
|
||||
version = "1.17"
|
||||
default-features = false
|
||||
|
||||
-[build-dependencies.subplot-build]
|
||||
-version = "0.1.0"
|
||||
-version = ">=0.7, <0.10"
|
||||
-optional = true
|
||||
-
|
||||
[build-dependencies.terminal_size]
|
||||
version = ">=0.2.6, <0.4"
|
||||
|
||||
[features]
|
||||
autocrypt = ["sequoia-autocrypt"]
|
||||
compression-bzip2 = ["buffered-reader/compression-bzip2", "sequoia-openpgp/compression-bzip2"]
|
||||
compression-bzip2 = ["sequoia-openpgp/compression-bzip2"]
|
||||
-crypto-botan = ["sequoia-openpgp/crypto-botan"]
|
||||
-crypto-botan2 = ["sequoia-openpgp/crypto-botan2"]
|
||||
-crypto-cng = ["sequoia-openpgp/crypto-cng"]
|
||||
crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
|
||||
default = ["crypto-nettle", "compression-bzip2", "autocrypt"]
|
||||
crypto-openssl = ["sequoia-openpgp/crypto-openssl"]
|
||||
-crypto-rust = ["sequoia-openpgp/crypto-rust"]
|
||||
default = [
|
||||
"crypto-nettle",
|
||||
"compression-bzip2",
|
||||
"autocrypt",
|
||||
- "dot-writer",
|
||||
-]
|
||||
-subplot = ["subplot-build"]
|
||||
+]
|
||||
|
||||
[badges.gitlab]
|
||||
repository = "sequoia-pgp/sequoia-sq"
|
||||
|
||||
@ -1 +1 @@
|
||||
SHA512 (sequoia-sq-0.26.0.crate) = 4e5431050809ca82922eeda6252ba16abc505dea2cfdbd5964169b98b19933088ebc95065e9624d98545678bcd741c7d5185eb8699fc968ab62272d7ce6bb310
|
||||
SHA512 (sequoia-sq-0.32.0.crate) = 33688d286d830391b55a3d309d22d0561335941aaef1fe3e9878158ed28c53b2b1a90e0c168be9457f8b9e3d22a1f771ad67f322767e959d4ad959a01479a3c0
|
||||
|
||||
Loading…
Reference in new issue