Skip to content

Commit c639622

Browse files
committed
merge BOOTLOADER_*_VERSION contants into BOOTLOADER_VERSION
They all had the same value anway
1 parent eb9081e commit c639622

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

build.rs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@ use std::{
33
process::Command,
44
};
55

6-
const BOOTLOADER_X86_64_UEFI_VERSION: &str = env!("CARGO_PKG_VERSION");
7-
8-
const BOOTLOADER_X86_64_BIOS_BOOT_SECTOR_VERSION: &str = env!("CARGO_PKG_VERSION");
9-
const BOOTLOADER_X86_64_BIOS_STAGE_2_VERSION: &str = env!("CARGO_PKG_VERSION");
10-
const BOOTLOADER_X86_64_BIOS_STAGE_3_VERSION: &str = env!("CARGO_PKG_VERSION");
11-
const BOOTLOADER_X86_64_BIOS_STAGE_4_VERSION: &str = env!("CARGO_PKG_VERSION");
6+
const BOOTLOADER_VERSION: &str = env!("CARGO_PKG_VERSION");
127

138
fn main() {
149
let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
@@ -54,7 +49,7 @@ fn build_uefi_bootloader(out_dir: &Path) -> PathBuf {
5449
cmd.arg("--path").arg("uefi");
5550
println!("cargo:rerun-if-changed=uefi");
5651
} else {
57-
cmd.arg("--version").arg(BOOTLOADER_X86_64_UEFI_VERSION);
52+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
5853
}
5954
cmd.arg("--locked");
6055
cmd.arg("--target").arg("x86_64-unknown-uefi");
@@ -92,8 +87,7 @@ fn build_bios_boot_sector(out_dir: &Path) -> PathBuf {
9287
cmd.arg("--path").arg(&local_path);
9388
println!("cargo:rerun-if-changed={}", local_path.display());
9489
} else {
95-
cmd.arg("--version")
96-
.arg(BOOTLOADER_X86_64_BIOS_BOOT_SECTOR_VERSION);
90+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
9791
}
9892
cmd.arg("--locked");
9993
cmd.arg("--target").arg("i386-code16-boot-sector.json");
@@ -136,8 +130,7 @@ fn build_bios_stage_2(out_dir: &Path) -> PathBuf {
136130
cmd.arg("--path").arg(&local_path);
137131
println!("cargo:rerun-if-changed={}", local_path.display());
138132
} else {
139-
cmd.arg("--version")
140-
.arg(BOOTLOADER_X86_64_BIOS_STAGE_2_VERSION);
133+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
141134
}
142135
cmd.arg("--locked");
143136
cmd.arg("--target").arg("i386-code16-stage-2.json");
@@ -178,8 +171,7 @@ fn build_bios_stage_3(out_dir: &Path) -> PathBuf {
178171
cmd.arg("--path").arg(&local_path);
179172
println!("cargo:rerun-if-changed={}", local_path.display());
180173
} else {
181-
cmd.arg("--version")
182-
.arg(BOOTLOADER_X86_64_BIOS_STAGE_3_VERSION);
174+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
183175
}
184176
cmd.arg("--locked");
185177
cmd.arg("--target").arg("i686-stage-3.json");
@@ -220,8 +212,7 @@ fn build_bios_stage_4(out_dir: &Path) -> PathBuf {
220212
cmd.arg("--path").arg(&local_path);
221213
println!("cargo:rerun-if-changed={}", local_path.display());
222214
} else {
223-
cmd.arg("--version")
224-
.arg(BOOTLOADER_X86_64_BIOS_STAGE_4_VERSION);
215+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
225216
}
226217
cmd.arg("--locked");
227218
cmd.arg("--target").arg("x86_64-stage-4.json");

0 commit comments

Comments
 (0)