Spexeah/Asuro
4
1
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

git-svn-id: https://spexeah.com:8443/svn/Asuro@664 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

Browse Source
This commit is contained in:
kieron
2018-05-05 21:04:48 +00:00
parent e5321d8b46
commit cac366e78c
15 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Asuro.iso
BIN
View File
Binary file not shown.
bin/kernel.bin
BIN
View File
Binary file not shown.
iso/boot/asuro.bin
BIN
View File
Binary file not shown.
lib/asuro.ppu
BIN
View File
Binary file not shown.
lib/kernel.ppu
BIN
View File
Binary file not shown.
lib/libpconsole.a
BIN
View File
Binary file not shown.
lib/libpmultiboot.a
BIN
View File
Binary file not shown.
lib/libpsystem.a
BIN
View File
Binary file not shown.
lib/shell.ppu
BIN
View File
Binary file not shown.
lib/terminal.ppu
BIN
View File
Binary file not shown.
src/include/asuro.pas
+10 -7
View File
@@ -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
src/prog/shell.pas
+39 -2
View File
@@ -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');
src/prog/terminal.pas
+13 -6
View File
@@ -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);
version
+1 -1
View File
@@ -1 +1 @@
1 0 0 a
1 0 1 ia
versioning.sh
+7 -1
View File
@@ -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