Преглед на файлове

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

Lucas Fernandes Nogueira преди 5 години
родител
ревизия
9fc1430212
променени са 3 файла, в които са добавени 11 реда и са изтрити 5 реда
  1. 4 1
      cli/tauri-bundler/src/bundle/dmg_bundle.rs
  2. 4 1
      cli/tauri-bundler/src/bundle/osx_bundle.rs
  3. 3 3
      cli/tauri-bundler/src/bundle/wix.rs

+ 4 - 1
cli/tauri-bundler/src/bundle/dmg_bundle.rs

@@ -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());

+ 4 - 1
cli/tauri-bundler/src/bundle/osx_bundle.rs

@@ -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)?;

+ 3 - 3
cli/tauri-bundler/src/bundle/wix.rs

@@ -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();