gui and server в одной сборке

diff --git a/Code/Config.ocf b/Code/Config.ocf
new file mode 100644 (file)
index 0000000..c41bde1
Binary files /dev/null and b/Code/Config.ocf differ

diff --git a/Code/Init.ocf b/Code/Init.ocf
new file mode 100644 (file)
index 0000000..ddba4e8
Binary files /dev/null and b/Code/Init.ocf differ

diff --git a/Code/Initgui.ocf b/Code/Initgui.ocf
new file mode 100644 (file)
index 0000000..06a4b29
Binary files /dev/null and b/Code/Initgui.ocf differ

diff --git a/Code/Meta.ocf b/Code/Meta.ocf
new file mode 100644 (file)
index 0000000..b730be8
Binary files /dev/null and b/Code/Meta.ocf differ

diff --git a/Host/Code/Menus.ocf b/Host/Code/Menus.ocf
index 1fd60760444a613d85da6429b08a52c139ce56b1..b09eba096f800e1fc01b3585ca90ae5722e2e887 100644 (file)
Binary files a/Host/Code/Menus.ocf and b/Host/Code/Menus.ocf differ

diff --git a/Test/Code/String.ocf b/Lin/Code/Testfps.ocf
similarity index 75%
rename from Test/Code/String.ocf
rename to Lin/Code/Testfps.ocf
index 2f4278ef99b0307e6fa02e2152c556b698636c22..c5db7111fe0c9930bc4337dd3817593b37e79562 100644 (file)
Binary files a/Test/Code/String.ocf and b/Lin/Code/Testfps.ocf differ

diff --git a/Lin/Mod/Testfps.odc b/Lin/Mod/Testfps.odc
new file mode 100644 (file)
index 0000000..23922a7
Binary files /dev/null and b/Lin/Mod/Testfps.odc differ

diff --git a/Lin/Sym/Testfps.osf b/Lin/Sym/Testfps.osf
new file mode 100644 (file)
index 0000000..0923778
Binary files /dev/null and b/Lin/Sym/Testfps.osf differ

diff --git a/Std/Code/Interpreter.ocf b/Std/Code/Interpreter.ocf
index 6f2994105e05b8b2e1d4cc6fdf1ff0171407df11..72c653c7804a3b36cfdd837d34adfd5932afa6c4 100644 (file)
Binary files a/Std/Code/Interpreter.ocf and b/Std/Code/Interpreter.ocf differ

diff --git a/Std/Code/Log.ocf b/Std/Code/Log.ocf
index 099bcd3956a41cf33180e5e166155ced7c9deccf..7a36bc957a2d8f9209f28685bb4489ac023a6c00 100644 (file)
Binary files a/Std/Code/Log.ocf and b/Std/Code/Log.ocf differ

diff --git a/Std/Mod/Interpreter.odc b/Std/Mod/Interpreter.odc
index c94801bc508977149532af23dfd0548befd83e8f..41aa6a5aec0b1562c540d0cc2cfde9a4a7d080f8 100644 (file)
Binary files a/Std/Mod/Interpreter.odc and b/Std/Mod/Interpreter.odc differ

diff --git a/Std/Mod/Log.odc b/Std/Mod/Log.odc
index c868963c92ab4d2468573aee8e227743e7b5a5a3..aab2c4e5c210ae95f56cc58adac8cc58c0abfe8a 100644 (file)
Binary files a/Std/Mod/Log.odc and b/Std/Mod/Log.odc differ

diff --git a/Sym/Initgui.osf b/Sym/Initgui.osf
new file mode 100644 (file)
index 0000000..707b48a
Binary files /dev/null and b/Sym/Initgui.osf differ

diff --git a/System/Mod/Config.odc b/System/Mod/Config.odc
index 89193797b0627ddb5195922feed05cb777f1f475..75e7c4fc350dbc12122bce18f3df1563a7d5fe76 100644 (file)
Binary files a/System/Mod/Config.odc and b/System/Mod/Config.odc differ

diff --git a/System/Mod/Init.odc b/System/Mod/Init.odc
index a7812084959f588d6fe331bed8375efadbb57d86..47aa72a9319c191c6afcb25dc3cf6f205d6edef5 100644 (file)
Binary files a/System/Mod/Init.odc and b/System/Mod/Init.odc differ

diff --git a/System/Mod/Meta.odc b/System/Mod/Meta.odc
index d294ff3c22a61856a167b3c2a920549febaab92c..cfdf1b7827254851dfb1572a29b3ac96c4e75c8b 100644 (file)
Binary files a/System/Mod/Meta.odc and b/System/Mod/Meta.odc differ

diff --git a/Tcp/Code/Bytes.ocf b/Tcp/Code/Bytes.ocf
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Code/Loop.ocf b/Tcp/Code/Loop.ocf
new file mode 100644 (file)
index 0000000..e02e530
Binary files /dev/null and b/Tcp/Code/Loop.ocf differ

diff --git a/Tcp/Code/Sender.ocf b/Tcp/Code/Sender.ocf
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Code/Server.ocf b/Tcp/Code/Server.ocf
index 106125dcf0c82b3f464c4ca04d12d89f2a3c275d..972b4c5ca35c0fb668394921e7e12d711b8b8894 100644 (file)
Binary files a/Tcp/Code/Server.ocf and b/Tcp/Code/Server.ocf differ

diff --git a/Tcp/Code/Service.ocf b/Tcp/Code/Service.ocf
index 0ae8f1447f7f831682445cbd468de5f2348b5a27..815ca75d6771f901d17fabb993a94dd541ad47bb 100644 (file)
Binary files a/Tcp/Code/Service.ocf and b/Tcp/Code/Service.ocf differ

diff --git a/Tcp/Code/Task.ocf b/Tcp/Code/Task.ocf
index 2c95bddab64b6e163fa12a71dc69ffc17e5ef77e..01438b7476cf6be215b2091ccee96b50d0b83bb8 100644 (file)
Binary files a/Tcp/Code/Task.ocf and b/Tcp/Code/Task.ocf differ

diff --git a/Tcp/Mod/Bytes.odc b/Tcp/Mod/Bytes.odc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Mod/Client.odc b/Tcp/Mod/Client.odc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Mod/Loop.odc b/Tcp/Mod/Loop.odc
new file mode 100644 (file)
index 0000000..ac63541
Binary files /dev/null and b/Tcp/Mod/Loop.odc differ

diff --git a/Tcp/Mod/Sender.odc b/Tcp/Mod/Sender.odc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Mod/Server.odc b/Tcp/Mod/Server.odc
index 66d4e36402fd0b7ebac73b88d59fc982a6b94c16..7cceb9e0584234a74c45ce45f2e35c0dd6f64fb3 100644 (file)
Binary files a/Tcp/Mod/Server.odc and b/Tcp/Mod/Server.odc differ

diff --git a/Tcp/Mod/Service.odc b/Tcp/Mod/Service.odc
index b41b3144266f7e72a6bca129bed40aa012d572c1..fd9c2d166e3f608a2caee60d87440cdb794735e6 100644 (file)
Binary files a/Tcp/Mod/Service.odc and b/Tcp/Mod/Service.odc differ

diff --git a/Tcp/Mod/Task.odc b/Tcp/Mod/Task.odc
index fb1f8cefec8e47ecfe8466b55379cc38d6d13e1e..5c3b7b69e5f937337c73a500259bf5abf4721689 100644 (file)
Binary files a/Tcp/Mod/Task.odc and b/Tcp/Mod/Task.odc differ

diff --git a/Tcp/Mod/Unloader.odc b/Tcp/Mod/Unloader.odc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Rsrc/.svn/all-wcprops b/Tcp/Rsrc/.svn/all-wcprops
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Rsrc/.svn/entries b/Tcp/Rsrc/.svn/entries
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Rsrc/.svn/prop-base/Menus.odc.svn-base b/Tcp/Rsrc/.svn/prop-base/Menus.odc.svn-base
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Rsrc/.svn/prop-base/Server.odc.svn-base b/Tcp/Rsrc/.svn/prop-base/Server.odc.svn-base
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Rsrc/.svn/text-base/Menus.odc.svn-base b/Tcp/Rsrc/.svn/text-base/Menus.odc.svn-base
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Rsrc/.svn/text-base/Server.odc.svn-base b/Tcp/Rsrc/.svn/text-base/Server.odc.svn-base
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Rsrc/Server.odc b/Tcp/Rsrc/Server.odc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Sym/Bytes.osf b/Tcp/Sym/Bytes.osf
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Sym/Loop.osf b/Tcp/Sym/Loop.osf
new file mode 100644 (file)
index 0000000..c7da0f4
Binary files /dev/null and b/Tcp/Sym/Loop.osf differ

diff --git a/Tcp/Sym/Sender.osf b/Tcp/Sym/Sender.osf
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/Tcp/Sym/Server.osf b/Tcp/Sym/Server.osf
index 29ce7433201c049caf994aea4a29cdf5d6a5506a..76b1cbd8811fbd6cff64c9c6a7c6159163abec04 100644 (file)
Binary files a/Tcp/Sym/Server.osf and b/Tcp/Sym/Server.osf differ

diff --git a/Tcp/Sym/Service.osf b/Tcp/Sym/Service.osf
index 2f35cefa3e6579bb564daf3b2c70ca107fa466bb..245c0b765f8c81f185d85fc3c7086ce5e854a269 100644 (file)
Binary files a/Tcp/Sym/Service.osf and b/Tcp/Sym/Service.osf differ

diff --git a/Tcp/Sym/Task.osf b/Tcp/Sym/Task.osf
index 0dbc6c124563c93b0c27ac4dce84b1be04042810..bf2a457223622a9b91dfa764a7980f56d8fb3ef1 100644 (file)
Binary files a/Tcp/Sym/Task.osf and b/Tcp/Sym/Task.osf differ

diff --git a/Test/Mod/String.odc b/Test/Mod/String.odc
deleted file mode 100644 (file)
index 6bac1a9..0000000
Binary files a/Test/Mod/String.odc and /dev/null differ

diff --git a/Test/Sym/String.osf b/Test/Sym/String.osf
deleted file mode 100644 (file)
index 8d222b5..0000000
Binary files a/Test/Sym/String.osf and /dev/null differ

diff --git a/readme b/readme
index 38be87033c19752c90910e3f1b4333bedf9c6b19..b3695932d4162af3ddea4711f32257e7cae9ba4d 100644 (file)
--- a/readme
+++ b/readme
@@ -28,10 +28,6 @@ Eсли вы переместили папку со средой, то зано
 
 Чтобы изменить поведение среды при запуске, правьте файл "System/Mod/Init.odc"
 
-Варианты запуска среды:
-./blackbox
-./blackbox console
-
 Lin версия сейчас заключена в подсистемах:
 Host, Lin, Gtk2, System
 Все остальное от bb1.6rc6.7z с сайта оберонкора без изменений абсолютно.

diff --git a/start b/start
new file mode 100644 (file)
index 0000000..dfe6017
--- /dev/null
+++ b/start
@@ -0,0 +1,2 @@
+#!/bin/bash
+nohup nice ./blackbox > ./server.log 2>&1 &

diff --git a/stop b/stop
new file mode 100644 (file)
index 0000000..f1ba0ce
--- /dev/null
+++ b/stop
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo kill `ps -ef | grep blackbox | grep -v grep | awk '{ print $2 }'`
+