tree structure was updated to conform with the original

BlackBox/Linux/Host/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

BlackBox/OpenBSD/Host/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

BlackBox/build

@@ -3,7 +3,7 @@
 ./run-lindev <<DATA
 LindevCompiler.Compile('Lin/Mod', 'Dl.txt')
 LindevCompiler.Compile('Lin/Mod', 'Libc.txt')
-LindevCompiler.Compile('Lin/Mod', 'Kernel.txt')
+LindevCompiler.Compile('System/Mod', 'Kernel.txt')
 
 LindevCompiler.Compile('System/Mod', 'Files.txt')
 LindevCompiler.Compile('System/Mod', 'Console.txt')
@@ -12,8 +12,8 @@ LindevCompiler.Compile('System/Mod', 'Strings.txt')
 LindevCompiler.Compile('System/Mod', 'Meta.txt')
 LindevCompiler.Compile('System/Mod', 'Dialog.txt')
 
-LindevCompiler.Compile('Lin/Mod', 'Console.txt')
-LindevCompiler.Compile('Lin/Mod', 'HostFiles.txt')
+LindevCompiler.Compile('Host/Mod', 'Files.txt')
+LindevCompiler.Compile('Host/Mod', 'Console.txt')
 
 LindevCompiler.Compile('System/Mod', 'Stores.txt')
 LindevCompiler.Compile('System/Mod', 'Converters.txt')
@@ -98,8 +98,7 @@ LindevCompiler.Compile('Std/Mod', 'Interpreter.txt')
 
 LindevCompiler.Compile('', 'HostFonts.txt')
 LindevCompiler.Compile('', 'HostWindows.txt')
-# HostDates:
-LindevCompiler.Compile('Lin/Mod', 'Dates.txt')
+LindevCompiler.Compile('Host/Mod', 'Dates.txt')
 
 LindevCompiler.Compile('Cons/Mod', 'Interp.txt')
 

BlackBox/build-lindev

@@ -3,7 +3,7 @@
 ./run-lindev <<DATA
 LindevCompiler.Compile('Lin/Mod', 'Dl.txt')
 LindevCompiler.Compile('Lin/Mod', 'Libc.txt')
-LindevCompiler.Compile('Lin/Mod', 'Kernel.txt')
+LindevCompiler.Compile('System/Mod', 'Kernel.txt')
 
 LindevCompiler.Compile('System/Mod', 'Files.txt')
 LindevCompiler.Compile('System/Mod', 'Console.txt')
@@ -26,8 +26,8 @@ LindevCompiler.Compile('Lindev/Mod', 'CPV486.txt')
 LindevCompiler.Compile('Lindev/Mod', 'Compiler.txt')
 LindevCompiler.Compile('Lindev/Mod', 'ElfLinker16.txt')
 
-LindevCompiler.Compile('Lin/Mod', 'Console.txt')
-LindevCompiler.Compile('Lin/Mod', 'HostFiles.txt')
+LindevCompiler.Compile('Host/Mod', 'Files.txt')
+LindevCompiler.Compile('Host/Mod', 'Console.txt')
 
 ### simple dev interpreter (include LindevCompiler and LindevElfLinker)
 

BlackBox/switch-os

@@ -7,13 +7,14 @@ none() {
 	fi
 
 	rm -rf \
-		System/Mod/Kernel.odc System/Code/Kernel.ocf System/Sym/Kernel.osf \
+		System/Mod/Kernel.odc System/Mod/Kernel.txt System/Code/Kernel.ocf System/Sym/Kernel.osf \
 		Code/Kernel.ocf Sym/Kernel.osf \
 		Host Win Lin BlackBox blackbox.exe BlackBox.exe *.so lindev
 }
 
 obsd() {
-	ln -s ../../OpenBSD/Lin/Mod/Kernel.odc System/Mod/Kernel.odc
+	ln -s ../../OpenBSD/System/Mod/Kernel.odc System/Mod/Kernel.odc
+	ln -s ../../OpenBSD/System/Mod/Kernel.txt System/Mod/Kernel.txt
 	ln -s OpenBSD/Lin
 	ln -s OpenBSD/Host
 	ln -s OpenBSD/libBB.so
@@ -24,7 +25,8 @@ obsd() {
 }
 
 lin() {
-	ln -s ../../Linux/Lin/Mod/Kernel.odc System/Mod/Kernel.odc
+	ln -s ../../Linux/System/Mod/Kernel.odc System/Mod/Kernel.odc
+	ln -s ../../Linux/System/Mod/Kernel.txt System/Mod/Kernel.txt
 	ln -s Linux/Lin
 	ln -s Linux/Host
 	ln -s Linux/libBB.so

README

@@ -38,7 +38,7 @@ Files:
 		http://forum.oberoncore.ru/viewtopic.php?f=34&t=1159&sid=3e82517160caa46c64331178c1b61e95:
 			{Linux,OpenBSD}/Lin/Mod/Kernel_so_init.odc
 	modified:
-		OpenBSD/Lin/Mod/Kernel.odc:
+		OpenBSD/System/Mod/Kernel.odc:
 			1.6-rc6 System/Mod/Kernel.odc, OpenBUGS Lin/Mod/linKernel.odc:
 				OpenBSD specific:
 					Memory management rewritten (based on mmap)
@@ -53,28 +53,28 @@ Files:
 					IsReadable
 				Kernel.cmdLine support:
 					Kernel.INIT (SetCmdLine2)
-		Linux/Lin/Mod/Kernel.odc:
-			OpenBSD/Lin/Mod/Kernel.odc modified for Linux:
+		Linux/System/Mod/Kernel.odc:
+			OpenBSD/System/Mod/Kernel.odc modified for Linux:
 				Time*
 				TrapHandler
 				mmap: use "/dev/zero" device instead of -1
 				mprotect addresses must be page-aligned
 				do not show warning message if signal install failed
-		OpenBSD/Lin/Mod/HostFiles.odc:
+		OpenBSD/Host/Mod/Files.odc:
 			OpenBUGS Lin/Mod/linHostFiles.odc:
 				OpenBSD-specific:
 					size_t
 					__xstat -> stat
 				Kernel.cmdLine support:
 					str := "" -> str := Kernel.cmdLine$
-		Linux/Lin/Mod/HostFiles.odc:
+		Linux/Host/Mod/Files.odc:
 			OpenBUGS Lin/Mod/linHostFiles.odc:
 				Kernel.cmdLine support:
 					str := "" -> str := Kernel.cmdLine$
-		OpenBSD/Lin/Mod/Console.odc:
+		OpenBSD/Host/Mod/Console.odc:
 			OpenBUGS Lin/Mod/Console.odc:
 				stdin -> SYSTEM.ADR(__sF[0])
-		Linux/Lin/Mod/Console.odc:
+		Linux/Host/Mod/Console.odc:
 			OpenBUGS Lin/Mod/Console.odc
 		OpenBSD/Lin/Mod/Libc.txt:
 			OpenBUGS Lin/Mod/Libc.odc:
@@ -85,11 +85,9 @@ Files:
 				open, close, read, write, mmap, munmap, mprotect, getenv, sysconf, sigaltstack functions added
 		Linux/Lin/Mod/Dl.odc:
 			OpenBUGS Lin/Mod/Dl.odc
-		OpenBSD/Lin/Mod/Dates.odc:
-			HostDates, from http://oberoncore.ru/:
-				OpenBSD-specific
-		Linux/Lin/Mod/Dates.odc:
-			HostDates, from http://oberoncore.ru/
+		Linux/Host/Mod/Dates.odc: from http://oberoncore.ru/
+		OpenBSD/Host/Mod/Dates.odc:
+			Linux/Host/Mod/Dates.odc: OpenBSD-specific
 		Lindev/Mod
 			CP*
 				BlackBox 1.6-rc6 Dev CP* modified to not depend on Dates, Texts etc.

TODO

@@ -6,7 +6,7 @@ By priority:
 	localization:
 		Kernel.cmdLine:
 			decode (encoding = current locale encoding)
-		LinConsole:
+		HostConsole:
 			encode on printf, encoding = current locale encoding
 			decode on Read, encoding = current locale encoding
 		filenames: