Disable messagebox for Appimage

Author: zmerp

Cargo.lock

@@ -6,6 +6,9 @@ rust-version.workspace = true
 authors.workspace = true
 license.workspace = true
 
+[features]
+enable-messagebox = ["rfd"]
+
 [dependencies]
 anyhow = { version = "1", features = ["backtrace"] }
 backtrace = "0.3"
@@ -19,4 +22,4 @@ settings-schema = { git = "https://github.com/zarik5/settings-schema-rs" }
 # settings-schema = { path = "../../../../settings-schema-rs/settings-schema" }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-rfd = "0.11"
+rfd = {version = "0.11", optional = true }

alvr/common/Cargo.toml

@@ -49,7 +49,7 @@ pub fn set_panic_hook() {
 
         log::error!("{err_str}");
 
-        #[cfg(not(target_os = "android"))]
+        #[cfg(all(not(target_os = "android"), feature = "enable-messagebox"))]
         std::thread::spawn(move || {
             rfd::MessageDialog::new()
                 .set_title("ALVR panicked")
@@ -63,7 +63,7 @@ pub fn set_panic_hook() {
 pub fn show_w<W: Display + Send + 'static>(w: W) {
     log::warn!("{w}");
 
-    #[cfg(not(target_os = "android"))]
+    #[cfg(all(not(target_os = "android"), feature = "enable-messagebox"))]
     std::thread::spawn(move || {
         rfd::MessageDialog::new()
             .set_title("ALVR warning")
@@ -81,7 +81,7 @@ pub fn show_warn<T, E: Display + Send + 'static>(res: Result<T, E>) -> Option<T>
 fn show_e_block<E: Display>(e: E, blocking: bool) {
     log::error!("{e}");
 
-    #[cfg(not(target_os = "android"))]
+    #[cfg(all(not(target_os = "android"), feature = "enable-messagebox"))]
     {
         // Store the last error shown in a message box. Do not open a new message box if the content
         // of the error has not changed

alvr/common/src/logging.rs

@@ -6,6 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+alvr_common.workspace = true
 alvr_gui_common.workspace = true
 
 anyhow = "1"

alvr/launcher/Cargo.toml

@@ -117,9 +117,10 @@ pub fn create_recording_file() {
         "h265"
     };
 
-    let path = FILESYSTEM_LAYOUT
-        .log_dir
-        .join(format!("recording.{}.{ext}", chrono::Local::now().format("%F.%H-%M-%S")));
+    let path = FILESYSTEM_LAYOUT.log_dir.join(format!(
+        "recording.{}.{ext}",
+        chrono::Local::now().format("%F.%H-%M-%S")
+    ));
 
     match File::create(path) {
         Ok(mut file) => {

alvr/server/src/lib.rs

@@ -28,6 +28,7 @@ impl Display for Profile {
 
 pub fn build_streamer(
     profile: Profile,
+    enable_messagebox: bool,
     gpl: bool,
     root: Option<String>,
     reproducible: bool,
@@ -46,6 +47,10 @@ pub fn build_streamer(
         Profile::Release => common_flags.push("--release"),
         Profile::Debug => (),
     }
+    if enable_messagebox {
+        common_flags.push("--features");
+        common_flags.push("alvr_common/enable-messagebox");
+    }
     if reproducible {
         common_flags.push("--locked");
     }
@@ -191,7 +196,7 @@ pub fn build_streamer(
     }
 }
 
-pub fn build_launcher(profile: Profile, reproducible: bool) {
+pub fn build_launcher(profile: Profile, enable_messagebox: bool, reproducible: bool) {
     let sh = Shell::new().unwrap();
 
     let mut common_flags = vec![];
@@ -203,6 +208,10 @@ pub fn build_launcher(profile: Profile, reproducible: bool) {
         Profile::Release => common_flags.push("--release"),
         Profile::Debug => (),
     }
+    if enable_messagebox {
+        common_flags.push("--features");
+        common_flags.push("enable-alvr_common/enable-messagebox");
+    }
     if reproducible {
         common_flags.push("--locked");
     }

alvr/xtask/src/build.rs

@@ -186,24 +186,26 @@ fn main() {
                         dependencies::build_android_deps(for_ci);
                     }
                 }
-                "build-streamer" => build::build_streamer(profile, gpl, None, false, keep_config),
-                "build-launcher" => build::build_launcher(profile, false),
+                "build-streamer" => {
+                    build::build_streamer(profile, true, gpl, None, false, keep_config)
+                }
+                "build-launcher" => build::build_launcher(profile, true, false),
                 "build-client" => build::build_android_client(profile),
                 "build-client-lib" => build::build_client_lib(profile, link_stdcpp),
                 "run-streamer" => {
                     if !no_rebuild {
-                        build::build_streamer(profile, gpl, None, false, keep_config);
+                        build::build_streamer(profile, true, gpl, None, false, keep_config);
                     }
                     run_streamer();
                 }
                 "run-launcher" => {
                     if !no_rebuild {
-                        build::build_launcher(profile, false);
+                        build::build_launcher(profile, true, false);
                     }
                     run_launcher();
                 }
                 "package-streamer" => packaging::package_streamer(gpl, root, appimage, zsync),
-                "package-launcher" => packaging::package_launcher(),
+                "package-launcher" => packaging::package_launcher(appimage),
                 "package-client" => build::build_android_client(Profile::Distribution),
                 "package-client-lib" => packaging::package_client_lib(link_stdcpp),
                 "clean" => clean(),

alvr/xtask/src/main.rs

@@ -148,7 +148,7 @@ pub fn include_licenses(root_path: &Path, gpl: bool) {
 pub fn package_streamer(gpl: bool, root: Option<String>, appimage: bool, zsync: bool) {
     let sh = Shell::new().unwrap();
 
-    build::build_streamer(Profile::Distribution, gpl, root, true, false);
+    build::build_streamer(Profile::Distribution, !appimage, gpl, root, true, false);
 
     include_licenses(&afs::streamer_build_dir(), gpl);
 
@@ -166,10 +166,10 @@ pub fn package_streamer(gpl: bool, root: Option<String>, appimage: bool, zsync:
     }
 }
 
-pub fn package_launcher() {
+pub fn package_launcher(appimage: bool) {
     let sh = Shell::new().unwrap();
 
-    build::build_launcher(Profile::Distribution, true);
+    build::build_launcher(Profile::Distribution, !appimage, true);
 
     include_licenses(&afs::launcher_build_dir(), false);