diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index ca2938f..d32d4a3 100644 Binary files a/TempleOSCD/0000Boot/0000Kernel.BIN.C and b/TempleOSCD/0000Boot/0000Kernel.BIN.C differ diff --git a/TempleOSCD/Adam/ADefine.HC b/TempleOSCD/Adam/ADefine.HC index 4d8cb96..9a40ce6 100644 --- a/TempleOSCD/Adam/ADefine.HC +++ b/TempleOSCD/Adam/ADefine.HC @@ -18,7 +18,7 @@ U0 LoadDocDefines() //$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$ $TR-C,"LineRep"$ -$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,415"); +$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,419"); DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","82,012"); $ID,-4$ DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR); diff --git a/TempleOSCD/Apps/Budget/BgtAccts.HC b/TempleOSCD/Apps/Budget/BgtAccts.HC index 1fc6a5b..881b99c 100644 --- a/TempleOSCD/Apps/Budget/BgtAccts.HC +++ b/TempleOSCD/Apps/Budget/BgtAccts.HC @@ -25,13 +25,13 @@ U0 BgtAcctsUpdate() U0 BgtAcctsWrite() { BgtAcctsUpdate; - StrFileWrite(BGT_ACCTS_FILE,accts_table,TRUE); + StrFileWrite(bgt_accts_file,accts_table,TRUE); } U0 BgtAcctsRead() { I64 i,max_num; - U8 *colors,**s=StrFileRead(BGT_ACCTS_FILE,&max_num,&colors,TRUE); + U8 *colors,**s=StrFileRead(bgt_accts_file,&max_num,&colors,TRUE); StrFileDel(accts_table); accts_table=HashTableNew(512); accts_table_strs=0; diff --git a/TempleOSCD/Apps/Budget/BgtFile.HC b/TempleOSCD/Apps/Budget/BgtFile.HC index a58a6c5..d6624b2 100644 --- a/TempleOSCD/Apps/Budget/BgtFile.HC +++ b/TempleOSCD/Apps/Budget/BgtFile.HC @@ -5,7 +5,7 @@ U0 BgtDataRead() I64 i,cnt,size; U8 *b,*ptr; I64 max_num; - U8 **s=StrFileRead(BGT_STRINGS_FILE,&max_num); + U8 **s=StrFileRead(bgt_string_file,&max_num); MemSet(&b_head,0,sizeof(CBgtEntry)); QueInit(&b_head); @@ -14,7 +14,7 @@ U0 BgtDataRead() QueInit(&t_head); t_head.b.date=Now; - if (ptr=b=FileRead(BGT_DATA_FILE,&size)) { + if (ptr=b=FileRead(bgt_data_file,&size)) { cnt=*ptr(I64 *)++; for (i=0;inext; } - StrFileWrite(BGT_STRINGS_FILE,table); + StrFileWrite(bgt_string_file,table); StrFileDel(table); size=sizeof(I64)*2+cnt1*BE_SIZE+cnt2*(BT_SIZE+BE_SIZE); @@ -112,7 +112,7 @@ U0 BgtDataWrite() tmpt=tmpt->next; } - FileWrite(BGT_DATA_FILE,buf,size); + FileWrite(bgt_data_file,buf,size); Free(buf); } diff --git a/TempleOSCD/Apps/Budget/BgtMain.HC b/TempleOSCD/Apps/Budget/BgtMain.HC index 05f6493..4c0ea73 100644 --- a/TempleOSCD/Apps/Budget/BgtMain.HC +++ b/TempleOSCD/Apps/Budget/BgtMain.HC @@ -50,7 +50,7 @@ Bool BgtPutKey(CDoc *doc,U8 *,I64 ch,I64 sc) PopUpOk( "Set the name and color of your accounts.\n" "To delete accounts, manually edit\n" "$$GREEN$$~/Budget/Accts.DD.Z$$FG$$."); - if (PopUpEd(BGT_ACCTS_FILE,Fs)) { + if (PopUpEd(bgt_accts_file,Fs)) { BgtAcctsRead; BgtRegen; } @@ -167,9 +167,15 @@ U0 BgtRegen() doc->user_put_key=&BgtPutKey; } -U0 Budget() +U0 Budget(U8 *dirname="~/Budget") { CDoc *pdoc,*ddoc,*old_put,*old_display; + + Cd(dirname); + bgt_string_file =FileNameAbs("Strs.DD.Z"); + bgt_accts_file =FileNameAbs("Accts.DD.Z"); + bgt_data_file =FileNameAbs("Bgt.DATA.Z"); + BgtAcctsRead; BgtDataRead; CBgtTemplatesExpand; diff --git a/TempleOSCD/Apps/Budget/Budget.HC b/TempleOSCD/Apps/Budget/Budget.HC index 0cc0d6b..27ca2b0 100644 --- a/TempleOSCD/Apps/Budget/Budget.HC +++ b/TempleOSCD/Apps/Budget/Budget.HC @@ -1,6 +1,6 @@ -#define BGT_STRINGS_FILE "~/Budget/Strs.DD.Z" -#define BGT_ACCTS_FILE "~/Budget/Accts.DD.Z" -#define BGT_DATA_FILE "~/Budget/Bgt.DATA.Z" +U8 *bgt_string_file; +U8 *bgt_accts_file; +U8 *bgt_data_file; #define BE_NORMAL 0 #define BE_GAS 1 diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index dd892dc..a7dd275 100644 Binary files a/TempleOSCD/Compiler/Compiler.BIN and b/TempleOSCD/Compiler/Compiler.BIN differ diff --git a/TempleOSCD/Compiler/CompilerB.HH b/TempleOSCD/Compiler/CompilerB.HH index e581d65..989e1f4 100644 --- a/TempleOSCD/Compiler/CompilerB.HH +++ b/TempleOSCD/Compiler/CompilerB.HH @@ -61,6 +61,7 @@ public extern I64 MemberMetaData(U8 *st,CMemberLst *ml); public extern CMemberLstMeta *MemberMetaFind(U8 *st,CMemberLst *ml); public extern CHashClass *OptClassFwd(CHashClass *tmpc); public extern I64 PrsKeyWord(CCmpCtrl *cc); + #help_index "Compiler;Cmd Line (Typically)" extern I64 Cmp(U8 *filename, U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0); diff --git a/TempleOSCD/Demo/AcctExample/PersonalMenu.DD b/TempleOSCD/Demo/AcctExample/PersonalMenu.DD index acb3ab0..c561102 100644 --- a/TempleOSCD/Demo/AcctExample/PersonalMenu.DD +++ b/TempleOSCD/Demo/AcctExample/PersonalMenu.DD @@ -1,5 +1,5 @@ $MA,"Cd ",LM="Cd;Dir;\n"$$MA,"DrvC ",LM="Drv('C');\n"$$MA,"DrvD ",LM="Drv('D');\n"$$MA,"/ ",LM="Cd(\"/\");Dir;\n"$$MA,"TOS ",LM="Cd(\"/Home/TOS\");Dir;\n"$$MA,"Home ",LM="Cd(\"/Home\");Dir;\n"$$MA,"ChgDskT ",LM="DskChg('T');\n"$$MA,"MergeD ",LM="S2T(\"C:/*\",\"+r+S\");Merge(\"C:/*;!*/LineRep*\",\"D:/*;!*/LineRep*\",\"+r+d\");\n"$$MA,"MergeT ",LM="S2T(\"C:/*\",\"+r+S\");Merge(\"C:/*;!*/LineRep*\",\"T:/*;!*/LineRep*\",\"+r+d\");\n"$$MA,"D:/Wb ",LM="Cd(\"D:/Wb\");Dir;\n"$ -$MA,"MakeC ",LM="TOSBootHDIns('C');\n"$$MA+PU,"BootC ",LM="BootRAM(\"C:/Kernel.BIN.C\");"$$MA,"Regen ",LM="TOSRegen;\n"$$MA,"PreRegen",LM="TOSPreRegen;\n"$$MA,"MakeD ",LM="TOSBootHDIns('D');\n"$$MA+PU,"BootD ",LM="BootRAM(\"D:/Kernel.BIN.C\");"$$MA,"CopyDrv ",LM="TOSPmtAndCopyDrv;\n"$$MA,"Private ",LM="Cd(\"/Home/Private\");Dir;\n"$ +$MA,"MakeC ",LM="TOSBootHDIns('C');\n"$$MA+PU,"BootC ",LM="BootRAM(\"C:/Kernel.BIN.C\");"$$MA,"Regen ",LM="TOSRegen;\n"$$MA,"PreRegen",LM="TOSPreRegen;\n"$$MA,"MakeD ",LM="TOSBootHDIns('D');\n"$$MA+PU,"BootD ",LM="BootRAM(\"D:/Kernel.BIN.C\");"$$MA,"CopyDrv ",LM="TOSPmtAndCopyDrv;\n"$$MA,"Private ",LM="Cd(\"/Home/Private\");Dir;\n"$$MA-X+PU,"Budget ",LM="#include \"::/Apps/Budget/Load\";Budget(\"~/Private/Budget\");"$ $MA,"Kernel ",LM="Cd(\"/Kernel\");Dir;\n"$$MA,"Compiler",LM="Cd(\"/Compiler\");Dir;\n"$$MA,"BlkDev ",LM="Cd(\"/Kernel/BlkDev\");Dir;\n"$$MA,"Mem ",LM="Cd(\"/Kernel/Mem\");Dir;\n"$$MA,"Serial ",LM="Cd(\"/Kernel/SerialDev\");Dir;\n"$$MA,"Bin ",LM="Cd(\"/Home/Sup1/Sup1Bin\");Dir;\n"$$MA,"HDAudio ",LM="Cd(\"/Home/Sup1/Sup1HDAudio\");Dir;\n"$$MA,"Examples",LM="Cd(\"/Home/Sup1/Sup1HDAudio/Examples\");Dir;\n"$$MA,"Dist ",LM="Cd(\"/Home/Sup1/Sup1Distro\");Dir;\n"$ $MA,"Adam ",LM="Cd(\"/Adam\");Dir;\n"$$MA,"AutoComp",LM="Cd(\"/Adam/AutoComplete\");Dir;\n"$$MA,"Ctrls ",LM="Cd(\"/Adam/Ctrls\");Dir;\n"$$MA,"ABlkDev ",LM="Cd(\"/Adam/ABlkDev\");Dir;\n"$$MA,"DolDoc ",LM="Cd(\"/Adam/DolDoc\");Dir;\n"$$MA,"Gr ",LM="Cd(\"/Adam/Gr\");Dir;\n"$$MA,"God ",LM="Cd(\"/Adam/God\");Dir;\n"$$MA,"Snd ",LM="Cd(\"/Adam/Snd\");Dir;\n"$$MA,"Boot ",LM="Cd(\"/Adam/Opt/Boot\");Dir;\n"$$MA,"Utils ",LM="Cd(\"/Adam/Opt/Utils\");Dir;\n"$ $LK+X,"ChgLog ",A="FI:::/Doc/ChgLog.DD"$$MA,"Blog ",LM="Blog;\n"$$MA,"EdGod ",LM="Ed(\"D:/Home/God.DD\");\n"$$MA,"EdNotes ",LM="Ed(\"::/Home/Private/TOSNotes.DD\");\n"$$MA,"BlogDir ",LM="Cd(\"/Home/Web/TAD/BlogDir\");Dir;\n"$$MA,"Partial ",LM="FreshenBlog;\n"$$MA,"CodeWalk",LM="CodeWalkThru;\n"$$MA,"TOSTheme",LM="TOSTheme;\n"$$MA,"Videos ",LM="Cd(\"/Home/Sup1/Sup1Videos\");Dir;\n"$ diff --git a/TempleOSCD/Demo/AcctExample/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index 1ee3a24..69f494e 100644 --- a/TempleOSCD/Demo/AcctExample/Registry.HC +++ b/TempleOSCD/Demo/AcctExample/Registry.HC @@ -62,7 +62,7 @@ $ID,-2$$TR,"Titanium"$ $ID,2$I64 best_score=16469; $ID,-2$$TR,"TOSRegen"$ $ID,2$progress1_tf=0.000;progress2_tf=0.000; -progress3_tf=0.000;progress4_tf=192.684; +progress3_tf=0.000;progress4_tf=196.181; $ID,-2$$ID,-2$$TR,"Once"$ $ID,2$$TR,"Adam"$ $ID,2$$ID,-2$$TR,"User"$ diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC index b3305b8..1514834 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC @@ -96,7 +96,6 @@ U0 DistroPrep() DelTree("/Demo/AcctExample"); CopyTree("/Home","/Demo/AcctExample"); - DelTree("/Demo/AcctExample/Budget"); DelTree("/Demo/AcctExample/Private"); DelTree("/Demo/AcctExample/Sup1"); DelTree("/Demo/AcctExample/Books1"); diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSToHtml.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSToHtml.HC index 0bc33ca..b0eec79 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSToHtml.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSToHtml.HC @@ -480,7 +480,6 @@ public U0 FreshenSite() Cd("D:/Wb"); DelTree("D:/Wb/Home/Books1"); DelTree("D:/Wb/Home/Books2"); - DelTree("D:/Wb/Home/Budget"); DelTree("D:/Wb/Home/Private"); Del("D:/Wb/Home/*"); Touch("D:/Wb/Home/Web/index.DD.Z",""); diff --git a/TempleOSCD/Doc/ChgLog.DD b/TempleOSCD/Doc/ChgLog.DD index 6a504d1..4a217ca 100644 --- a/TempleOSCD/Doc/ChgLog.DD +++ b/TempleOSCD/Doc/ChgLog.DD @@ -2,7 +2,7 @@ $WW,1$$FG,5$$TX+CX,"Change Log"$$FG$ Use $LK,"R",A="MN:R"$() to rename if I change a label. -$IV,1$----01/31/17 02:48:45----$IV,0$ +$IV,1$----01/31/17 03:33:54----$IV,0$ * Added $LK,"TOS Linux Setup",A="FF:::/Demo/AcctExample/TOS/TOSPolicies.DD,TOS Linux Setup"$. $IV,1$----01/31/17 00:20:31----$IV,0$