open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(misc): upgrade cc crate version to (hopefully) fix windows build on github ci

Browse Source
This commit is contained in:
Federico Terzi 2022-03-05 22:05:15 +01:00
parent c77d9c560b
commit 880c7c0708
9 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -187,9 +187,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.66" version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
[[package]] [[package]]
name = "cfg-if" name = "cfg-if"

2
espanso-clipboard/Cargo.toml
View File

@ -28,4 +28,4 @@ widestring = "0.4.3"
wait-timeout = { version = "0.2.0", optional = true } wait-timeout = { version = "0.2.0", optional = true }
[build-dependencies] [build-dependencies]
cc = "1.0.66" cc = "1.0.73"

2
espanso-detect/Cargo.toml
View File

@ -27,7 +27,7 @@ scopeguard = "1.1.0"
sctk = { package = "smithay-client-toolkit", version = "0.14.0", optional = true } sctk = { package = "smithay-client-toolkit", version = "0.14.0", optional = true }
[build-dependencies] [build-dependencies]
cc = "1.0.66" cc = "1.0.73"
[dev-dependencies] [dev-dependencies]
enum-as-inner = "0.3.3" enum-as-inner = "0.3.3"

2
espanso-info/Cargo.toml
View File

@ -20,4 +20,4 @@ lazy_static = "1.4.0"
widestring = "0.4.3" widestring = "0.4.3"
[build-dependencies] [build-dependencies]
cc = "1.0.66" cc = "1.0.73"

2
espanso-inject/Cargo.toml
View File

@ -27,7 +27,7 @@ scopeguard = "1.1.0"
itertools = "0.10.0" itertools = "0.10.0"
[build-dependencies] [build-dependencies]
cc = "1.0.66" cc = "1.0.73"
[dev-dependencies] [dev-dependencies]
enum-as-inner = "0.3.3" enum-as-inner = "0.3.3"

2
espanso-mac-utils/Cargo.toml
View File

@ -14,4 +14,4 @@ lazy_static = "1.4.0"
regex = "1.4.3" regex = "1.4.3"
[build-dependencies] [build-dependencies]
cc = "1.0.66" cc = "1.0.73"

2
espanso-modulo/Cargo.toml
View File

@ -15,7 +15,7 @@ lazy_static = "1.4.0"
regex = "1.4.3" regex = "1.4.3"
[build-dependencies] [build-dependencies]
cc = "1.0.66" cc = "1.0.73"
regex = "1.4.3" regex = "1.4.3"
zip = "0.5.12" zip = "0.5.12"
winres = "0.1.11" winres = "0.1.11"

2
espanso-ui/Cargo.toml
View File

@ -31,4 +31,4 @@ notify-rust = "4.2.2"
crossbeam = "0.8.0" crossbeam = "0.8.0"
[build-dependencies] [build-dependencies]
cc = "1.0.66" cc = "1.0.73"

17
scripts/build_windows_resources.rs
View File

@ -1,6 +1,6 @@
//! ```cargo //! ```cargo
//! [dependencies] //! [dependencies]
//! cc = "1.0.66" //! cc = "1.0.73"
//! glob = "0.3.0" //! glob = "0.3.0"
//! envmnt = "*" //! envmnt = "*"
//! ``` //! ```
@ -54,14 +54,21 @@ fn main() {
.next() .next()
.expect("unable to find vcruntime140_1.dll file") .expect("unable to find vcruntime140_1.dll file")
.expect("unable to extract path of vcruntime140_1.dll file"); .expect("unable to extract path of vcruntime140_1.dll file");
// Copy the DLLs in the target directory // Copy the DLLs in the target directory
let parent_dir = target_file.parent().expect("unable to obtain directory containing DLLs"); let parent_dir = target_file
for entry in glob::glob(&format!(r"{}\*.dll", parent_dir.to_string_lossy().to_string())).expect("unable to glob over DLLs") { .parent()
.expect("unable to obtain directory containing DLLs");
for entry in glob::glob(&format!(
r"{}\*.dll",
parent_dir.to_string_lossy().to_string()
))
.expect("unable to glob over DLLs")
{
let entry = entry.expect("unable to unwrap DLL entry"); let entry = entry.expect("unable to unwrap DLL entry");
let filename = entry.file_name().expect("unable to obtain filename"); let filename = entry.file_name().expect("unable to obtain filename");
std::fs::copy(&entry, target_dir.join(filename)).expect("unable to copy DLL"); std::fs::copy(&entry, target_dir.join(filename)).expect("unable to copy DLL");
} }
// Copy the executable // Copy the executable
let exec_path = envmnt::get_or_panic("EXEC_PATH"); let exec_path = envmnt::get_or_panic("EXEC_PATH");