поправил скрипты запуска примеров с учетом положения среды, закомментрировал в HostGn...

diff --git a/BlackBox/_Linux_GUI/Host/Mod/Gnome.odc b/BlackBox/_Linux_GUI/Host/Mod/Gnome.odc
index d748117379d9611dd6d6f282e1f580e09c64b15f..a9f22f775667d0299255d3e5c37aab9e982130cb 100644 (file)
Binary files a/BlackBox/_Linux_GUI/Host/Mod/Gnome.odc and b/BlackBox/_Linux_GUI/Host/Mod/Gnome.odc differ

diff --git a/BlackBox/_Linux_GUI/blackbox b/BlackBox/_Linux_GUI/blackbox
index ad2b1e37a362c4302529a231064c4a594285872c..bc616adae7ad1b912d374b2c48e3b94383baa07a 100755 (executable)
Binary files a/BlackBox/_Linux_GUI/blackbox and b/BlackBox/_Linux_GUI/blackbox differ

diff --git a/BlackBox/_Linux_GUI/run-BlackBox-2 b/BlackBox/_Linux_GUI/run-BlackBox-2
index 4f2b9aa17a9d72a886cc03d9712183307a902419..bdf20ae2915e846d051756e8151d270ccd78e5d8 100755 (executable)
--- a/BlackBox/_Linux_GUI/run-BlackBox-2
+++ b/BlackBox/_Linux_GUI/run-BlackBox-2
@@ -5,4 +5,4 @@ unset UBUNTU_MENUPROXY
 unset GTK_MODULES
 export LIBOVERLAY_SCROLLBAR=0
 
-./blackbox
+./blackbox $@

diff --git a/README b/README
index 5af69d54bd3132781938f50156752eb2d4ca83bd..c051ce21881327e29213630030f22a1cf9e089af 100644 (file)
--- a/README
+++ b/README
@@ -10,13 +10,12 @@ Directories structure:
 
        examples/
                some outdated examples
-
-               server/
-                       static web-server as the example of an application for Linux OS
                console/
                        simple console application
                fpstest/
                        loop test
+               server/
+                       static web-server as the example of an application for Linux OS
 
 To build BlackBox:
 
@@ -27,6 +26,8 @@ To build BlackBox:
 To run BlackBox (after build):
 
        ./run-BlackBox
+       or
+       ./run-BlackBox-2
 
 To create BlackBox assembly (after build):
 

diff --git a/examples/console/System/Mod/Init.odc b/examples/console/System/Mod/Init.odc
index 244a090021354298b75db669327d1bace98f37eb..fbb0278aac5d34d2fa0d775e268155e07d53bc68 100644 (file)
Binary files a/examples/console/System/Mod/Init.odc and b/examples/console/System/Mod/Init.odc differ

diff --git a/examples/console/run-dev b/examples/console/run-dev
index b1452db555382b11d7e3c696fa063c727bdeb960..50874c11ccd3027007fd88a2828efebb4c7ec547 100755 (executable)
--- a/examples/console/run-dev
+++ b/examples/console/run-dev
@@ -6,5 +6,5 @@ unset GTK_MODULES
 export LIBOVERLAY_SCROLLBAR=0
 mv Code Code_
 env \
-  BB_PRIMARY_DIR="../../new" BB_SECONDARY_DIR="$PWD" \
-../../new/blackbox
+  BB_PRIMARY_DIR="../../BlackBox" BB_SECONDARY_DIR="$PWD" \
+../../BlackBox/blackbox

diff --git a/examples/console/runc b/examples/console/runc
index b1124bb39a61cbd888e841279220a60422fb3338..5bc3efc9a07b3f2a6b0419aa49fc025c0e1a229f 100755 (executable)
--- a/examples/console/runc
+++ b/examples/console/runc
@@ -1,4 +1,4 @@
 #!/bin/sh
 env \
-  BB_PRIMARY_DIR="../../new" BB_SECONDARY_DIR="$PWD" \
-../../new/blackboxc
+  BB_PRIMARY_DIR="../../BlackBox" BB_SECONDARY_DIR="$PWD" \
+../../BlackBox/blackboxc $@

diff --git a/examples/fpstest/run b/examples/fpstest/run
index 92e427313871782068d5bbe6c305c014e75da036..9022e9d4926065e685266aa6b8da978c030d1668 100755 (executable)
--- a/examples/fpstest/run
+++ b/examples/fpstest/run
@@ -5,5 +5,5 @@ unset UBUNTU_MENUPROXY
 unset GTK_MODULES
 export LIBOVERLAY_SCROLLBAR=0
 env \
-  BB_PRIMARY_DIR="../../new" BB_SECONDARY_DIR="$PWD" \
-../../new/blackbox
+  BB_PRIMARY_DIR="../../BlackBox" BB_SECONDARY_DIR="$PWD" \
+../../BlackBox/blackbox

diff --git a/examples/server/run b/examples/server/run
index 92e427313871782068d5bbe6c305c014e75da036..9022e9d4926065e685266aa6b8da978c030d1668 100755 (executable)
--- a/examples/server/run
+++ b/examples/server/run
@@ -5,5 +5,5 @@ unset UBUNTU_MENUPROXY
 unset GTK_MODULES
 export LIBOVERLAY_SCROLLBAR=0
 env \
-  BB_PRIMARY_DIR="../../new" BB_SECONDARY_DIR="$PWD" \
-../../new/blackbox
+  BB_PRIMARY_DIR="../../BlackBox" BB_SECONDARY_DIR="$PWD" \
+../../BlackBox/blackbox