summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCanop <cano.petrole@gmail.com>2022-06-18 10:15:46 +0200
committerCanop <cano.petrole@gmail.com>2022-06-18 10:15:46 +0200
commitf7a19c0482ed168f9de5fa43fab072b034ef913a (patch)
tree9e96669c0c24aa4a0d27db7974a02d4abdcd84c9
parent46b3e1ca6d7139cc266f9ab9bdaa62cdb879f75f (diff)
fix many cargo cross failures with a clean
Doing cargo clean & cross fixes so many failures...
-rw-r--r--CHANGELOG.md1
-rw-r--r--Cargo.lock83
-rwxr-xr-xcompile-all-targets.sh55
3 files changed, 71 insertions, 68 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70ba8a2..a6f30bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
- examples on search modes in help screen - Fix #559
- list of syntactic themes in default conf
- the --file-export-path launch argument which was deprecated since broot 1.6 has been removed (redirect the output of broot instead)
+- better built-in verbs for Windows - Thanks @Spacelord-XaN
### v1.13.1 - 2022-05-30
<a name="v1.13.1"></a>
diff --git a/Cargo.lock b/Cargo.lock
index 290c657..80d0d75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -249,22 +249,22 @@ dependencies = [
"num-integer",
"num-traits",
"serde",
- "time 0.1.43",
+ "time 0.1.44",
"winapi",
]
[[package]]
name = "clap"
-version = "3.2.1"
+version = "3.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a836566fa5f52f7ddf909a8a2f9029b9f78ca584cd95cf7e87f8073110f4c5c9"
+checksum = "d53da17d37dba964b9b3ecb5c5a1f193a2762c700e6829201e645b9381c99dc7"
dependencies = [
"atty",
"bitflags",
"clap_derive",
"clap_lex",
"indexmap",
- "lazy_static",
+ "once_cell",
"strsim",
"termcolor",
"textwrap",
@@ -281,9 +281,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "3.2.1"
+version = "3.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "986fd75d1dfd2c34eb8c9275ae38ad87ea9478c9b79e87f1801f7d866dfb1e37"
+checksum = "c11d40217d16aee8508cc8e5fde8b4ff24639758608e5374e731b53f85749fb9"
dependencies = [
"heck 0.4.0",
"proc-macro-error",
@@ -383,9 +383,9 @@ dependencies = [
[[package]]
name = "crossbeam"
-version = "0.8.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
+checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80"
dependencies = [
"cfg-if",
"crossbeam-channel",
@@ -397,9 +397,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
+checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -418,15 +418,15 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.8"
+version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
+checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
- "lazy_static",
"memoffset",
+ "once_cell",
"scopeguard",
]
@@ -442,9 +442,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.8"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
+checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
dependencies = [
"cfg-if",
"lazy_static",
@@ -701,14 +701,14 @@ checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
[[package]]
name = "getrandom"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
dependencies = [
"cfg-if",
"js-sys",
"libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
]
@@ -780,9 +780,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.11.2"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
[[package]]
name = "hashlink"
@@ -856,12 +856,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.8.2"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
+checksum = "6c6392766afd7964e2531940894cffe4bd8d7d17dbc3c1c4857040fd4b33bdb3"
dependencies = [
"autocfg",
- "hashbrown 0.11.2",
+ "hashbrown 0.12.1",
]
[[package]]
@@ -923,9 +923,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.57"
+version = "0.3.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
+checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
dependencies = [
"wasm-bindgen",
]
@@ -1893,11 +1893,12 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.43"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
]
@@ -1950,9 +1951,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
[[package]]
name = "unicode-ident"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
[[package]]
name = "unicode-normalization"
@@ -2022,9 +2023,9 @@ dependencies = [
[[package]]
name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
[[package]]
name = "wasi"
@@ -2034,9 +2035,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
+checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2044,9 +2045,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
+checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
dependencies = [
"bumpalo",
"lazy_static",
@@ -2059,9 +2060,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
+checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2069,9 +2070,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
+checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
dependencies = [
"proc-macro2",
"quote",
@@ -2082,9 +2083,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.80"
+version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
+checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
[[package]]
name = "weezl"
diff --git a/compile-all-targets.sh b/compile-all-targets.sh
index 68f1491..284c16f 100755
--- a/compile-all-targets.sh
+++ b/compile-all-targets.sh
@@ -18,6 +18,34 @@ echo -e "${H1}Compilation of all targets for $NAME $version${EH}"
rm -rf build
mkdir build
echo " build cleaned"
+
+# build versions for other platforms using cargo cross
+cross_build() {
+ target_name="$1"
+ target="$2"
+ features="$3"
+ echo -e "${H2}Compiling the $target_name version (target=$target, features='$features')${EH}"
+ cargo clean
+ if [[ -n $features ]]
+ then
+ cross build --target "$target" --release --features "$features"
+ else
+ cross build --target "$target" --release
+ fi
+ mkdir "build/$target"
+ if [[ $target_name == 'Windows' ]]
+ then
+ exec="$NAME.exe"
+ else
+ exec="$NAME"
+ fi
+ cp "target/$target/release/$exec" "build/$target/"
+}
+cross_build "Windows" "x86_64-pc-windows-gnu" "clipboard"
+cross_build "MUSL" "x86_64-unknown-linux-musl" ""
+cross_build "Linux GLIBC" "x86_64-unknown-linux-gnu" ""
+# cross_build "Android" "aarch64-linux-android" "clipboard" Doesn't work anymore - See https://github.com/Canop/broot/issues/565
+cross_build "Raspberry 32" "armv7-unknown-linux-gnueabihf" ""
# build the default linux version (with clipboard support)
# recent glibc
@@ -46,33 +74,6 @@ cp resources/icons/vscode/vscode.ttf build/resources
echo "the font file comes from https://github.com/vscode-icons/vscode-icons/ and is licensed as MIT" > build/resources/README.md
echo " Done"
-# build versions for other platforms using cargo cross
-cross_build() {
- target_name="$1"
- target="$2"
- features="$3"
- echo -e "${H2}Compiling the $target_name version (target=$target, features='$features')${EH}"
- if [[ -n $features ]]
- then
- cross build --target "$target" --release --features "$features"
- else
- cross build --target "$target" --release
- fi
- mkdir "build/$target"
- if [[ $target_name == 'Windows' ]]
- then
- exec="$NAME.exe"
- else
- exec="$NAME"
- fi
- cp "target/$target/release/$exec" "build/$target/"
-}
-cross_build "Android" "aarch64-linux-android" "clipboard"
-cross_build "Linux GLIBC" "x86_64-unknown-linux-gnu" ""
-cross_build "MUSL" "x86_64-unknown-linux-musl" ""
-cross_build "Raspberry 32" "armv7-unknown-linux-gnueabihf" ""
-cross_build "Windows" "x86_64-pc-windows-gnu" "clipboard"
-
# add a summary of content
echo '
This archive contains pre-compiled binaries: