vinc
/
moros
mirror of https://github.com/vinc/moros.git
1
5
Fork 0
Code Issues Projects Releases Wiki Activity

Use git describe to display version (#437) 

* Use git describe to print version at boot

* Add version command
This commit is contained in:
Vincent Ollivier 2022-11-09 09:29:06 +01:00 committed by GitHub
parent 7ee885200a
commit 23d622176c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -19,8 +19,9 @@ audio = sdl# sdl, coreaudio
kvm = false
pcap = false
export MOROS_KEYBOARD = $(keyboard)
export MOROS_VERSION = $(shell git describe --tags | sed "s/^v//")
export MOROS_MEMORY = $(memory)
export MOROS_KEYBOARD = $(keyboard)
# Build userspace binaries
user-nasm:

2
src/lib.rs
View File

@ -30,7 +30,7 @@ pub fn init(boot_info: &'static BootInfo) {
sys::keyboard::init();
sys::time::init();
log!("MOROS v{}\n", env!("CARGO_PKG_VERSION"));
log!("MOROS v{}\n", option_env!("MOROS_VERSION").unwrap_or(env!("CARGO_PKG_VERSION")));
sys::mem::init(boot_info);
sys::cpu::init();
sys::pci::init(); // Require MEM

6
src/usr/shell.rs
View File

@ -334,6 +334,11 @@ fn cmd_unset(args: &[&str], config: &mut Config) -> Result<(), ExitCode> {
Ok(())
}
fn cmd_version(_args: &[&str]) -> Result<(), ExitCode> {
println!("MOROS v{}", option_env!("MOROS_VERSION").unwrap_or(env!("CARGO_PKG_VERSION")));
Ok(())
}
fn exec_with_config(cmd: &str, config: &mut Config) -> Result<(), ExitCode> {
#[cfg(test)] // FIXME: tests with `print foo => /bar` are failing without that
sys::console::print_fmt(format_args!(""));
@ -483,6 +488,7 @@ fn exec_with_config(cmd: &str, config: &mut Config) -> Result<(), ExitCode> {
"time" => usr::time::main(&args),
"unalias" => cmd_unalias(&args, config),
"unset" => cmd_unset(&args, config),
"version" => cmd_version(&args),
"user" => usr::user::main(&args),
"vga" => usr::vga::main(&args),
"write" => usr::write::main(&args),