sqf: remove asc (#809)

* sqf: remove asc * fmt
BrettMayson · Oct 20, 2024 · 1a0f679 · 1a0f679
1 parent 89056c4
commit 1a0f679
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 310 deletions.
diff --git a/bin/dist/asc/linux/asc b/bin/dist/asc/linux/asc
diff --git a/bin/dist/asc/windows/asc.exe b/bin/dist/asc/windows/asc.exe
diff --git a/bin/src/commands/build.rs b/bin/src/commands/build.rs
@@ -8,9 +8,6 @@ use crate::{
     report::Report,
 };
 
-#[cfg(not(target_os = "macos"))]
-use crate::modules::asc::ArmaScriptCompiler;
-
 #[must_use]
 pub fn cli() -> Command {
     add_just(add_args(
@@ -36,12 +33,6 @@ pub fn add_args(cmd: Command) -> Command {
             .help("Do not rapify (cpp, rvmat)")
             .action(ArgAction::SetTrue),
     )
-    .arg(
-        clap::Arg::new("asc")
-            .long("asc")
-            .help("Use ArmaScriptCompiler instead of HEMTT's SQF compiler")
-            .action(ArgAction::SetTrue),
-    )
 }
 
 #[must_use]
@@ -92,24 +83,14 @@ pub fn execute(matches: &ArgMatches) -> Result<Report, Error> {
 pub fn executor(ctx: Context, matches: &ArgMatches) -> Executor {
     let mut executor = Executor::new(ctx);
 
-    let use_asc = matches.get_one::<bool>("asc") == Some(&true);
-    if cfg!(target_os = "macos") && use_asc {
-        error!("ArmaScriptCompiler is not supported on macOS");
-        std::process::exit(1);
-    }
-
     executor.collapse(Collapse::No);
 
     executor.add_module(Box::<BOMCheck>::default());
     executor.add_module(Box::<Hooks>::default());
     if matches.get_one::<bool>("no-rap") != Some(&true) {
         executor.add_module(Box::<Rapifier>::default());
     }
-    executor.add_module(Box::new(SQFCompiler::new(!use_asc)));
-    #[cfg(not(target_os = "macos"))]
-    if use_asc {
-        executor.add_module(Box::<ArmaScriptCompiler>::default());
-    }
+    executor.add_module(Box::new(SQFCompiler::default()));
     if matches.get_one::<bool>("no-bin") != Some(&true) {
         executor.add_module(Box::<Binarize>::default());
     }

diff --git a/bin/src/commands/dev.rs b/bin/src/commands/dev.rs
@@ -11,9 +11,6 @@ use crate::{
     report::Report,
 };
 
-#[cfg(not(target_os = "macos"))]
-use crate::modules::asc::ArmaScriptCompiler;
-
 use super::build::add_just;
 
 #[must_use]
@@ -48,12 +45,6 @@ pub fn add_args(cmd: Command) -> Command {
             .help("Include all optional addon folders")
             .action(ArgAction::SetTrue),
     )
-    .arg(
-        clap::Arg::new("asc")
-            .long("asc")
-            .help("Use ArmaScriptCompiler instead of HEMTT's SQF compiler")
-            .action(ArgAction::SetTrue),
-    )
     .arg(
         clap::Arg::new("no-rap")
             .long("no-rap")
@@ -132,12 +123,6 @@ pub fn context(
         }
     }
 
-    let use_asc = matches.get_one::<bool>("asc") == Some(&true);
-    if cfg!(target_os = "macos") && use_asc {
-        error!("ArmaScriptCompiler is not supported on macOS");
-        std::process::exit(1);
-    }
-
     let mut executor = Executor::new(ctx);
 
     executor.collapse(Collapse::Yes);
@@ -147,11 +132,7 @@ pub fn context(
     if rapify && matches.get_one::<bool>("no-rap") != Some(&true) {
         executor.add_module(Box::<Rapifier>::default());
     }
-    executor.add_module(Box::new(SQFCompiler::new(!use_asc)));
-    #[cfg(not(target_os = "macos"))]
-    if use_asc {
-        executor.add_module(Box::<ArmaScriptCompiler>::default());
-    }
+    executor.add_module(Box::new(SQFCompiler::default()));
     executor.add_module(Box::<Files>::default());
     executor.add_module(Box::<FilePatching>::default());
     if force_binarize || matches.get_one::<bool>("binarize") == Some(&true) {

diff --git a/bin/src/error.rs b/bin/src/error.rs
@@ -5,10 +5,6 @@ pub enum Error {
     #[error("`.hemtt/project.toml` not found")]
     ConfigNotFound,
 
-    #[error("ASC: {0}")]
-    #[cfg(not(target_os = "macos"))]
-    ArmaScriptCompiler(String),
-
     #[error("Unable to create link: {0}")]
     #[allow(dead_code)] // Unused on Linux and Mac
     Link(String),

diff --git a/bin/src/modules/asc.rs b/bin/src/modules/asc.rs
diff --git a/bin/src/modules/mod.rs b/bin/src/modules/mod.rs
@@ -1,8 +1,5 @@
 use crate::{context::Context, error::Error, report::Report};
 
-#[cfg(not(target_os = "macos"))]
-pub mod asc;
-
 pub mod archive;
 pub mod bom;
 pub mod hook;