diff --git a/Asuro.iso b/Asuro.iso index 5069df20..0c599f0d 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index c8c194ff..66f7dd13 100755 Binary files a/bin/kernel.bin and b/bin/kernel.bin differ diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin index c8c194ff..66f7dd13 100755 Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ diff --git a/lib/asuro.ppu b/lib/asuro.ppu index b09f936a..f3f1d9b5 100644 Binary files a/lib/asuro.ppu and b/lib/asuro.ppu differ diff --git a/lib/kernel.ppu b/lib/kernel.ppu index 36a55dad..7940b4ea 100644 Binary files a/lib/kernel.ppu and b/lib/kernel.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index b75c1f46..ca61fb07 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index 76c40615..376002af 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index dac3f89c..920bdd03 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/lib/shell.ppu b/lib/shell.ppu index 35bd499e..d41ac494 100644 Binary files a/lib/shell.ppu and b/lib/shell.ppu differ diff --git a/lib/terminal.ppu b/lib/terminal.ppu index 06e96550..973910d0 100644 Binary files a/lib/terminal.ppu and b/lib/terminal.ppu differ diff --git a/src/include/asuro.pas b/src/include/asuro.pas index e057207d..8c3172d4 100644 --- a/src/include/asuro.pas +++ b/src/include/asuro.pas @@ -3,17 +3,20 @@ unit asuro; interface const - VERSION = '1.0.0-662a'; + VERSION = '1.0.1-663ia'; VERSION_MAJOR = '1'; VERSION_MINOR = '0'; - VERSION_SUB = '0'; - REVISION = '662'; - RELEASE = 'a'; - LINE_COUNT = 26907; + VERSION_SUB = '1'; + REVISION = '663'; + RELEASE = 'ia'; + LINE_COUNT = 26954; + FILE_COUNT = 83; + DRIVER_COUNT = 28; FPC_VERSION = '2.6.4'; NASM_VERSION = '2.10.09'; - COMPILE_DATE = '05-05-18'; - COMPILE_TIME = '20:57:19'; + MAKE_VERSION = '3.81'; + COMPILE_DATE = '05/05/18'; + COMPILE_TIME = '22:04:28'; implementation diff --git a/src/prog/shell.pas b/src/prog/shell.pas index b9409154..9a2015b0 100644 --- a/src/prog/shell.pas +++ b/src/prog/shell.pas @@ -3,7 +3,7 @@ unit shell; interface uses - Console, RTC, terminal, strings; + Console, RTC, terminal, strings, asuro; procedure init(); @@ -63,8 +63,45 @@ begin end; procedure onBaseDraw(); +var + versionSize : uint32; + versionDrawX : uint32; + releaseSize : uint32; + releaseDrawX : uint32; + begin clearWNDEx(DesktopHandle, Desktop_Colors); + if not(StringEquals(asuro.RELEASE, 'r')) then begin + versionSize:= StringSize(asuro.VERSION) + StringSize('Asuro v'); + versionDrawX:= 157 - versionSize; + setCursorPosWND(versionDrawX, 60, DesktopHandle); + writestringExWND('ASURO v', Desktop_Colors, DesktopHandle); + writestringExWND(asuro.VERSION, Desktop_Colors, DesktopHandle); + if StringEquals(asuro.RELEASE, 'rc') then begin + releaseSize:= StringSize('RELEASE CANDIDATE'); + releaseDrawX:= 157 - (versionSize div 2) - (releaseSize div 2); + setCursorPosWND(releaseDrawX, 61, DesktopHandle); + writeStringExWND('RELEASE CANDIDATE', Desktop_Colors, DesktopHandle); + end; + if StringEquals(asuro.RELEASE, 'ia') then begin + releaseSize:= StringSize('INTERNAL ALPHA'); + releaseDrawX:= 157 - (versionSize div 2) - (releaseSize div 2); + setCursorPosWND(releaseDrawX, 61, DesktopHandle); + writeStringExWND('INTERNAL ALPHA', Desktop_Colors, DesktopHandle); + end; + if StringEquals(asuro.RELEASE, 'a') then begin + releaseSize:= StringSize('ALPHA'); + releaseDrawX:= 157 - (versionSize div 2) - (releaseSize div 2); + setCursorPosWND(releaseDrawX, 61, DesktopHandle); + writeStringExWND('ALPHA', Desktop_Colors, DesktopHandle); + end; + if StringEquals(asuro.RELEASE, 'b') then begin + releaseSize:= StringSize('BETA'); + releaseDrawX:= 157 - (versionSize div 2) - (releaseSize div 2); + setCursorPosWND(releaseDrawX, 61, DesktopHandle); + writeStringExWND('BETA', Desktop_Colors, DesktopHandle); + end; + end; end; procedure Command_Background(Params : PParamList); @@ -92,7 +129,7 @@ procedure init(); begin Takbar_Colors:= console.combinecolors($0000, $FFFF); Explore_Colors:= console.combinecolors($01C3, $07EE); - Desktop_Colors:= console.combinecolors($01C3, $34DB); + Desktop_Colors:= console.combinecolors($FFFF, $34DB); DesktopHandle:= Console.newWindow(0, 0, 159, 63, 'DESKTOP'); TaskBarHandle:= Console.newWindow(0, 63, 159, 1, 'SHELL'); diff --git a/src/prog/terminal.pas b/src/prog/terminal.pas index 6fbe7c19..fdb8431a 100644 --- a/src/prog/terminal.pas +++ b/src/prog/terminal.pas @@ -206,19 +206,26 @@ end; procedure version(params : PParamList); begin - console.writestringWND('Asuro Version: ', TERMINAL_HWND); + console.writestringWND(' Asuro Version: ', TERMINAL_HWND); console.writestringlnWND(asuro.VERSION, TERMINAL_HWND); console.writestringWND(' Compiled on: ', TERMINAL_HWND); console.writestringWND(asuro.COMPILE_DATE, TERMINAL_HWND); console.writestringWND(' ', TERMINAL_HWND); console.writestringlnWND(asuro.COMPILE_TIME, TERMINAL_HWND); console.writestringlnWND(' Compiled With: ', TERMINAL_HWND); - console.writestringWND(' FPC Version: ', TERMINAL_HWND); - console.writestringlnWND(asuro.FPC_VERSION, TERMINAL_HWND); - console.writestringWND(' NASM Version: ', TERMINAL_HWND); + console.writestringWND(' NASM - Version: ', TERMINAL_HWND); console.writestringlnWND(asuro.NASM_VERSION, TERMINAL_HWND); - console.writestringWND(' Source Line-Count: ', TERMINAL_HWND); - console.writeintlnWND(asuro.LINE_COUNT, TERMINAL_HWND); + console.writestringWND(' FPC - Version: ', TERMINAL_HWND); + console.writestringlnWND(asuro.FPC_VERSION, TERMINAL_HWND); + console.writestringWND(' MAKE - Version: ', TERMINAL_HWND); + console.writestringlnWND(asuro.MAKE_VERSION, TERMINAL_HWND); + console.writestringWND(' ', TERMINAL_HWND); + console.writeintWND(asuro.LINE_COUNT, TERMINAL_HWND); + console.writestringWND(' lines, across ', TERMINAL_HWND); + console.writeintWND(asuro.FILE_COUNT, TERMINAL_HWND); + console.writestringlnWND(' files.', TERMINAL_HWND); + console.writestringWND(' Baked Drivers: ', TERMINAL_HWND); + console.writeintlnWND(asuro.DRIVER_COUNT, TERMINAL_HWND); end; procedure help(params : PParamList); diff --git a/version b/version index 7e461b3a..aa7a46c7 100644 --- a/version +++ b/version @@ -1 +1 @@ -1 0 0 a +1 0 1 ia diff --git a/versioning.sh b/versioning.sh index 5e191607..bda0b9da 100755 --- a/versioning.sh +++ b/versioning.sh @@ -8,10 +8,13 @@ while IFS=: read -r line;do release=$(echo $line | awk '{print $4}') done <"$file" linecount=$(./loc.sh | awk '{print $1}') +sourcecount=$(find src -type f | wc -l) +drivercount=$(find src/driver -type f | wc -l) revision=$(svn info | grep Revision | awk '{print $2}') fpcversion=$(fpc -h | grep -m 1 version | awk '{print $5}') +makeversion=$(make -v | grep GNU | awk '{print $3}') nasmversion=$(nasm -v | awk '{print $3'}) -compiledate=$(date +"%d-%m-%y") +compiledate=$(date +"%d/%m/%y") compiletime=$(date +"%T") echo "unit asuro;" > $outfile echo " " >> $outfile @@ -25,8 +28,11 @@ echo " VERSION_SUB = '$sub';" >> $outfile echo " REVISION = '$revision';" >> $outfile echo " RELEASE = '$release';" >> $outfile echo " LINE_COUNT = $linecount;" >> $outfile +echo " FILE_COUNT = $sourcecount;" >> $outfile +echo " DRIVER_COUNT = $drivercount;" >> $outfile echo " FPC_VERSION = '$fpcversion';" >> $outfile echo " NASM_VERSION = '$nasmversion';" >> $outfile +echo " MAKE_VERSION = '$makeversion';" >> $outfile echo " COMPILE_DATE = '$compiledate';" >> $outfile echo " COMPILE_TIME = '$compiletime';" >> $outfile echo " " >> $outfile