From a5ff25563eb75cf54fc1c32054036584395f8ec6 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Tue, 30 Sep 2014 16:01:08 -0400 Subject: [PATCH] lib: move some examples/* into specific subdirectories of their lib examples/ starts to become a mess. So move the simple examples of lib into an `example` subdirectory of the lib. Signed-off-by: Jean Privat --- {examples/rpi => lib/bcm2835/examples}/blink.nit | 0 {examples/rpi => lib/bcm2835/examples}/input.nit | 0 {examples => lib/curl/examples}/curl_http.nit | 0 {examples => lib/curl/examples}/curl_mail.nit | 0 .../glesv2/examples}/opengles2_hello_triangle.nit | 10 +++++----- {examples => lib/html/examples}/html_page.nit | 0 .../privileges/examples}/drop_privileges.nit | 0 .../socket/examples}/socket_client.nit | 0 .../socket/examples}/socket_server.nit | 1 - .../template/examples}/tmpl_composer.nit | 0 .../websocket/examples}/websocket_server.nit | 1 - 11 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 lib/ai/examples/examples.nit rename {examples/rpi => lib/bcm2835/examples}/blink.nit (100%) create mode 100644 lib/bcm2835/examples/examples.nit rename {examples/rpi => lib/bcm2835/examples}/input.nit (100%) rename {examples => lib/curl/examples}/curl_http.nit (100%) rename {examples => lib/curl/examples}/curl_mail.nit (100%) create mode 100644 lib/curl/examples/examples.nit create mode 100644 lib/glesv2/examples/examples.nit rename {examples => lib/glesv2/examples}/opengles2_hello_triangle.nit (96%) create mode 100644 lib/html/examples/examples.nit rename {examples => lib/html/examples}/html_page.nit (100%) rename {examples => lib/privileges/examples}/drop_privileges.nit (100%) create mode 100644 lib/privileges/examples/examples.nit create mode 100644 lib/socket/examples/examples.nit rename {examples => lib/socket/examples}/socket_client.nit (100%) rename {examples => lib/socket/examples}/socket_server.nit (99%) create mode 100644 lib/template/examples/examples.nit rename {examples => lib/template/examples}/tmpl_composer.nit (100%) create mode 100644 lib/websocket/examples/examples.nit rename {examples => lib/websocket/examples}/websocket_server.nit (99%) diff --git a/lib/ai/examples/examples.nit b/lib/ai/examples/examples.nit new file mode 100644 index 0000000..e69de29 diff --git a/examples/rpi/blink.nit b/lib/bcm2835/examples/blink.nit similarity index 100% rename from examples/rpi/blink.nit rename to lib/bcm2835/examples/blink.nit diff --git a/lib/bcm2835/examples/examples.nit b/lib/bcm2835/examples/examples.nit new file mode 100644 index 0000000..e69de29 diff --git a/examples/rpi/input.nit b/lib/bcm2835/examples/input.nit similarity index 100% rename from examples/rpi/input.nit rename to lib/bcm2835/examples/input.nit diff --git a/examples/curl_http.nit b/lib/curl/examples/curl_http.nit similarity index 100% rename from examples/curl_http.nit rename to lib/curl/examples/curl_http.nit diff --git a/examples/curl_mail.nit b/lib/curl/examples/curl_mail.nit similarity index 100% rename from examples/curl_mail.nit rename to lib/curl/examples/curl_mail.nit diff --git a/lib/curl/examples/examples.nit b/lib/curl/examples/examples.nit new file mode 100644 index 0000000..e69de29 diff --git a/lib/glesv2/examples/examples.nit b/lib/glesv2/examples/examples.nit new file mode 100644 index 0000000..e69de29 diff --git a/examples/opengles2_hello_triangle.nit b/lib/glesv2/examples/opengles2_hello_triangle.nit similarity index 96% rename from examples/opengles2_hello_triangle.nit rename to lib/glesv2/examples/opengles2_hello_triangle.nit index 2b39b1b..32663d0 100644 --- a/examples/opengles2_hello_triangle.nit +++ b/lib/glesv2/examples/opengles2_hello_triangle.nit @@ -17,7 +17,7 @@ # Basic example of OpenGL ES 2.0 usage from the book OpenGL ES 2.0 Programming Guide. # # Code reference: -# https://code.google.com/p/opengles-book-samples/source/browse/trunk/LinuxX11/Chapter_2/Hello_Triangle/Hello_Triangle.c +# https://code.google.com/p/opengles-book-samples/source/browse/trunk/LinuxX11/Chapter_2/Hello_Triangle/Hello_Triangle.c module opengles2_hello_triangle import glesv2 @@ -127,10 +127,10 @@ assert_no_gl_error var vertex_shader = new GLVertexShader assert vertex_shader.is_ok else print "Vertex shader is not ok: {gl_error}" vertex_shader.source = """ -attribute vec4 vPosition; -void main() -{ - gl_Position = vPosition; +attribute vec4 vPosition; +void main() +{ + gl_Position = vPosition; } """ vertex_shader.compile assert vertex_shader.is_compiled else print "Vertex shader compilation failed with: {vertex_shader.info_log} {program.info_log}" diff --git a/lib/html/examples/examples.nit b/lib/html/examples/examples.nit new file mode 100644 index 0000000..e69de29 diff --git a/examples/html_page.nit b/lib/html/examples/html_page.nit similarity index 100% rename from examples/html_page.nit rename to lib/html/examples/html_page.nit diff --git a/examples/drop_privileges.nit b/lib/privileges/examples/drop_privileges.nit similarity index 100% rename from examples/drop_privileges.nit rename to lib/privileges/examples/drop_privileges.nit diff --git a/lib/privileges/examples/examples.nit b/lib/privileges/examples/examples.nit new file mode 100644 index 0000000..e69de29 diff --git a/lib/socket/examples/examples.nit b/lib/socket/examples/examples.nit new file mode 100644 index 0000000..e69de29 diff --git a/examples/socket_client.nit b/lib/socket/examples/socket_client.nit similarity index 100% rename from examples/socket_client.nit rename to lib/socket/examples/socket_client.nit diff --git a/examples/socket_server.nit b/lib/socket/examples/socket_server.nit similarity index 99% rename from examples/socket_server.nit rename to lib/socket/examples/socket_server.nit index aa77a75..c435320 100644 --- a/examples/socket_server.nit +++ b/lib/socket/examples/socket_server.nit @@ -49,4 +49,3 @@ loop ns.close end end - diff --git a/lib/template/examples/examples.nit b/lib/template/examples/examples.nit new file mode 100644 index 0000000..e69de29 diff --git a/examples/tmpl_composer.nit b/lib/template/examples/tmpl_composer.nit similarity index 100% rename from examples/tmpl_composer.nit rename to lib/template/examples/tmpl_composer.nit diff --git a/lib/websocket/examples/examples.nit b/lib/websocket/examples/examples.nit new file mode 100644 index 0000000..e69de29 diff --git a/examples/websocket_server.nit b/lib/websocket/examples/websocket_server.nit similarity index 99% rename from examples/websocket_server.nit rename to lib/websocket/examples/websocket_server.nit index 38029c3..aa1124a 100644 --- a/examples/websocket_server.nit +++ b/lib/websocket/examples/websocket_server.nit @@ -43,4 +43,3 @@ while not sock.listener.eof do if msg != "" then print msg end end - -- 1.7.9.5