From: Alexander Shiryaev <aixp@mail.ru>
Date: Mon, 14 Nov 2016 03:52:20 +0000 (+0300)
Subject: synchronized with https://github.com/aixp/BlackBox
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=92afba0d1ffdc6e10ce53ca2d4902078b434f84a;p=bbcp.git

synchronized with https://github.com/aixp/BlackBox
---

diff --git a/BlackBox/_Linux_/run-BlackBox b/BlackBox/_FreeBSDLinuxOpenBSD_/run-BlackBox
similarity index 97%
rename from BlackBox/_Linux_/run-BlackBox
rename to BlackBox/_FreeBSDLinuxOpenBSD_/run-BlackBox
index d08d281..d905f27 100755
--- a/BlackBox/_Linux_/run-BlackBox
+++ b/BlackBox/_FreeBSDLinuxOpenBSD_/run-BlackBox
@@ -16,7 +16,7 @@ unset GTK_MODULES
 export LIBOVERLAY_SCROLLBAR=0
 
 # export LD_DEBUG=all
-env \
+exec env \
 	BB_PRIMARY_DIR="${pd}" BB_SECONDARY_DIR="${sd}" \
 	BB_PACKED_NAME="${lib}" \
 	"${pd}"/${loader} "${pd}"/${lib}
diff --git a/BlackBox/_FreeBSDLinuxOpenBSD_/run-BlackBox1 b/BlackBox/_FreeBSDLinuxOpenBSD_/run-BlackBox1
new file mode 100755
index 0000000..fecfb4b
--- /dev/null
+++ b/BlackBox/_FreeBSDLinuxOpenBSD_/run-BlackBox1
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# ulimit -s 32000
+# ulimit -a
+
+rn=`readlink -f "${0}"`
+pd=`dirname "${rn}"`
+sd=`readlink -f .`
+
+exe="BlackBox1.run"
+
+# fix Ubuntu-specific problems:
+unset UBUNTU_MENUPROXY
+unset GTK_MODULES
+export LIBOVERLAY_SCROLLBAR=0
+
+# export LD_DEBUG=all
+exec env \
+	BB_PRIMARY_DIR="${pd}" BB_SECONDARY_DIR="${sd}" \
+	BB_PACKED_NAME="${exe}" \
+	"${pd}"/${exe}
diff --git a/BlackBox/export b/BlackBox/export
index 7dbe714..1c591a0 100755
--- a/BlackBox/export
+++ b/BlackBox/export
@@ -4,7 +4,7 @@ if [ $# -eq 1 ]; then
 	outDir="${1}"
 	if [ ! -e "${outDir}" ]; then
 		mkdir "${outDir}"
-		pax -r -w -L `ls -p | grep -E "^[A-Z].+\/$" | grep -v "^${outDir}\/$"` libBB.so loader run-BlackBox blackbox* BlackBox* "${outDir}"
+		pax -r -w -L -s ',^Lin/Mod/gen-.*,,' -s ',^Lin/Rsrc.*,,' `ls -p | grep -E "^[A-Z].+\/$" | grep -v "^${outDir}\/$"` libBB.so loader run-BlackBox BlackBox1.run run-BlackBox1 blackbox* BlackBox* "${outDir}"
 	else
 		echo "${outDir}: already exists"
 		exit 2
diff --git a/BlackBox/run-dev0 b/BlackBox/run-dev0
index 486e036..c32d608 100755
--- a/BlackBox/run-dev0
+++ b/BlackBox/run-dev0
@@ -11,7 +11,7 @@ loader="loader"
 lib="libBB0.so"
 
 # export LD_DEBUG=all
-env \
+exec env \
 	BB_PRIMARY_DIR="${pd}" BB_SECONDARY_DIR="${sd}" \
 	BB_PACKED_NAME="${lib}" \
 	"${pd}"/${loader} "${pd}"/${lib}
diff --git a/BlackBox/switch-target b/BlackBox/switch-target
index 92fbc9c..f94de70 100755
--- a/BlackBox/switch-target
+++ b/BlackBox/switch-target
@@ -16,7 +16,7 @@ checkAndRm () {
 none() {
 	checkAndRm || exit 2
 
-	rm -rf *.exe *.so loader
+	rm -rf *.exe *.so loader BlackBox1.run
 #		System/Code/Kernel.ocf System/Sym/Kernel.osf Code/Kernel.ocf Sym/Kernel.osf \
 #		System/Code/Init.ocf System/Sym/Init.osf Code/Init.ocf Sym/Init.osf \
 #		System/Code/Config.ocf System/Sym/Config.osf Code/Config.ocf Sym/Config.osf \