seed r314 - in trunk: . libseed modules modules/example

[racarr svn gnome org]

Author: racarr
Date: Mon Nov 24 01:04:35 2008
New Revision: 314
URL: http://svn.gnome.org/viewvc/seed?rev=314&view=rev

Log:
Add example module


Added:
   trunk/modules/
   trunk/modules/Makefile.am
   trunk/modules/example/
   trunk/modules/example/Makefile.am
   trunk/modules/example/example.c
Modified:
   trunk/Makefile.am
   trunk/configure.ac
   trunk/libseed/seed-engine.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Nov 24 01:04:35 2008
@@ -8,6 +8,7 @@
 	gir \
 	doc\
 	examples\
+        modules \
 	tests
 	
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Nov 24 01:04:35 2008
@@ -105,4 +105,6 @@
 examples/lightsoff/Makefile
 examples/clutter-shader/Makefile
 gir/Makefile
+modules/Makefile
+modules/example/Makefile
 ])

Modified: trunk/libseed/seed-engine.c
==============================================================================
--- trunk/libseed/seed-engine.c	(original)
+++ trunk/libseed/seed-engine.c	Mon Nov 24 01:04:35 2008
@@ -777,14 +777,14 @@
 
 	lowername = g_utf8_strdown(name, -1);
 
-	path = g_module_build_path("/usr/local/lib", lowername);
+	path = g_module_build_path("/usr/local/lib/seed", lowername);
 	
 	module = g_module_open(path, G_MODULE_BIND_LAZY);
 
 	if (!module)
 	{
 		g_free(path);
-		path = g_module_build_path("/usr/lib", lowername);
+		path = g_module_build_path("/usr/lib/seed", lowername);
 		
 		module = g_module_open(path, G_MODULE_BIND_LAZY);
 	}
@@ -828,7 +828,7 @@
 	extension = seed_try_load_extension(namespace);
 	if (extension)
 	{
-		SeedModuleInitCallback * init;
+		SeedModuleInitCallback init;
 		
 		g_module_symbol(extension,
 						"seed_module_init",
@@ -837,7 +837,7 @@
 		(*init)(eng);
 		
 		g_free(namespace);
-
+		return JSValueMakeNull(eng->context);
 	}
 
 	if (!g_irepository_require(g_irepository_get_default(), namespace,

Added: trunk/modules/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/modules/Makefile.am	Mon Nov 24 01:04:35 2008
@@ -0,0 +1 @@
+SUBDIRS = example 

Added: trunk/modules/example/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/modules/example/Makefile.am	Mon Nov 24 01:04:35 2008
@@ -0,0 +1,14 @@
+lib_LTLIBRARIES = \
+	libexample.la
+
+libexample_la_SOURCES = \
+	example.c
+
+libexample_la_LDFLAGS = \
+	`pkg-config --libs seed`
+
+AM_CPPFLAGS = \
+	`pkg-config --cflags seed` -g
+
+libdir = ${exec_prefix}/lib/seed
+

Added: trunk/modules/example/example.c
==============================================================================
--- (empty file)
+++ trunk/modules/example/example.c	Mon Nov 24 01:04:35 2008
@@ -0,0 +1,8 @@
+#include <glib.h>
+#include <glib-object.h>
+#include <seed.h>
+
+void seed_module_init(SeedEngine * eng)
+{
+	g_printf("Hello Seed Module World \n");
+}