mirror of https://github.com/Tim-Paik/neutauri.git
fixed windows error
This commit is contained in:
parent
4df957fdf3
commit
cab70b156b
|
@ -2,8 +2,35 @@ use std::{fs, io::Write};
|
||||||
|
|
||||||
mod data;
|
mod data;
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
const RUNTIME_DATA: &[u8] = include_bytes!("../../target/release/neutauri_runtime.exe");
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
const RUNTIME_DATA: &[u8] = include_bytes!("../../target/release/neutauri_runtime");
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
fn options() -> fs::OpenOptions {
|
||||||
|
use std::os::unix::prelude::OpenOptionsExt;
|
||||||
|
let mut options = fs::OpenOptions::new();
|
||||||
|
options.write(true);
|
||||||
|
options.create(true);
|
||||||
|
options.truncate(true);
|
||||||
|
options.mode(0o755);
|
||||||
|
options
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn options() -> fs::OpenOptions {
|
||||||
|
let mut options = fs::OpenOptions::new();
|
||||||
|
options.write(true);
|
||||||
|
options.create(true);
|
||||||
|
options.truncate(true);
|
||||||
|
options
|
||||||
|
}
|
||||||
|
|
||||||
fn main() -> wry::Result<()> {
|
fn main() -> wry::Result<()> {
|
||||||
let arg = std::env::args().nth(1).unwrap_or_else(|| "neutauri.toml".to_string());
|
let arg = std::env::args()
|
||||||
|
.nth(1)
|
||||||
|
.unwrap_or_else(|| "neutauri.toml".to_string());
|
||||||
if arg == "--help" || arg == "-h" {
|
if arg == "--help" || arg == "-h" {
|
||||||
println!("Usage: neutauri_bundler [neutauri.toml]");
|
println!("Usage: neutauri_bundler [neutauri.toml]");
|
||||||
return Ok(());
|
return Ok(());
|
||||||
|
@ -24,16 +51,8 @@ fn main() -> wry::Result<()> {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
let data = data::Data::build_from_dir(source, config.window_attr()?, config.webview_attr()?)?;
|
let data = data::Data::build_from_dir(source, config.window_attr()?, config.webview_attr()?)?;
|
||||||
let mut option = fs::OpenOptions::new();
|
let mut f = options().open(&target)?;
|
||||||
let option = option.write(true).create(true).truncate(true);
|
f.write_all(RUNTIME_DATA)?;
|
||||||
let option = if cfg!(unix) {
|
|
||||||
std::os::unix::prelude::OpenOptionsExt::mode(option, 0o755)
|
|
||||||
} else {
|
|
||||||
option
|
|
||||||
};
|
|
||||||
let mut f = option.open(&target)?;
|
|
||||||
let runtime_data = include_bytes!("../../target/release/neutauri_runtime");
|
|
||||||
f.write_all(runtime_data)?;
|
|
||||||
f.write_all(&data)?;
|
f.write_all(&data)?;
|
||||||
f.sync_all()?;
|
f.sync_all()?;
|
||||||
f.flush()?;
|
f.flush()?;
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#![windows_subsystem = "windows"]
|
||||||
|
|
||||||
use wry::{
|
use wry::{
|
||||||
application::{
|
application::{
|
||||||
dpi::{PhysicalSize, Size},
|
dpi::{PhysicalSize, Size},
|
||||||
|
@ -9,11 +11,7 @@ use wry::{
|
||||||
};
|
};
|
||||||
mod data;
|
mod data;
|
||||||
|
|
||||||
#[cfg(windows)]
|
|
||||||
const PROTOCOL_PREFIX: &str = "https://{PROTOCOL}.";
|
|
||||||
#[cfg(not(windows))]
|
|
||||||
const PROTOCOL_PREFIX: &str = "{PROTOCOL}://";
|
const PROTOCOL_PREFIX: &str = "{PROTOCOL}://";
|
||||||
|
|
||||||
const PROTOCOL: &str = "neu";
|
const PROTOCOL: &str = "neu";
|
||||||
|
|
||||||
fn custom_protocol_uri<T: Into<String>>(protocol: T, path: T) -> String {
|
fn custom_protocol_uri<T: Into<String>>(protocol: T, path: T) -> String {
|
||||||
|
|
Loading…
Reference in New Issue