From 623fe0ea9b49e8b6b6bd011767f2713ff5bb4a04 Mon Sep 17 00:00:00 2001 From: GutPuncher Date: Sun, 26 Nov 2023 04:24:21 -0500 Subject: [PATCH] Implement Semantic Versioning. --- src/HomeSys.ZC | 2 +- src/Kernel/KGlobals.ZC | 4 ++++ src/Kernel/KMain.ZC | 5 ++++- src/Kernel/KernelC.HH | 4 ++++ src/System/Boot/DiskISORedSea.ZC | 2 +- src/System/Define.ZC | 2 +- src/System/WallPaper.ZC | Bin 7566 -> 7589 bytes 7 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/HomeSys.ZC b/src/HomeSys.ZC index 2820b304..fdeedfc8 100755 --- a/src/HomeSys.ZC +++ b/src/HomeSys.ZC @@ -40,4 +40,4 @@ U0 StartUpTasks() StartUpTasks; -"\nZealOS V%0.2f\t%D %T\n\n", sys_os_version, sys_compile_time, sys_compile_time; +"\n%s\n\n", sys_os_version_nice; \ No newline at end of file diff --git a/src/Kernel/KGlobals.ZC b/src/Kernel/KGlobals.ZC index 34cacbe8..c372e793 100755 --- a/src/Kernel/KGlobals.ZC +++ b/src/Kernel/KGlobals.ZC @@ -14,6 +14,10 @@ U8 *rev_bits_table; //Table with U8 bits reversed CDate local_time_offset; F64 *pow10_I64, sys_os_version = 2.03; +U64 sys_os_version_sub = 107; +U8 *sys_os_version_str; +U8 *sys_os_version_full; +U8 *sys_os_version_nice; CAutoCompleteDictGlobals acd; CAutoCompleteGlobals ac; diff --git a/src/Kernel/KMain.ZC b/src/Kernel/KMain.ZC index 31c938c7..069734b7 100755 --- a/src/Kernel/KMain.ZC +++ b/src/Kernel/KMain.ZC @@ -152,7 +152,10 @@ U0 KMain() //Before this point use $LK,"Sound",A="MN:Sound"$() and $LK,"Busy",A="MN:Busy"$() //to debug. After this point, use $LK,"RawPrint",A="MN:RawPrint"$() LBts(&sys_run_level, RLf_RAW); - "\nZealOS V%0.2f\t%D %T\n", sys_os_version, sys_compile_time, sys_compile_time; + sys_os_version_str = MStrPrint("ZealOS V%0.2f.%d", sys_os_version, sys_os_version_sub); + sys_os_version_nice = MStrPrint("%s\t%D %T\n", sys_os_version_str, sys_compile_time, sys_compile_time); + sys_os_version_full = MStrPrint("%s-%d.%d\n", sys_os_version_str, sys_compile_time.date, sys_compile_time.time); + "\n%s\n", sys_os_version_full; "_________________________________\n\n"; "TimerInit;\n"; diff --git a/src/Kernel/KernelC.HH b/src/Kernel/KernelC.HH index 7e7901e3..3c984c9a 100755 --- a/src/Kernel/KernelC.HH +++ b/src/Kernel/KernelC.HH @@ -581,6 +581,10 @@ public extern I64 MessageScan(I64 *_arg1=NULL, I64 *_arg2=NULL, I64 mask=~1, CTa public extern U0 QuickSort( U8 *base, I64 num, I64 width, I64 (*fp_compare)(U8 *e1, U8 *e2)); public extern U0 QuickSortI64(I64 *base, I64 num, I64 (*fp_compare)(I64 e1, I64 e2)); public extern F64 sys_os_version; +public extern U64 sys_os_version_sub; +public extern U8 *sys_os_version_str; +public extern U8 *sys_os_version_full; +public extern U8 *sys_os_version_nice; #help_index "Misc/Progress Bars" public extern U0 ProgressBarsReset(U8 *path=NULL); diff --git a/src/System/Boot/DiskISORedSea.ZC b/src/System/Boot/DiskISORedSea.ZC index cc3a247e..6c6d500a 100755 --- a/src/System/Boot/DiskISORedSea.ZC +++ b/src/System/Boot/DiskISORedSea.ZC @@ -78,7 +78,7 @@ U0 RedSeaISO9660(U8 *iso_filename, U8 drv_let) iso_pri->file_structure_version = 1; StrCopy(iso_pri->publisher_id, "ZealOS RedSea"); - st = MStrPrint("ZealOS V%0.2f %D %T", sys_os_version, Now, Now); + st = MStrPrint("%s %D %T", sys_os_version_str, Now, Now); StrCopy(iso_pri->preparer_id, st); Free(st); diff --git a/src/System/Define.ZC b/src/System/Define.ZC index 707e21d0..901ce1bc 100755 --- a/src/System/Define.ZC +++ b/src/System/Define.ZC @@ -4,7 +4,7 @@ U0 LoadDocDefines() { CZXE *zxe = mem_boot_base - sizeof(CZXE); - DefinePrint("DD_OS_NAME_VERSION", "ZealOS V%0.2f", sys_os_version); + DefinePrint("DD_OS_NAME_VERSION", sys_os_version_str); DefinePrint("DD_ZEALOS_AGE", "%0.1f", (Now - Str2Date("9/1/2019")) / ToF64(1 << 32) / CDATE_YEAR_DAYS); DefinePrint("DD_TEMPLEOS_AGE", "%0.1f", (Str2Date("8/11/2018") - Str2Date("8/1/2003")) / ToF64(1 << 32) / CDATE_YEAR_DAYS); diff --git a/src/System/WallPaper.ZC b/src/System/WallPaper.ZC index 063af42652fa49764520e574179f1cb6f9a26625..b273714eee6bb95392a704dd4fa31e83433c783a 100755 GIT binary patch delta 53 ucmeCPUTVETO;|%uHAP8Bp}4X*KEF7=EVZaOGd~ZVA75OWwAoxZoC^T@;uAdp delta 30 lcmZ2#-DkZ)O;}J#N1?c~I6l8PzAUw