|
@@ -12,7 +12,7 @@ use zip::ZipArchive;
|
|
|
|
|
|
use std::collections::BTreeMap;
|
|
use std::collections::BTreeMap;
|
|
use std::fs::{create_dir_all, remove_dir_all, write, File};
|
|
use std::fs::{create_dir_all, remove_dir_all, write, File};
|
|
-use std::io::{BufRead, BufReader, Cursor, Read, Write};
|
|
|
|
|
|
+use std::io::{Cursor, Read, Write};
|
|
use std::path::{Path, PathBuf};
|
|
use std::path::{Path, PathBuf};
|
|
use std::process::{Command, Stdio};
|
|
use std::process::{Command, Stdio};
|
|
|
|
|
|
@@ -348,7 +348,7 @@ fn run_candle(
|
|
.stdout(Stdio::piped())
|
|
.stdout(Stdio::piped())
|
|
.current_dir(build_path);
|
|
.current_dir(build_path);
|
|
|
|
|
|
- common::print_info("running candle.exe");
|
|
|
|
|
|
+ common::print_info("running candle.exe")?;
|
|
common::execute_with_output(&mut cmd).map_err(|_| crate::Error::CandleError)
|
|
common::execute_with_output(&mut cmd).map_err(|_| crate::Error::CandleError)
|
|
}
|
|
}
|
|
|
|
|
|
@@ -411,6 +411,13 @@ pub fn build_wix_app_installer(
|
|
|
|
|
|
let mut data = BTreeMap::new();
|
|
let mut data = BTreeMap::new();
|
|
|
|
|
|
|
|
+ if let Ok(tauri_config) = crate::bundle::tauri_config::get() {
|
|
|
|
+ data.insert(
|
|
|
|
+ "embedded_server",
|
|
|
|
+ to_json(tauri_config.tauri.embedded_server.active),
|
|
|
|
+ );
|
|
|
|
+ }
|
|
|
|
+
|
|
data.insert("product_name", to_json(settings.bundle_name()));
|
|
data.insert("product_name", to_json(settings.bundle_name()));
|
|
data.insert("version", to_json(settings.version_string()));
|
|
data.insert("version", to_json(settings.version_string()));
|
|
let manufacturer = settings.bundle_identifier().to_string();
|
|
let manufacturer = settings.bundle_identifier().to_string();
|