Remove allocation of new console from Windows_HostConsole; server example improved...

diff --git a/BlackBox/_Windows_/Host/Mod/Console.odc b/BlackBox/_Windows_/Host/Mod/Console.odc
index ffd03b42084eeb74cbf62f3c52e9e0236d00613c..5a0a03920fd106440d1e8b19a78f57d1bde404d3 100644 (file)
Binary files a/BlackBox/_Windows_/Host/Mod/Console.odc and b/BlackBox/_Windows_/Host/Mod/Console.odc differ

diff --git a/examples/server/Gtk2 b/examples/server/Gtk2
new file mode 120000 (symlink)
index 0000000..969f46c
--- /dev/null
+++ b/examples/server/Gtk2
@@ -0,0 +1 @@
+/home/ivan/oberon/freenix/BlackBox/_Linux_GUI/Gtk2
\ No newline at end of file

diff --git a/examples/server/README b/examples/server/README
new file mode 100644 (file)
index 0000000..218c75a
--- /dev/null
+++ b/examples/server/README
@@ -0,0 +1,28 @@
+# This example demonstrates simple server based on console version of BlackBox.
+
+# To run this example you need to build console version of BlackBox:
+
+# 1. Go to the BlackBox folder
+cd ../../BlackBox
+
+# 2. Clean previous
+./clean
+./switch-target none
+
+# 3. Switch to BlackBox Interp and compile
+./switch-target `uname -s` Interp
+./build
+
+# 4. Go to the example folder and compile the example
+cd ../examples/server
+../../run-BlackBox < buildExample
+
+# 5. Stop any other server that using 80 ports (apache, nginx, ...)
+# 6. Then you can start server using command:
+
+sudo ./bbserver
+
+# To check the work of the server open browsel and look the page http://localhost
+
+# There are scripts ./start and ./stop for the deamon start and stop mode
+

diff --git a/examples/server/System/Mod/Init.odc b/examples/server/System/Mod/Init.odc
index 7617333f570b254e0e202a55ab64fb7c5f12c1e6..30c4b578fb19a0af04f99a6cac0bc743ae9ef461 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/Tcp/Mod/Client.odc b/examples/server/Tcp/Mod/Client.odc
deleted file mode 100644 (file)
index 003c10d..0000000
Binary files a/examples/server/Tcp/Mod/Client.odc and /dev/null differ

diff --git a/examples/server/Tcp/Mod/Sender.odc b/examples/server/Tcp/Mod/Sender.odc
deleted file mode 100644 (file)
index 40f6723..0000000
Binary files a/examples/server/Tcp/Mod/Sender.odc and /dev/null differ

diff --git a/examples/server/Tcp/Mod/Server.odc b/examples/server/Tcp/Mod/Server.odc
index 0e920c895673ec556d5842f7a804f6b43c2e096c..4ffffe94b834cb346b5a60b11e80f1a80091a694 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/Service.odc b/examples/server/Tcp/Mod/Service.odc
index 156cf9455abb8bcaff3a773848713c844f5394fd..1fb3aa27539302648691b21b0ec516bd06a1910b 100644 (file)
Binary files a/examples/server/Tcp/Mod/Service.odc and b/examples/server/Tcp/Mod/Service.odc differ

diff --git a/examples/server/Tcp/Mod/Unloader.odc b/examples/server/Tcp/Mod/Unloader.odc
deleted file mode 100644 (file)
index c35025a..0000000
Binary files a/examples/server/Tcp/Mod/Unloader.odc and /dev/null differ

diff --git a/examples/server/Tcp/Rsrc/Server.odc b/examples/server/Tcp/Rsrc/Server.odc
deleted file mode 100644 (file)
index e55bfd7..0000000
Binary files a/examples/server/Tcp/Rsrc/Server.odc and /dev/null differ

diff --git a/examples/server/bbserver b/examples/server/bbserver
index 75404d1e44ba07be9392d967b41d46acdff755d3..5b6411d9f087c482b59d64fbc6083259626e2a2e 100755 (executable)
--- a/examples/server/bbserver
+++ 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/blackboxc
+  ../../BlackBox/blackboxc

diff --git a/examples/server/buildExample b/examples/server/buildExample
new file mode 100644 (file)
index 0000000..485fc3a
--- /dev/null
+++ b/examples/server/buildExample
@@ -0,0 +1,5 @@
+DevCompiler.CompileThis TcpService TcpServer TcpBytes TcpTask
+
+DevCompiler.CompileThis Gtk2GLib Gtk2GObject Gtk2Pango Gtk2Gdk Gtk2Gtk
+
+DevCompiler.CompileThis Init

diff --git a/examples/server/web/forms.html b/examples/server/web/forms.html
deleted file mode 100644 (file)
index 4f4bca5..0000000
--- a/examples/server/web/forms.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-       <title>Oberon web server</title>
-</head>
-
-<body style="background: #EEEEBB; margin: 20px; font-family: Trebuchet MS; color: #330000">
-
-<br><a href='/'>На главную</a><br><br>
-
-POST form:<br>
-<form action='/forms.html' method='post' enctype='multipart/form-data' name='post_form'><input type='text' name='test_post'><input type='submit' value='post'></form><br>
-
-GET form:<br>
-<form action='/forms.html' method='get' name='post_form'><input type='text' name='test_get'><input type='submit' value='get'></form>
-
-</body>
-</html>

diff --git a/examples/server/web/index.html b/examples/server/web/index.html
index 309f6807e7e8e02c831706f39ef886aa66295afb..47393c16a41d17c48c83f2cc4bbb30771f588b73 100644 (file)
--- a/examples/server/web/index.html
+++ b/examples/server/web/index.html
@@ -7,10 +7,9 @@
 <body style="background: #EEEEBB; margin: 20px; font-family: Trebuchet MS; color: #330000">
 <table width='100%'>
 <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>
-
-Серверное приложение основано на Linux версии BlackBox Component Builder 1.6.<br><br>
+<td valign='top' align='left'><h2>The server is based on <a href='http://blackboxframework.org'>BlackBox/Component Pascal</a></h2>
 
+This server application runs on <a href='http://gitlab.molpit.com/oberon/blackbox-freenix'>Linux version of BlackBox Component Builder 1.6</a>.
 </td></tr>
 </table>
 </body>

diff --git a/examples/server/web/logo.png b/examples/server/web/logo.png
index f40b78486ba1e0378ca6bad72bb3674dca709a99..b276c55b24b2d1765f18480a07476cc8bc325cae 100644 (file)
Binary files a/examples/server/web/logo.png and b/examples/server/web/logo.png differ