From: Ivan Denisov Date: Mon, 31 Mar 2014 18:02:58 +0000 (+0800) Subject: поправил скрипты запуска примеров с учетом положения среды, закомментрировал в HostGn... X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=ed11833dc0698bc83d5b10f3618c1c57905a3f8c;p=bbcp.git поправил скрипты запуска примеров с учетом положения среды, закомментрировал в HostGnome устаревшую инициализацию --- diff --git a/BlackBox/_Linux_GUI/Host/Mod/Gnome.odc b/BlackBox/_Linux_GUI/Host/Mod/Gnome.odc index d748117..a9f22f7 100644 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 ad2b1e3..bc616ad 100755 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 4f2b9aa..bdf20ae 100755 --- 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 5af69d5..c051ce2 100644 --- 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 244a090..fbb0278 100644 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 b1452db..50874c1 100755 --- 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 b1124bb..5bc3efc 100755 --- 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 92e4273..9022e9d 100755 --- 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 92e4273..9022e9d 100755 --- 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