Revert "Merge pull request rust-osdev#304 from AlexJMohr/cargo-features"

This reverts commit 5e42ad0, reversing
changes made to 94c71d5.

Author: jasoncouture

.github/workflows/ci.yml

@@ -62,14 +62,6 @@ jobs:
       - name: Run integration tests
         run: cargo test
 
-      # test feature gates (only on one OS is enough)
-      - name: Test with only UEFI feature
-        if: runner.os == 'Linux'
-        run: cargo test --no-default-features --features uefi
-      - name: Test with only BIOS feature
-        if: runner.os == 'Linux'
-        run: cargo test --no-default-features --features bios
-
   fmt:
     name: Check Formatting
     runs-on: ubuntu-latest

Cargo.toml

@@ -37,17 +37,12 @@ bootloader_api = { version = "0.11.0", path = "api" }
 bootloader-x86_64-common = { version = "0.11.0", path = "common" }
 bootloader-x86_64-bios-common = { version = "0.11.0", path = "bios/common" }
 
-[features]
-default = ["bios", "uefi"]
-bios = ["dep:mbrman", "bootloader_test_runner/bios"]
-uefi = ["dep:gpt", "bootloader_test_runner/uefi"]
-
 [dependencies]
 anyhow = "1.0.32"
 fatfs = "0.3.4"
+gpt = "3.0.0"
+mbrman = "0.5.1"
 tempfile = "3.3.0"
-mbrman = { version = "0.5.1", optional = true }
-gpt = { version = "3.0.0", optional = true }
 
 [dev-dependencies]
 bootloader_test_runner = { path = "tests/runner" }

build.rs

@@ -3,49 +3,47 @@ use std::{
     process::Command,
 };
 
-const BOOTLOADER_VERSION: &str = env!("CARGO_PKG_VERSION");
+const BOOTLOADER_X86_64_UEFI_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+const BOOTLOADER_X86_64_BIOS_BOOT_SECTOR_VERSION: &str = env!("CARGO_PKG_VERSION");
+const BOOTLOADER_X86_64_BIOS_STAGE_2_VERSION: &str = env!("CARGO_PKG_VERSION");
+const BOOTLOADER_X86_64_BIOS_STAGE_3_VERSION: &str = env!("CARGO_PKG_VERSION");
+const BOOTLOADER_X86_64_BIOS_STAGE_4_VERSION: &str = env!("CARGO_PKG_VERSION");
 
 fn main() {
     let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
 
-    #[cfg(feature = "uefi")]
-    {
-        let uefi_path = build_uefi_bootloader(&out_dir);
-        println!(
-            "cargo:rustc-env=UEFI_BOOTLOADER_PATH={}",
-            uefi_path.display()
-        );
-    }
+    let uefi_path = build_uefi_bootloader(&out_dir);
+    println!(
+        "cargo:rustc-env=UEFI_BOOTLOADER_PATH={}",
+        uefi_path.display()
+    );
 
-    #[cfg(feature = "bios")]
-    {
-        let bios_boot_sector_path = build_bios_boot_sector(&out_dir);
-        println!(
-            "cargo:rustc-env=BIOS_BOOT_SECTOR_PATH={}",
-            bios_boot_sector_path.display()
-        );
-        let bios_stage_2_path = build_bios_stage_2(&out_dir);
-        println!(
-            "cargo:rustc-env=BIOS_STAGE_2_PATH={}",
-            bios_stage_2_path.display()
-        );
+    let bios_boot_sector_path = build_bios_boot_sector(&out_dir);
+    println!(
+        "cargo:rustc-env=BIOS_BOOT_SECTOR_PATH={}",
+        bios_boot_sector_path.display()
+    );
+    let bios_stage_2_path = build_bios_stage_2(&out_dir);
+    println!(
+        "cargo:rustc-env=BIOS_STAGE_2_PATH={}",
+        bios_stage_2_path.display()
+    );
 
-        let bios_stage_3_path = build_bios_stage_3(&out_dir);
-        println!(
-            "cargo:rustc-env=BIOS_STAGE_3_PATH={}",
-            bios_stage_3_path.display()
-        );
+    let bios_stage_3_path = build_bios_stage_3(&out_dir);
+    println!(
+        "cargo:rustc-env=BIOS_STAGE_3_PATH={}",
+        bios_stage_3_path.display()
+    );
 
-        let bios_stage_4_path = build_bios_stage_4(&out_dir);
-        println!(
-            "cargo:rustc-env=BIOS_STAGE_4_PATH={}",
-            bios_stage_4_path.display()
-        );
-    }
+    let bios_stage_4_path = build_bios_stage_4(&out_dir);
+    println!(
+        "cargo:rustc-env=BIOS_STAGE_4_PATH={}",
+        bios_stage_4_path.display()
+    );
 }
 
 #[cfg(not(docsrs_dummy_build))]
-#[cfg(feature = "uefi")]
 fn build_uefi_bootloader(out_dir: &Path) -> PathBuf {
     let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
     let mut cmd = Command::new(cargo);
@@ -55,7 +53,7 @@ fn build_uefi_bootloader(out_dir: &Path) -> PathBuf {
         cmd.arg("--path").arg("uefi");
         println!("cargo:rerun-if-changed=uefi");
     } else {
-        cmd.arg("--version").arg(BOOTLOADER_VERSION);
+        cmd.arg("--version").arg(BOOTLOADER_X86_64_UEFI_VERSION);
     }
     cmd.arg("--locked");
     cmd.arg("--target").arg("x86_64-unknown-uefi");
@@ -80,7 +78,6 @@ fn build_uefi_bootloader(out_dir: &Path) -> PathBuf {
 }
 
 #[cfg(not(docsrs_dummy_build))]
-#[cfg(feature = "bios")]
 fn build_bios_boot_sector(out_dir: &Path) -> PathBuf {
     let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
     let mut cmd = Command::new(cargo);
@@ -93,7 +90,8 @@ fn build_bios_boot_sector(out_dir: &Path) -> PathBuf {
         cmd.arg("--path").arg(&local_path);
         println!("cargo:rerun-if-changed={}", local_path.display());
     } else {
-        cmd.arg("--version").arg(BOOTLOADER_VERSION);
+        cmd.arg("--version")
+            .arg(BOOTLOADER_X86_64_BIOS_BOOT_SECTOR_VERSION);
     }
     cmd.arg("--locked");
     cmd.arg("--target").arg("i386-code16-boot-sector.json");
@@ -123,7 +121,6 @@ fn build_bios_boot_sector(out_dir: &Path) -> PathBuf {
 }
 
 #[cfg(not(docsrs_dummy_build))]
-#[cfg(feature = "bios")]
 fn build_bios_stage_2(out_dir: &Path) -> PathBuf {
     let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
     let mut cmd = Command::new(cargo);
@@ -136,7 +133,8 @@ fn build_bios_stage_2(out_dir: &Path) -> PathBuf {
         cmd.arg("--path").arg(&local_path);
         println!("cargo:rerun-if-changed={}", local_path.display());
     } else {
-        cmd.arg("--version").arg(BOOTLOADER_VERSION);
+        cmd.arg("--version")
+            .arg(BOOTLOADER_X86_64_BIOS_STAGE_2_VERSION);
     }
     cmd.arg("--locked");
     cmd.arg("--target").arg("i386-code16-stage-2.json");
@@ -164,7 +162,6 @@ fn build_bios_stage_2(out_dir: &Path) -> PathBuf {
 }
 
 #[cfg(not(docsrs_dummy_build))]
-#[cfg(feature = "bios")]
 fn build_bios_stage_3(out_dir: &Path) -> PathBuf {
     let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
     let mut cmd = Command::new(cargo);
@@ -177,7 +174,8 @@ fn build_bios_stage_3(out_dir: &Path) -> PathBuf {
         cmd.arg("--path").arg(&local_path);
         println!("cargo:rerun-if-changed={}", local_path.display());
     } else {
-        cmd.arg("--version").arg(BOOTLOADER_VERSION);
+        cmd.arg("--version")
+            .arg(BOOTLOADER_X86_64_BIOS_STAGE_3_VERSION);
     }
     cmd.arg("--locked");
     cmd.arg("--target").arg("i686-stage-3.json");
@@ -205,7 +203,6 @@ fn build_bios_stage_3(out_dir: &Path) -> PathBuf {
 }
 
 #[cfg(not(docsrs_dummy_build))]
-#[cfg(feature = "bios")]
 fn build_bios_stage_4(out_dir: &Path) -> PathBuf {
     let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
     let mut cmd = Command::new(cargo);
@@ -218,7 +215,8 @@ fn build_bios_stage_4(out_dir: &Path) -> PathBuf {
         cmd.arg("--path").arg(&local_path);
         println!("cargo:rerun-if-changed={}", local_path.display());
     } else {
-        cmd.arg("--version").arg(BOOTLOADER_VERSION);
+        cmd.arg("--version")
+            .arg(BOOTLOADER_X86_64_BIOS_STAGE_4_VERSION);
     }
     cmd.arg("--locked");
     cmd.arg("--target").arg("x86_64-stage-4.json");
@@ -246,7 +244,6 @@ fn build_bios_stage_4(out_dir: &Path) -> PathBuf {
     convert_elf_to_bin(elf_path)
 }
 
-#[cfg(feature = "bios")]
 fn convert_elf_to_bin(elf_path: PathBuf) -> PathBuf {
     let flat_binary_path = elf_path.with_extension("bin");