tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2025-01-02 07:56:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(bundler) windows output name & artifacts arch (#827)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira 2020-07-14 11:15:00 -03:00 committed by GitHub
parent 53e8dc1880
commit 9fc1430212
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/tauri-bundler/src/bundle/dmg_bundle.rs
View File

@ -21,7 +21,10 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
"{}_{}_{}",
settings.main_binary_name(),
settings.version_string(),
settings.binary_arch()
match settings.binary_arch() {
"x86_64" => "x64",
other => other,
}
);
let dmg_name = format!("{}.dmg", &package_base_name);
let dmg_path = output_path.join(&dmg_name.clone());

5
cli/tauri-bundler/src/bundle/osx_bundle.rs
View File

@ -41,7 +41,10 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
"{}_{}_{}",
settings.main_binary_name(),
settings.version_string(),
settings.binary_arch()
match settings.binary_arch() {
"x86_64" => "x64",
other => other,
}
);
let app_bundle_name = format!("{}.app", package_base_name);
common::print_bundling(&app_bundle_name)?;

6
cli/tauri-bundler/src/bundle/wix.rs
View File

@ -201,7 +201,7 @@ fn app_installer_dir(settings: &Settings) -> crate::Result<PathBuf> {
let package_base_name = format!(
"{}_{}_{}",
settings.main_binary_name(),
settings.main_binary_name().replace(".exe", ""),
settings.version_string(),
arch
);
@ -210,7 +210,7 @@ fn app_installer_dir(settings: &Settings) -> crate::Result<PathBuf> {
settings
.project_out_directory()
.to_path_buf()
.join(format!("bundle/wix/{}.msi", package_base_name)),
.join(format!("bundle/msi/{}.msi", package_base_name)),
)
}
@ -417,7 +417,7 @@ pub fn build_wix_app_installer(
let output_path = settings
.project_out_directory()
.join("bundle/wix")
.join("bundle/msi")
.join(arch);
let mut data = BTreeMap::new();