добавлен скрипт export для создания целевых сборок, добавлен второй способ запуска в линкус-сборку, реорганизованы старые файлы (удалены устаревшие, для примеров сделана спец.папка)

README

@@ -1,18 +1,11 @@
-old: old branch based on BlackBox.Linux.20050512.zip; will be removed later
+./new/
+    universal development environment
+    synchronized with original BlackBox 1.6
 
-new: head branch, mostly based on Trurl work done in 2006
-	synchronized with original BlackBox 1.6
-
-ubuntu: copy of "new" branch for Ubuntu, synchronized with bb16base-core.7z
-	these files differ between bb16base-core.7z and original BlackBox 1.6:
-		Dev/Mod/Commanders.odc
-		Dev/Mod/Compiler.odc
-		Dev/Mod/Debug.odc
-		Dev/Mod/Packer.odc
-		Sql/Mod/DB.odc
-		Sql/Mod/Odbc3.odc
-		Std/Mod/Folds.odc
-		Std/Mod/Links.odc
-		Std/Mod/Stamps.odc
-		System/Mod/Windows.odc
-	maintainer of this branch is Ivan Denisov
+./examples/
+    /server/
+         static web-server as the example of an application for Linux OS
+    /console/
+         simple console application
+    /fpstest/
+         loop test

new/README

@@ -1,4 +1,10 @@
+# For prepare BlackBox for the target OS run:
+# ./README
+
 echo "Please wait..."
 ./switch-target `uname -s` GUI
 ./build
 ./run-BlackBox
+
+# For clearing the folders before commit run
+# ./switch-target none

new/export

@@ -0,0 +1,65 @@
+#!/bin/sh
+
+mklinks () {
+	find "${1}" -mindepth ${2} -maxdepth ${2} \( -type f -o -type l \) -print |
+	while read l; do
+		to=`echo $l | sed "s/^${line}\///"`
+		mkdir -p `dirname "${4}/${to}"`
+		cp ${l} "${4}/${to}"
+	done
+}
+
+dolinks () {
+	mkdir -p ../${1}_${2}
+	cp -R 'System' ../${1}_${2}/
+	cp -R 'Code' ../${1}_${2}/
+	cp -R 'Comm' ../${1}_${2}/
+	cp -R 'Cons' ../${1}_${2}/
+	cp -R 'Dev' ../${1}_${2}/
+	cp -R 'Docu' ../${1}_${2}/
+	cp -R 'Gtk2' ../${1}_${2}/
+	cp -R 'Host' ../${1}_${2}/
+	cp -R 'Lin' ../${1}_${2}/
+	cp -R 'Obx' ../${1}_${2}/
+	cp -R 'Sql' ../${1}_${2}/
+	cp -R 'Std' ../${1}_${2}/
+	cp -R 'Sym' ../${1}_${2}/
+	cp -R 'Text' ../${1}_${2}/
+	cp -R 'Xhtml' ../${1}_${2}/
+	cp -R 'run-BlackBox' ../${1}_${2}/
+	cp -R 'run-dev0' ../${1}_${2}/
+	
+	lines1=`find . -mindepth 1 -maxdepth 1 -name "_*${1}*_" -print | sed 's/\.\///'`
+	lines2=`find . -mindepth 1 -maxdepth 1 -name "__*${2}*" -print | sed 's/\.\///'`
+	lines3=`find . -mindepth 1 -maxdepth 1 -name "_*"${1}"*_*${2}*" -print | sed 's/\.\///'`
+	for line in  $lines1 $lines2 $lines3; do
+		find "${line}" -mindepth 1 -maxdepth 1 \( -type f -o -type l \) -print |
+		while read l; do
+			cp $l ../${1}_${2}/
+		done
+
+		mklinks "${line}" 3 ../.. ../${1}_${2}
+		mklinks "${line}" 4 ../../.. ../${1}_${2}
+	done
+}
+
+if [ $# -eq 1 ]; then
+	dolinks "${1}" Interp
+	echo "Export complite to the directory ../${1}_Interp!"
+	echo "For compiling BlackBox modules run:"
+	echo "  cd ../${1}_Interp"
+	echo "  ./build"
+elif [ $# -eq 2 ]; then
+	dolinks "${1}" "${2}"
+	echo "Export complite to the directory ../${1}_${2}!"
+	echo "For compiling BlackBox modules run:"
+	echo "  cd ../${1}_${2}"
+	echo "  ./build"
+else
+	echo "Exporting BlackBox from development to distribution form for target OS."
+	echo "Usage: `basename $0` OS [ configuration ]"
+	echo "	OS: Linux | OpenBSD | FreeBSD"
+	echo "  configuration: GUI"
+	echo "Example: ./export Linux GUI"
+	exit 1
+fi

old/Lin/Rsrc/file.xpm

@@ -1,18 +0,0 @@
-/* XPM */
-static char * file_xpm[] = {
-"12 12 3 1",
-" 	s None	c None",
-".	c black",
-"X	c #FFFFFFFFF3CE",
-" ........   ",
-" .XXXXXX.   ",
-" .XXXXXX... ",
-" .XXXXXXXX. ",
-" .XXXXXXXX. ",
-" .XXXXXXXX. ",
-" .XXXXXXXX. ",
-" .XXXXXXXX. ",
-" .XXXXXXXX. ",
-" .XXXXXXXX. ",
-" .XXXXXXXX. ",
-" .......... "};

old/Lin/Rsrc/folder.xpm

@@ -1,21 +0,0 @@
-/* XPM */
-static char * folder_foo_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"16 12 3 1",
-/* colors */
-" 	s None	c None",
-".	c black",
-"X	c #f0ff80",
-/* pixels */
-"   ....         ",
-"  .XXXX.        ",
-" .XXXXXX.       ",
-".............   ",
-".XXXXXXXXXXX.   ",
-".XXXXXXXXXXX.   ",
-".XXXXXXXXXXX.   ",
-".XXXXXXXXXXX.   ",
-".XXXXXXXXXXX.   ",
-".XXXXXXXXXXX.   ",
-".XXXXXXXXXXX.   ",
-".............   "};

old/Lin/Rsrc/openfold.xpm

@@ -1,21 +0,0 @@
-/* XPM */
-static char * openfolder_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"16 12 3 1",
-/* colors */
-" 	s None	c None",
-".	c black",
-"X	c #f0ff80",
-/* pixels */
-"   ....         ",
-"  .XXXX.        ",
-" .XXXXXX.       ",
-".............   ",
-".XXXXXXXXXXX.   ",
-".XXX............",
-".XX.XXXXXXXXXXX.",
-".XX.XXXXXXXXXX. ",
-".X.XXXXXXXXXXX. ",
-".X.XXXXXXXXXXX. ",
-"..XXXXXXXXXX..  ",
-".............   "};