DEADSOFTWARE

GIT / REPO / FRED-BOY
Projects / bbcp.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e932418)
обновил и проверил пример сервера
authorIvan Denisov <d.ivan.krsk@gmail.com>
Fri, 23 May 2014 05:49:58 +0000 (13:49 +0800)
committerIvan Denisov <d.ivan.krsk@gmail.com>
Fri, 23 May 2014 05:49:58 +0000 (13:49 +0800)
examples/server/Gtk2/Mod/GLib.odc [deleted file] patch | blob | history
examples/server/System/Mod/Init.odc patch | blob | history
examples/server/System/Mod/Kernel.odc [deleted file] patch | blob | history
examples/server/Tcp/Mod/Server.odc patch | blob | history
examples/server/Tcp/Mod/Task.odc patch | blob | history
examples/server/bbserver [moved from examples/server/run with 87% similarity] patch | blob | history
examples/server/start [new file with mode: 0755] patch | blob
examples/server/stop [new file with mode: 0755] patch | blob
examples/server/web/favicon.ico [new file with mode: 0644] patch | blob
examples/server/web/index.html patch | blob | history
examples/server/web/logo.png patch | blob | history

diff --git a/examples/server/Gtk2/Mod/GLib.odc b/examples/server/Gtk2/Mod/GLib.odc
deleted file mode 100644 (file)
index 7e93e5d..0000000
Binary files a/examples/server/Gtk2/Mod/GLib.odc and /dev/null differ
diff --git a/examples/server/System/Mod/Init.odc b/examples/server/System/Mod/Init.odc
index 05ae5de2f888e9eb534a786486bff1b04f1cf44c..7617333f570b254e0e202a55ab64fb7c5f12c1e6 100644 (file)
Binary files a/examples/server/System/Mod/Init.odc and b/examples/server/System/Mod/Init.odc differ
diff --git a/examples/server/System/Mod/Kernel.odc b/examples/server/System/Mod/Kernel.odc
deleted file mode 100644 (file)
index 9cce02f..0000000
Binary files a/examples/server/System/Mod/Kernel.odc and /dev/null differ
diff --git a/examples/server/Tcp/Mod/Server.odc b/examples/server/Tcp/Mod/Server.odc
index 7cceb9e0584234a74c45ce45f2e35c0dd6f64fb3..0e920c895673ec556d5842f7a804f6b43c2e096c 100644 (file)
Binary files a/examples/server/Tcp/Mod/Server.odc and b/examples/server/Tcp/Mod/Server.odc differ
diff --git a/examples/server/Tcp/Mod/Task.odc b/examples/server/Tcp/Mod/Task.odc
index e775941a6b901897ff891f4cab49ee9b961510ea..4d2ec61b8f3b4811449a4ab7b672ce876d1be09e 100644 (file)
Binary files a/examples/server/Tcp/Mod/Task.odc and b/examples/server/Tcp/Mod/Task.odc differ
diff --git a/examples/server/run b/examples/server/bbserver
similarity index 87%
rename from examples/server/run
rename to examples/server/bbserver
index 9022e9d4926065e685266aa6b8da978c030d1668..75404d1e44ba07be9392d967b41d46acdff755d3 100755 (executable)
--- a/examples/server/run
+++ b/examples/server/bbserver
@@ -6,4 +6,4 @@ unset GTK_MODULES
 export LIBOVERLAY_SCROLLBAR=0
 env \
   BB_PRIMARY_DIR="../../BlackBox" BB_SECONDARY_DIR="$PWD" \
-../../BlackBox/blackbox
+../../BlackBox/blackboxc
diff --git a/examples/server/start b/examples/server/start
new file mode 100755 (executable)
index 0000000..41802ca
--- /dev/null
+++ b/examples/server/start
@@ -0,0 +1,2 @@
+#!/bin/sh
+nohup nice ./bbserver > ./server.log 2>&1 &
diff --git a/examples/server/stop b/examples/server/stop
new file mode 100755 (executable)
index 0000000..c554e88
--- /dev/null
+++ b/examples/server/stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkill --signal kill -x bbserver
diff --git a/examples/server/web/favicon.ico b/examples/server/web/favicon.ico
new file mode 100644 (file)
index 0000000..42cba21
Binary files /dev/null and b/examples/server/web/favicon.ico differ
diff --git a/examples/server/web/index.html b/examples/server/web/index.html
index 5a8b8cd119adf2d7a9d8695907015ba1c8e13425..309f6807e7e8e02c831706f39ef886aa66295afb 100644 (file)
--- a/examples/server/web/index.html
+++ b/examples/server/web/index.html
@@ -6,21 +6,13 @@
 
 <body style="background: #EEEEBB; margin: 20px; font-family: Trebuchet MS; color: #330000">
 <table width='100%'>
-<tr><td width='140px'><img src='logo.png'></td>
-<td align='left'><h2>Cервер на <a href='http://ru.wikipedia.org/wiki/%D0%9A%D0%BE%D0%BC%D0%BF%D0%BE%D0%BD%D0%B5%D0%BD%D1%82%D0%BD%D1%8B%D0%B9_%D0%9F%D0%B0%D1%81%D0%BA%D0%B0%D0%BB%D1%8C'>Компонентном паскале</a></h2></td></tr>
-</table>
-
-Приложение работает в настоящий момент на ubuntu-11.04-x86_64; не использует Apache, CGI и т.п., работает напрямую с TCP; выполняется в одном потоке ОС; использует динамическое связывание обработчика запроса. Серверное приложение основано на Linux версии BlackBox Component Builder 1.6rc6.<br><br>
-
-<a href='lib'>Библиотека</a><br><br>
+<tr><td width='140px' valign='top' align='center'><img src='logo.png' style='margin-top: 7px'></td>
+<td valign='top' align='left'><h2>Cервер на <a href='http://ru.wikipedia.org/wiki/%D0%9A%D0%BE%D0%BC%D0%BF%D0%BE%D0%BD%D0%B5%D0%BD%D1%82%D0%BD%D1%8B%D0%B9_%D0%9F%D0%B0%D1%81%D0%BA%D0%B0%D0%BB%D1%8C'>Компонентном паскале</a></h2>
 
-<a href='pacs'>Несколько компонентов для BlackBox Component Builder 1.6rc6</a><br><br>
+Серверное приложение основано на Linux версии BlackBox Component Builder 1.6.<br><br>
 
-
-<br><a href='forms.html'>Формы для проверки работы запросов (в разработке)</a><br><br>
-
-<h3>Контакты</h3>
-Иван Денисов, d.ivan.krsk@gmail.com
+</td></tr>
+</table>
 </body>
 </html>
 
diff --git a/examples/server/web/logo.png b/examples/server/web/logo.png
index 869f41b668e1dfad2a5a327e6fed8599f387958d..f40b78486ba1e0378ca6bad72bb3674dca709a99 100644 (file)
Binary files a/examples/server/web/logo.png and b/examples/server/web/logo.png differ
[FORK] BlackBox Cross-Platform (Windows, GNU/Linux, OpenBSD, FreeBSD)
DEADSOFTWARE 2012-2024