feat(build): add flat-bin kind and FAT [archive] packing for OS-dev

src/core/build/builder/artifact.rs

@@ -19,9 +19,130 @@ use crate::core::build::builder::BuildContext;
 use crate::core::build::common;
 use crate::platform;
 use crate::utils::build::is_bare_metal_target;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::time::Instant;
 
+pub(crate) fn artifact_dir(ctx: &BuildContext) -> PathBuf {
+    match ctx.target_dir {
+        Some(dir) => Path::new(dir).to_path_buf(),
+        None => Path::new("./target").join(ctx.profile),
+    }
+}
+
+pub(crate) fn flat_output_path(ctx: &BuildContext) -> String {
+    let name = ctx.output_filename.unwrap_or(ctx.project_name);
+    let ext = ctx.output_extension.unwrap_or("bin");
+    let file = if ext.is_empty() {
+        name.to_string()
+    } else {
+        format!("{name}.{ext}")
+    };
+    artifact_dir(ctx).join(file).to_string_lossy().to_string()
+}
+
+pub(crate) fn flat_source_output_path(ctx: &BuildContext, source: &str) -> String {
+    let stem = Path::new(source)
+        .file_stem()
+        .and_then(|s| s.to_str())
+        .unwrap_or("out");
+    let ext = ctx.output_extension.unwrap_or("bin");
+    let file = if ext.is_empty() {
+        stem.to_string()
+    } else {
+        format!("{stem}.{ext}")
+    };
+    artifact_dir(ctx).join(file).to_string_lossy().to_string()
+}
+
+fn resolve_objcopy() -> Result<String, String> {
+    for candidate in ["llvm-objcopy", "objcopy", "gobjcopy"] {
+        if Command::new(candidate)
+            .arg("--version")
+            .output()
+            .map(|o| o.status.success())
+            .unwrap_or(false)
+        {
+            return Ok(candidate.to_string());
+        }
+    }
+    Err(
+        "flat-bin requires llvm-objcopy, objcopy, or gobjcopy in PATH \
+         (install binutils or LLVM tools)"
+            .to_string(),
+    )
+}
+
+pub(crate) fn objcopy_binary(ctx: &BuildContext, input: &str, output: &str) -> Result<(), String> {
+    if let Some(parent) = Path::new(output).parent() {
+        std::fs::create_dir_all(parent).map_err(|e| format!("output dir error: {e}"))?;
+    }
+    if !common::needs_rebuild(input, output) {
+        return Ok(());
+    }
+    let tool = resolve_objcopy()?;
+    let mut cmd = Command::new(&tool);
+    cmd.arg("-O").arg("binary").arg(input).arg(output);
+    if ctx.verbose || std::env::var("DCR_DEBUG").is_ok() {
+        eprintln!("[dcr] {:?}", cmd);
+    }
+    common::run_command_sync_output(&mut cmd)
+}
+
+pub(crate) fn link_flat_binary(
+    ctx: &BuildContext,
+    objects: &[String],
+    default_linker: &str,
+    start_time: Instant,
+) -> Result<f64, String> {
+    let out_path = flat_output_path(ctx);
+    if !common::needs_link(objects, &out_path) {
+        return Ok(common::elapsed_secs(start_time));
+    }
+
+    let intermediate = {
+        let dir = match ctx.target_dir {
+            Some(dir) => Path::new(dir).join("obj"),
+            None => Path::new("./target").join(ctx.profile).join("obj"),
+        };
+        std::fs::create_dir_all(&dir).map_err(|e| format!("obj dir error: {e}"))?;
+        dir.join(format!("{}.flat.elf", ctx.project_name))
+            .to_string_lossy()
+            .to_string()
+    };
+
+    let mut cmd = Command::new(ctx.linker.unwrap_or(default_linker));
+    cmd.arg("-nostdlib").arg("-static");
+    for obj in objects {
+        cmd.arg(obj);
+    }
+    for dir in ctx.lib_dirs {
+        cmd.arg(format!("-L{dir}"));
+    }
+    for lib in ctx.libs {
+        cmd.arg(format!("-l{lib}"));
+    }
+    for flag in ctx.ldflags {
+        cmd.arg(flag);
+    }
+    cmd.arg("-o").arg(&intermediate);
+
+    if ctx.verbose || std::env::var("DCR_DEBUG").is_ok() {
+        eprintln!("[dcr] {:?}", cmd);
+    }
+    let output = cmd.output().map_err(|err| format!("Build failed: {err}"))?;
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        return Err(format!(
+            "flat-bin link failed:\nstdout: {stdout}\nstderr: {stderr}"
+        ));
+    }
+
+    objcopy_binary(ctx, &intermediate, &out_path)?;
+    Ok(common::elapsed_secs(start_time))
+}
+
 pub(crate) fn archive_static(
     ctx: &BuildContext,
     objects: &[String],
@@ -56,6 +177,10 @@ pub(crate) fn link_binary(
     default_linker: &str,
     start_time: Instant,
 ) -> Result<f64, String> {
+    if crate::utils::build::is_flat_bin(ctx.kind) {
+        return link_flat_binary(ctx, objects, default_linker, start_time);
+    }
+
     let mut cmd = Command::new(ctx.linker.unwrap_or(default_linker));
     if ctx.kind == "sharedlib" {
         if cfg!(target_os = "macos") {

src/core/build/builder/cc_common.rs

@@ -18,7 +18,7 @@
 use crate::core::build::builder::BuildContext;
 use crate::core::build::builder::artifact;
 use crate::core::build::common;
-use crate::utils::build::is_bare_metal_target;
+use crate::utils::build::{is_bare_metal_target, is_compile_only, is_flat_bin};
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::process::Command;
@@ -30,6 +30,9 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
     } else {
         ctx.compiler
     };
+    if is_flat_bin(ctx.kind) && ctx.qt {
+        return Err("flat-bin is not supported with build.qt = true".to_string());
+    }
     let start_time = Instant::now();
     let obj_dir = match ctx.target_dir {
         Some(dir) => Path::new(dir).join("obj"),
@@ -55,7 +58,7 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
     )?;
     let objects = build_objects(compiler, &sources, &obj_dir, ctx, "o", qt_include_path)?;
 
-    if ctx.kind == "none" || ctx.kind == "custom" {
+    if is_compile_only(ctx.kind) && !is_flat_bin(ctx.kind) {
         return Ok(common::elapsed_secs(start_time));
     }
 
@@ -142,7 +145,7 @@ fn build_object(
         cmd.arg("-fPIC");
     }
 
-    if (ctx.freestanding || is_bare_metal_target(ctx.target))
+    if (ctx.freestanding || is_bare_metal_target(ctx.target) || is_flat_bin(ctx.kind))
         && ctx.language.to_lowercase() != "asm"
     {
         cmd.arg("-ffreestanding");
@@ -178,8 +181,8 @@ fn build_object(
         }
     }
 
-    let use_dcr_defaults =
-        ctx.cflags.is_empty() && !(ctx.freestanding || is_bare_metal_target(ctx.target));
+    let use_dcr_defaults = ctx.cflags.is_empty()
+        && !(ctx.freestanding || is_bare_metal_target(ctx.target) || is_flat_bin(ctx.kind));
     if use_dcr_defaults {
         for flag in default_flags(ctx.profile) {
             cmd.arg(flag);

src/core/build/builder/msvc/mod.rs

@@ -16,8 +16,10 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use crate::core::build::builder::BuildContext;
+use crate::core::build::builder::artifact;
 use crate::core::build::common;
 use crate::platform;
+use crate::utils::build::{is_compile_only, is_flat_bin};
 use std::fs;
 use std::path::Path;
 use std::process::Command;
@@ -33,6 +35,9 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
     if lang.contains("asm") {
         return Err("MSVC backend does not support build.language with asm".to_string());
     }
+    if is_flat_bin(ctx.kind) && ctx.qt {
+        return Err("flat-bin is not supported with build.qt = true".to_string());
+    }
     let start_time = Instant::now();
     let sources = collect_sources(ctx)?;
     let obj_dir = match ctx.target_dir {
@@ -41,10 +46,14 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
     };
     let objects = build_objects(compiler, &sources, &obj_dir, ctx, "obj")?;
 
-    if ctx.kind == "none" || ctx.kind == "custom" {
+    if is_compile_only(ctx.kind) && !is_flat_bin(ctx.kind) {
         return Ok(common::elapsed_secs(start_time));
     }
 
+    if is_flat_bin(ctx.kind) {
+        return link_flat_msvc(ctx, compiler, &objects, &obj_dir, start_time);
+    }
+
     if ctx.kind == "staticlib" {
         let lib_path = platform::lib_path(ctx.profile, ctx.project_name, ctx.target_dir);
         if !common::needs_link(&objects, &lib_path) {
@@ -145,6 +154,61 @@ pub fn build(ctx: &BuildContext) -> Result<f64, String> {
     }
 }
 
+fn link_flat_msvc(
+    ctx: &BuildContext,
+    compiler: &str,
+    objects: &[String],
+    obj_dir: &Path,
+    start_time: Instant,
+) -> Result<f64, String> {
+    let out_path = artifact::flat_output_path(ctx);
+    if !common::needs_link(objects, &out_path) {
+        return Ok(common::elapsed_secs(start_time));
+    }
+    fs::create_dir_all(obj_dir).map_err(|e| format!("obj dir error: {e}"))?;
+    let intermediate = obj_dir
+        .join(format!("{}.flat.exe", ctx.project_name))
+        .to_string_lossy()
+        .to_string();
+
+    let mut cmd = Command::new(compiler);
+    cmd.arg("/nologo");
+    for obj in objects {
+        cmd.arg(obj);
+    }
+    for flag in ctx.cflags {
+        cmd.arg(flag);
+    }
+    for dir in ctx.lib_dirs {
+        cmd.arg(format!("/LIBPATH:{dir}"));
+    }
+    for lib in ctx.libs {
+        if lib.to_lowercase().ends_with(".lib") {
+            cmd.arg(lib);
+        } else {
+            cmd.arg(format!("{lib}.lib"));
+        }
+    }
+    cmd.arg(format!("/Fe:{intermediate}"));
+    if !ctx.ldflags.is_empty() {
+        cmd.arg("/link");
+        for flag in ctx.ldflags {
+            cmd.arg(flag);
+        }
+    }
+    if ctx.verbose || std::env::var("DCR_DEBUG").is_ok() {
+        eprintln!("[dcr] {:?}", cmd);
+    }
+    let status = cmd
+        .status()
+        .map_err(|e| format!("flat-bin link failed: {e}"))?;
+    if !status.success() {
+        return Err("flat-bin link failed".to_string());
+    }
+    artifact::objcopy_binary(ctx, &intermediate, &out_path)?;
+    Ok(common::elapsed_secs(start_time))
+}
+
 pub(crate) fn collect_sources(ctx: &BuildContext) -> Result<Vec<String>, String> {
     let extensions = source_extensions(ctx.language);
     common::collect_sources(