pybank r54 - in trunk: . bank

[johan svn gnome org]

Author: johan
Date: Tue Apr 22 23:27:38 2008
New Revision: 54
URL: http://svn.gnome.org/viewvc/pybank?rev=54&view=rev

Log:
Revert to a working state, now when g-i reverted as well

Modified:
   trunk/ChangeLog
   trunk/Makefile
   trunk/bank/bank-argument.c
   trunk/bank/bank.c
   trunk/bank/importer.py

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Tue Apr 22 23:27:38 2008
@@ -1,5 +1,8 @@
-IR_CFLAGS=-g -Wall `pkg-config --cflags glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 gobject-introspection`
-IR_LIBS=`pkg-config --libs glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 gobject-introspection`
+IRPATH=../gobject-introspection/girepository
+GIPATH=../gobject-introspection/
+
+IR_CFLAGS=-Wl,-rpath $(IRPATH)/.libs -g -Wall -I$(IRPATH) `pkg-config --cflags glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0`
+IR_LIBS=-L$(IRPATH)/.libs -lgirepository -lffi `pkg-config --libs glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0`
 
 PY_VERSION=2.5
 PY_CFLAGS=-I/usr/include/python$(PY_VERSION) `pkg-config --cflags pygobject-2.0`
@@ -13,7 +16,7 @@
 	bank/bank-info.c 	\
 	bank/bank-repository.c
 
-all: bank/repo.so Poppler-introspection.so GLib-introspection.so Atk-introspection.so Pango-introspection.so Gdk-introspection.so Gtk-introspection.so
+all: bank/repo.so Poppler.repo GLib.repo Atk.repo Pango.repo Gdk.repo Gtk.repo
 
 bank/repo.so: $(BANK_SOURCES)
 	gcc -shared -o bank/repo.so $(BANK_SOURCES) $(IR_CFLAGS) $(IR_LIBS) $(PY_CFLAGS) $(PY_LIBS) 
@@ -46,12 +49,10 @@
 clean:
 	@rm -f bank/repo.so *.repo
 
-%-introspection.c: data/%.gidl
-	`pkg-config --variable g_idl_compiler gobject-introspection`  $< --output $@
-%-introspection.so: %-introspection.c
-	gcc --shared $(IR_CFLAGS) -o $@ $^
+%.repo: data/%.gidl
+	$(GIPATH)/tools/g-idl-compiler --raw $< --output $@
 
-test: bank/repo.so GLib-introspection.so Poppler-introspection.so
+test: bank/repo.so poppler.repo
 	LD_PRELOAD=$(POPPLER_DIR)/libpoppler-glib.so \
         LD_LIBRARY_PATH=$(POPPLER_DIR) python$(PY_VERSION) simple.py test.pdf
 

Modified: trunk/bank/bank-argument.c
==============================================================================
--- trunk/bank/bank-argument.c	(original)
+++ trunk/bank/bank-argument.c	Tue Apr 22 23:27:38 2008
@@ -41,7 +41,7 @@
     case GI_TYPE_TAG_INT:
 	arg.v_int = PyInt_AsLong(object);
 	break;
-    case GI_TYPE_TAG_SYMBOL:
+    case GI_TYPE_TAG_INTERFACE:
 	if (object == Py_None)
 	    arg.v_pointer = NULL;
 	else
@@ -82,7 +82,7 @@
     case GI_TYPE_TAG_UTF8:
 	obj = PyString_FromString(arg->v_pointer);
 	break;
-    case GI_TYPE_TAG_SYMBOL:
+    case GI_TYPE_TAG_INTERFACE:
 	obj = PyCObject_FromVoidPtr(arg->v_pointer, NULL);
 	break;
     default:

Modified: trunk/bank/bank.c
==============================================================================
--- trunk/bank/bank.c	(original)
+++ trunk/bank/bank.c	Tue Apr 22 23:27:38 2008
@@ -105,7 +105,7 @@
     PyModule_AddIntConstant(m, "TYPE_TAG_LONG", GI_TYPE_TAG_LONG);
     PyModule_AddIntConstant(m, "TYPE_TAG_ULONG", GI_TYPE_TAG_ULONG);
     PyModule_AddIntConstant(m, "TYPE_TAG_ARRAY", GI_TYPE_TAG_ARRAY);
-    PyModule_AddIntConstant(m, "TYPE_TAG_SYMBOL", GI_TYPE_TAG_SYMBOL);
+    PyModule_AddIntConstant(m, "TYPE_TAG_INTERFACE", GI_TYPE_TAG_INTERFACE);
     PyModule_AddIntConstant(m, "TYPE_TAG_GLIST", GI_TYPE_TAG_GLIST);
     PyModule_AddIntConstant(m, "TYPE_TAG_GSLIST", GI_TYPE_TAG_GSLIST);
     PyModule_AddIntConstant(m, "TYPE_TAG_GHASH", GI_TYPE_TAG_GHASH);

Modified: trunk/bank/importer.py
==============================================================================
--- trunk/bank/importer.py	(original)
+++ trunk/bank/importer.py	Tue Apr 22 23:27:38 2008
@@ -28,7 +28,7 @@
     @staticmethod
     def find_module(name, path):
         for path in os.environ.get("GIREPO_PATH", ".").split(":"):
-            filename = os.path.join(path, name + '-introspection.so')
+            filename = os.path.join(path, name + '.repo')
             if os.path.exists(filename):
                 return DynamicImporter(name, filename)