From: Ivan Denisov Date: Thu, 21 Jun 2012 19:13:46 +0000 (+0800) Subject: gui and server в одной сборке X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=7a394277a119663177d16c35cb7126dee53bffd3;p=bbcp.git gui and server в одной сборке --- diff --git a/Code/Config.ocf b/Code/Config.ocf new file mode 100644 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 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 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 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 1fd6076..b09eba0 100644 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 2f4278e..c5db711 100644 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 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 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 6f29941..72c653c 100644 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 099bcd3..7a36bc9 100644 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 c94801b..41aa6a5 100644 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 c868963..aab2c4e 100644 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 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 8919379..75e7c4f 100644 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 a781208..47aa72a 100644 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 d294ff3..cfdf1b7 100644 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 new mode 100755 diff --git a/Tcp/Code/Loop.ocf b/Tcp/Code/Loop.ocf new file mode 100644 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 new mode 100755 diff --git a/Tcp/Code/Server.ocf b/Tcp/Code/Server.ocf index 106125d..972b4c5 100644 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 0ae8f14..815ca75 100644 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 2c95bdd..01438b7 100644 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 new mode 100755 diff --git a/Tcp/Mod/Client.odc b/Tcp/Mod/Client.odc old mode 100644 new mode 100755 diff --git a/Tcp/Mod/Loop.odc b/Tcp/Mod/Loop.odc new file mode 100644 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 new mode 100755 diff --git a/Tcp/Mod/Server.odc b/Tcp/Mod/Server.odc index 66d4e36..7cceb9e 100644 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 b41b314..fd9c2d1 100644 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 fb1f8ce..5c3b7b6 100644 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 new mode 100755 diff --git a/Tcp/Rsrc/.svn/all-wcprops b/Tcp/Rsrc/.svn/all-wcprops old mode 100644 new mode 100755 diff --git a/Tcp/Rsrc/.svn/entries b/Tcp/Rsrc/.svn/entries old mode 100644 new mode 100755 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 new mode 100755 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 new mode 100755 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 new mode 100755 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 new mode 100755 diff --git a/Tcp/Rsrc/Server.odc b/Tcp/Rsrc/Server.odc old mode 100644 new mode 100755 diff --git a/Tcp/Sym/Bytes.osf b/Tcp/Sym/Bytes.osf old mode 100644 new mode 100755 diff --git a/Tcp/Sym/Loop.osf b/Tcp/Sym/Loop.osf new file mode 100644 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 new mode 100755 diff --git a/Tcp/Sym/Server.osf b/Tcp/Sym/Server.osf index 29ce743..76b1cbd 100644 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 2f35cef..245c0b7 100644 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 0dbc6c1..bf2a457 100644 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 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 index 8d222b5..0000000 Binary files a/Test/Sym/String.osf and /dev/null differ diff --git a/readme b/readme index 38be870..b369593 100644 --- 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 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 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 }'` +