CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-03 10:11:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix target strings.

Browse Source
This commit is contained in:
tensor-programming
2019-08-06 03:44:16 -04:00
parent e97a17ff12
commit 7de67f6dd9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/rust/cargo-proton-bundle/src/bundle/msi_bundle.rs
View File

@@ -97,7 +97,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
wix::get_and_extract_wix(&logger, &wix_path)?;
wix::build_wix_app_installer(&logger, &settings, &wix_path, PathBuf::from("."))?;
wix::build_wix_app_installer(&logger, &settings, &wix_path, base_dir)?;
// Set up installer database tables:
// create_directory_table(&mut package, &directories)

6
tools/rust/cargo-proton-bundle/src/bundle/wix.rs
View File

@@ -271,10 +271,12 @@ pub fn build_wix_app_installer(
) -> Result<(), String> {
let arch = match settings.binary_arch() {
"i686-pc-windows-msvc" => "x86",
"x86_64-pc-windows-msvc" => "amd64",
"x86_64-pc-windows-msvc" => "x64",
target => return Err(format!("unsupported target: {}", target)),
};
info!(logger, "Target: {}", settings.binary_arch());
let output_path = settings.project_out_directory().join("wix").join(arch);
let mut data = BTreeMap::new();
@@ -294,7 +296,7 @@ pub fn build_wix_app_installer(
)
.to_string()
} else {
panic!("unsupported target: {}");
return Err(format!("unsupported target: {}", arch));
};
data.insert("upgrade_code", &upgrade_code);