directories structure changed

BlackBox/Linux/Host/Mod/Lang.odc

@@ -1 +0,0 @@
-../../../OpenBSD/Host/Mod/Lang.odc

BlackBox/Linux/Host/Mod/Lang.txt

@@ -1 +0,0 @@
-../../../OpenBSD/Host/Mod/Lang.txt

BlackBox/Linux/Lin/Rsrc/loader/BlackBox-dl.c

@@ -1 +0,0 @@
-../../../../OpenBSD/Lin/Rsrc/loader/BlackBox-dl.c

BlackBox/Linux/Lin/Rsrc/loader/BlackBox.c

@@ -1 +0,0 @@
-../../../../OpenBSD/Lin/Rsrc/loader/BlackBox.c

BlackBox/Linux/Lin/Rsrc/loader/BlackBox1.c

@@ -1 +0,0 @@
-../../../../OpenBSD/Lin/Rsrc/loader/BlackBox1.c

BlackBox/Linux/Lin/Rsrc/loader/dev0.c

@@ -1 +0,0 @@
-../../../../OpenBSD/Lin/Rsrc/loader/dev0.c

BlackBox/OpenBSD/Lin/Mod/Kernel_so_init.odc

@@ -1 +0,0 @@
-../../../Linux/Lin/Mod/Kernel_so_init.odc

BlackBox/OpenBSD/Lin/Mod/Kernel_so_init.txt

@@ -1 +0,0 @@
-../../../Linux/Lin/Mod/Kernel_so_init.txt

BlackBox/HostTextConv.txt → BlackBox/_LinuxOpenBSD_/Host/Mod/TextConv.txt

@@ -1,6 +1,6 @@
 MODULE HostTextConv;
 
-	(* THIS IS TEXT COPY OF HostTextConv.odc *)
+	(* THIS IS TEXT COPY OF TextConv.odc *)
 	(* DO NOT EDIT *)
 
 	IMPORT

BlackBox/build

@@ -68,10 +68,10 @@ Dev0Compiler.Compile('Std/Mod', 'Headers.txt')
 Dev0Compiler.Compile('Std/Mod', 'Links.txt')
 
 Dev0Compiler.Compile('Std/Mod', 'Loader.txt')
-Dev0Compiler.Compile('Lin/Mod', 'Kernel_so_init.txt')
+Dev0Compiler.Compile('System/Mod', 'Kernel_so_init.txt')
 
 # before StdLog
-Dev0Compiler.Compile('', 'HostDialog.txt')
+Dev0Compiler.Compile('Host/Mod', 'Dialog.txt')
 
 Dev0Compiler.Compile('Std/Mod', 'Log.txt')
 # Dev0Compiler.Compile('', 'StdLog.txt')
@@ -98,17 +98,17 @@ Dev0Compiler.Compile('Std/Mod', 'Interpreter.txt')
 
 ### BlackBox
 
-Dev0Compiler.Compile('', 'HostFonts.txt')
-Dev0Compiler.Compile('', 'HostWindows.txt')
+Dev0Compiler.Compile('Host/Mod', 'Fonts.txt')
+Dev0Compiler.Compile('Host/Mod', 'Windows.txt')
 Dev0Compiler.Compile('Host/Mod', 'Dates.txt')
-Dev0Compiler.Compile('', 'HostTextConv.txt')
+Dev0Compiler.Compile('Host/Mod', 'TextConv.txt')
 
 Dev0Compiler.Compile('Enc/Mod', 'StdAliases.txt')
 Dev0Compiler.Compile('Enc/Mod', 'StdCodecs.txt')
 
 Dev0Compiler.Compile('Cons/Mod', 'Interp.txt')
 
-Dev0Compiler.Compile('', 'Init-Interp.txt')
+Dev0Compiler.Compile('System/Mod', 'Init.txt')
 
 Dev0ElfLinker.LinkDll('libBB.so := Kernel+ Files HostFiles StdLoader')
 # Dev0ElfLinker.LinkDll('libBB.so := Kernel+ Kernel_so_init# Files HostFiles StdLoader')

BlackBox/build-dev0

@@ -34,7 +34,7 @@ Dev0Compiler.Compile('Host/Mod', 'Console.txt')
 
 ### simple dev interpreter (include Dev0Compiler, Dev0ElfLinker)
 
-Dev0Compiler.Compile('', 'Views.txt')
+Dev0Compiler.Compile('Dev0', 'Views.txt')
 Dev0Compiler.Compile('Std/Mod', 'Interpreter.txt')
 
 Dev0Compiler.Compile('Dev0/Mod', 'Interp.txt')

BlackBox/switch-os

@@ -1,51 +0,0 @@
-#!/bin/sh
-
-none() {
-	if [ -e System/Mod/Kernel.odc -a ! -h System/Mod/Kernel.odc ]; then
-		echo Kernel.odc modified
-		exit 1
-	fi
-
-	rm -rf \
-		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 *.exe *.so BlackBox dev0
-}
-
-obsd() {
-	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
-	ln -s OpenBSD/libBB0.so
-	ln -s OpenBSD/BlackBox
-	ln -s OpenBSD/dev0
-	ln -s OpenBSD/libdlobsdwrap.so
-}
-
-lin() {
-	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
-	ln -s Linux/libBB0.so
-	ln -s Linux/BlackBox
-	ln -s Linux/dev0
-}
-
-case $1 in
-none)
-	none
-	;;
-OpenBSD)
-	none && obsd
-	;;
-Linux)
-	none && lin
-	;;
-*)
-	echo "usage: `basename $0` ( none | OpenBSD | Linux )"
-	;;
-esac

BlackBox/switch-target

@@ -0,0 +1,63 @@
+#!/bin/sh
+
+checkAndRm () {
+	lines=`find . -name "_*" -mindepth 1 -maxdepth 1 -print | sed 's/\.\///'`
+	for line in $lines; do
+		find "${line}" \( -type f -o -type l \) -print |
+		while read l; do
+			to=`echo $l | sed "s/^${line}\///"`
+			if [ -e "${to}" -a -h "${to}" ]; then
+				rm -f "${to}"
+			fi
+		done
+	done
+}
+
+none() {
+	checkAndRm || exit 2
+
+	rm -rf *.exe *.so BlackBox dev0 \
+		System/Code/Kernel.ocf System/Sym/Kernel.osf \
+		Code/Kernel.ocf Sym/Kernel.osf \
+		Host/Code/*.ocf Host/Sym/*.osf Lin/Code/*.ocf Lin/Sym/*.osf
+}
+
+mklinks () {
+	find "${1}" \( -type f -o -type l \) -mindepth ${2} -maxdepth ${2} -print |
+	while read l; do
+		to=`echo $l | sed "s/^${line}\///"`
+		mkdir -p `dirname "${to}"`
+		ln -s "${3}"/${l} "${to}"
+	done
+}
+
+dolinks () {
+	lines1=`find . -name "_*${1}*_" -mindepth 1 -maxdepth 1 -print | sed 's/\.\///'`
+	lines2=`find . -name "__*${2}*" -mindepth 1 -maxdepth 1 -print | sed 's/\.\///'`
+	lines3=`find . -name "_*"${1}"*_*${2}*" -mindepth 1 -maxdepth 1 -print | sed 's/\.\///'`
+	for line in  $lines1 $lines2 $lines3; do
+		find "${line}" \( -type f -o -type l \) -mindepth 1 -maxdepth 1 -print |
+		while read l; do
+			ln -s $l
+		done
+
+		mklinks "${line}" 3 ../..
+		mklinks "${line}" 4 ../../..
+	done
+}
+
+if [ $# -eq 1 ]; then
+	if [ "${1}" = "none" ]; then
+		none
+	else
+		none || exit 2
+		dolinks "${1}" Interp
+	fi
+elif [ $# -eq 2 ]; then
+	none || exit 2
+	dolinks "${1}" "${2}"
+else
+	echo "usage: `basename $0` ( none | OS [ configuration ] )"
+	echo "	OS: Linux | OpenBSD"
+	exit 1
+fi

README

@@ -6,14 +6,21 @@ Tested on OpenBSD 5.2, Fedora Core 17, Ubuntu 12.04 LTS
 Some significant parts taken from OpenBUGS (http://www.openbugs.info/)
 
 How to build:
-	compile loader executable (BlackBox itself and simple interpreter):
-		`uname -s`/libBB0.so must be present (can be built from Windows)
+	cd BlackBox
+	./clean
+	./switch-target `uname -s`
 
-		cd BlackBox/`uname -s`/Lin/Rsrc/loader; make
+	compile loader executables (for BlackBox itself and for simple develompent interpreter):
+		cd BlackBox/Lin/Rsrc/loader
+		make clean
+		make
+		mv BlackBox dev0 ../../../_`uname -s`_/Lin/Rsrc/loader/
+		OpenBSD: move also libdlobsdwrap.so
 
 	compile self:
-
-		cd BlackBox; ./switch-os `uname -s`; ./clean; ./build-dev0; ./build
+		cd BlackBox
+		./build-dev0
+		./build
 
 Files:
 	original:
@@ -36,13 +43,13 @@ Files:
 			Dev/Docu/ElfLinker.odc
 			Docu/OpenBUGS-License.odc
 		http://forum.oberoncore.ru/viewtopic.php?f=34&t=1159&sid=3e82517160caa46c64331178c1b61e95:
-			{Linux,OpenBSD}/Lin/Mod/Kernel_so_init.odc
+			{_LinuxOpenBSD_}/System/Mod/Kernel_so_init.odc
 		http://oberoncore.ru/projects/bb16ru-kras/:
 			Dev/Rsrc/ru/Strings.odc
 			Std/Rsrc/ru/Strings.odc
 			System/Rsrc/ru/Strings.odc
 	modified:
-		OpenBSD/System/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)
@@ -57,37 +64,37 @@ Files:
 					IsReadable
 				Kernel.cmdLine support:
 					Kernel.INIT (SetCmdLine2)
-		Linux/System/Mod/Kernel.odc:
-			OpenBSD/System/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/Host/Mod/Files.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/Host/Mod/Files.odc:
+		_Linux_/Host/Mod/Files.odc:
 			OpenBUGS Lin/Mod/linHostFiles.odc:
 				Kernel.cmdLine support:
 					str := "" -> str := Kernel.cmdLine$
-		OpenBSD/Lin/Mod/Libc.txt:
+		_OpenBSD_/Lin/Mod/Libc.txt:
 			OpenBUGS Lin/Mod/Libc.odc:
 				OpenBSD-specific
-		Linux/Lin/Mod/Libc.odc:
+		_Linux_/Lin/Mod/Libc.odc:
 			OpenBUGS Lin/Mod/Libc.odc:
 				PROT_*, MAP_*, O_*, _SC_PAGESIZE, SIGSTKSZ CONSTs added
 				open, close, read, write, mmap, munmap, mprotect, getenv, sysconf, sigaltstack functions added
-		Linux/Lin/Mod/Dl.odc:
+		_Linux_/Lin/Mod/Dl.odc:
 			OpenBUGS Lin/Mod/Dl.odc
-		Linux/Host/Mod/Dates.odc: from http://oberoncore.ru/
-		OpenBSD/Host/Mod/Dates.odc:
-			Linux/Host/Mod/Dates.odc: OpenBSD-specific
-		Dev0/Mod
+		_Linux_/Host/Mod/Dates.odc: from http://oberoncore.ru/
+		_OpenBSD_/Host/Mod/Dates.odc:
+			_Linux_/Host/Mod/Dates.odc: OpenBSD-specific
+		Dev0/Mod:
 			CP*
 				BlackBox 1.6-rc6 Dev CP* modified to not depend on Dates, Texts etc.
 			Compiler.odc:
@@ -96,16 +103,16 @@ Files:
 				modified original BlackBox Dev/Mod/Linker.odc
 			ElfLinker16.odc:
 				modified OpenBUGS Dev/Mod/ElfLinker16.odc
-		HostTextConv.odc:
+		_LinuxOpenBSD_/Host/Mod/TextConv.odc:
 			BlackBox 1.6-rc6 Host/Mod/TextConv.odc:
 				Windows-specific converters removed
 	new:
 		Console:
 			System/Mod/Console.odc: Console interface
-			Linux/Host/Mod/Console.odc: Console implementation for Linux
-			OpenBSD/Host/Mod/Console.odc:
-				Linux/Host/Mod/Console.odc: stdin -> SYSTEM.ADR(__sF[0]) (OpenBSD-specific)
-			Windows/Host/Mod/Console.odc:
+			_Linux_/Host/Mod/Console.odc: Console implementation for Linux
+			_OpenBSD_/Host/Mod/Console.odc:
+				_Linux_/Host/Mod/Console.odc: stdin -> SYSTEM.ADR(__sF[0]) (OpenBSD-specific)
+			_Windows_/Host/Mod/Console.odc:
 				Console implementation for Windows
 		Cons/Mod
 			Interp.odc: console interpreter
@@ -113,14 +120,15 @@ Files:
 			Log.odc: Log.Hook console implementation
 		Enc: encodings conversion subsystem
 			typical usage -- from low level modules (from Hosts), as libiconv
-		{OpenBSD,Linux}/Host/Mod/Lang.odc: Dialog.LanguageHook implementation and LANG environment variable support
+		_LinuxOpenBSD_/Host/Mod/Lang.odc: Dialog.LanguageHook implementation and LANG environment variable support
 
-		{OpenBSD,Linux}/libBB.so: compiled and linked shared library to run BlackBox
-		{OpenBSD,Linux}/libBB0.so: compiled and linked shared library to run simple development interpreter
-		Windows/dev0.exe: compiled and linked simple development interpreter
+		{_OpenBSD_,_Linux_}/libBB.so: compiled and linked shared library to run BlackBox
+		{_OpenBSD_,_Linux_}/libBB0.so: compiled and linked shared library to run simple development interpreter
+		_Windows_/dev0.exe: compiled and linked simple development interpreter
 
-		Views.odc: minimal Views implementation required to compile StdInterpreter
-		HostFonts.odc, HostDialog.odc, HostWindows.odc: simple Hosts implementation
+		Dev0/Views.odc: minimal Views implementation required to compile StdInterpreter
+		__Interp/Host/Mod: Fonts.odc, Dialog.odc, Windows.odc: simple Hosts implementation
+		_LinuxOpenBSD_/System/Mod/Init.odc: Init for console interpreter
 
 Notes:
 	Dev0: