From 70d722deee1c894c91d2af18f37645acf3f51af3 Mon Sep 17 00:00:00 2001 From: Aren Elchinyan Date: Wed, 31 Jan 2024 20:19:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=BE?= =?UTF-8?q?=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/version.h | 2 +- kernel/cpu/arch.c | 1 - scripts/pbuild.py | 10 ++++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/version.h b/include/version.h index 4499ce9..8a91815 100644 --- a/include/version.h +++ b/include/version.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 1 -#define VERSION_BUILD 986 +#define VERSION_BUILD 987 diff --git a/kernel/cpu/arch.c b/kernel/cpu/arch.c index b206aa1..654be6e 100644 --- a/kernel/cpu/arch.c +++ b/kernel/cpu/arch.c @@ -41,7 +41,6 @@ uint64_t arch_get_tick_l( ) { } void arch_init( ) { - gdt_init( ); pic_init( ); idt_init( ); cpu_init( ); diff --git a/scripts/pbuild.py b/scripts/pbuild.py index 794902f..f422d1e 100644 --- a/scripts/pbuild.py +++ b/scripts/pbuild.py @@ -36,19 +36,17 @@ def version_build(): if build > 999: build = 0 minor += 1 - file.write(f"#define VERSION_MINOR {minor}\n") - file.write(f"#define VERSION_BUILD {build}\n") elif line.startswith("#define VERSION_MAJOR"): parts = line.split() major = int(parts[2]) - file.write(line) elif line.startswith("#define VERSION_MINOR"): parts = line.split() - minor = int(parts[2]) - file.write(line) + minor += int(parts[2]) else: file.write(line) - + file.write(f"#define VERSION_MAJOR {major}\n") + file.write(f"#define VERSION_MINOR {minor}\n") + file.write(f"#define VERSION_BUILD {build}\n") return [major, minor, build] def sort_strings(strings):