r4720 - in trunk/src/host/pye17: . ecore ecore_evas edje evas
marek at docs.openmoko.org
marek at docs.openmoko.org
Fri Oct 17 11:49:55 CEST 2008
Author: marek
Date: 2008-10-17 11:49:54 +0200 (Fri, 17 Oct 2008)
New Revision: 4720
Modified:
trunk/src/host/pye17/Makefile
trunk/src/host/pye17/ecore/Makefile
trunk/src/host/pye17/ecore_evas/Makefile
trunk/src/host/pye17/ecore_evas/ecore_evas.override
trunk/src/host/pye17/edje/Makefile
trunk/src/host/pye17/evas/Makefile
Log:
[pye17] fix segfault on create x11_16, fix "make examples" to update built bindings, remove some warnings
Modified: trunk/src/host/pye17/Makefile
===================================================================
--- trunk/src/host/pye17/Makefile 2008-10-17 07:34:57 UTC (rev 4719)
+++ trunk/src/host/pye17/Makefile 2008-10-17 09:49:54 UTC (rev 4720)
@@ -2,7 +2,7 @@
# E_PATH not given (env variable)
ifeq ($(wildcard $(E_PATH)),)
-E_PATH_TMP=~/openmoko/e17/libs
+E_PATH_TMP=~/openmoko/e17
ifneq ($(wildcard $(E_PATH_TMP)),)
E_PATH = $(E_PATH_TMP)
endif
@@ -10,7 +10,7 @@
endif
ifeq ($(wildcard $(E_PATH)),)
-$(error Path to enlightenment libaries variable is missing, please set E_PATH (e.g. ~/e17/libs))
+$(error Path to enlightenment libaries variable is missing, please set E_PATH (e.g. ~/e17))
endif
Modified: trunk/src/host/pye17/ecore/Makefile
===================================================================
--- trunk/src/host/pye17/ecore/Makefile 2008-10-17 07:34:57 UTC (rev 4719)
+++ trunk/src/host/pye17/ecore/Makefile 2008-10-17 09:49:54 UTC (rev 4720)
@@ -21,8 +21,10 @@
clean:
rm -f *.o *~ ecore.defs ecore.c $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/*/$(LIB_NAME)
-examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME)
- ln -s $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/
+examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/$(LIB_NAME)
-$(EXAMPLE_PATH)/$(LIB_NAME):
+$(EXAMPLE_PATH)/$(LIB_NAME): $(LIB_NAME)
cp $(LIB_NAME) $(EXAMPLE_PATH)
+
+$(EXAMPLE_PATH)/ecore_evas/$(LIB_NAME):
+ ln -s $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/
Modified: trunk/src/host/pye17/ecore_evas/Makefile
===================================================================
--- trunk/src/host/pye17/ecore_evas/Makefile 2008-10-17 07:34:57 UTC (rev 4719)
+++ trunk/src/host/pye17/ecore_evas/Makefile 2008-10-17 09:49:54 UTC (rev 4720)
@@ -20,8 +20,10 @@
clean:
rm -f *.o *~ ecore_evas.defs ecore_evas.c $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/*/$(LIB_NAME)
-examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME)
- ln -s $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/
+examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/$(LIB_NAME)
-$(EXAMPLE_PATH)/$(LIB_NAME):
+$(EXAMPLE_PATH)/$(LIB_NAME): $(LIB_NAME)
cp $(LIB_NAME) $(EXAMPLE_PATH)
+
+$(EXAMPLE_PATH)/ecore_evas/$(LIB_NAME):
+ ln -s $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/
Modified: trunk/src/host/pye17/ecore_evas/ecore_evas.override
===================================================================
--- trunk/src/host/pye17/ecore_evas/ecore_evas.override 2008-10-17 07:34:57 UTC (rev 4719)
+++ trunk/src/host/pye17/ecore_evas/ecore_evas.override 2008-10-17 09:49:54 UTC (rev 4720)
@@ -14,7 +14,7 @@
ecore_evas_ecore_evas_get
%%
define software_x11_new kwargs
-static Ecore_Evas *
+static PyObject *
_wrap_software_x11_new(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "w", "h", NULL };
@@ -32,10 +32,11 @@
new_self->inst_dict = NULL;
new_self->weakreflist = NULL;
new_self->private_flags.flags = 0;
- new_self->obj = ecore_evas_software_x11_new(NULL, 0, 0, 0, w, h);
+ new_self->obj = (GObject *)ecore_evas_software_x11_new(NULL, 0, 0, 0, w, h);
if(new_self->obj == NULL) {
- Py_DECREF(new_self);
+ // seems unnecessary - makes python crash on exception
+ // Py_DECREF(new_self);
PyErr_SetString(PyExc_RuntimeError, "Can't create ecore_evas object. Check your DISPLAY variable!");
return NULL;
}
@@ -46,11 +47,11 @@
// makes python segfault on exit - probably necessary for the garbage collector ?!
//PyObject_GC_Track((PyObject *)new_self);
- return (PyObject*)new_self;
+ return (PyObject *)new_self;
}
%%
define software_x11_16_new kwargs
-static Ecore_Evas *
+static PyObject *
_wrap_software_x11_16_new(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "w", "h", NULL };
@@ -68,10 +69,11 @@
new_self->inst_dict = NULL;
new_self->weakreflist = NULL;
new_self->private_flags.flags = 0;
- new_self->obj = ecore_evas_software_x11_16_new(NULL, 0, 0, 0, w, h);
+ new_self->obj = (GObject *)ecore_evas_software_x11_16_new(NULL, 0, 0, 0, w, h);
if(new_self->obj == NULL) {
- Py_DECREF(new_self);
+ // seems unnecessary - makes python crash on exception
+ // Py_DECREF(new_self);
PyErr_SetString(PyExc_RuntimeError, "Can't create ecore_evas object. Check your DISPLAY variable!");
return NULL;
}
@@ -82,5 +84,5 @@
// makes python segfault on exit - probably necessary for the garbage collector ?!
//PyObject_GC_Track((PyObject *)new_self);
- return (PyObject*)new_self;
+ return (PyObject *)new_self;
}
Modified: trunk/src/host/pye17/edje/Makefile
===================================================================
--- trunk/src/host/pye17/edje/Makefile 2008-10-17 07:34:57 UTC (rev 4719)
+++ trunk/src/host/pye17/edje/Makefile 2008-10-17 09:49:54 UTC (rev 4720)
@@ -23,5 +23,5 @@
examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME)
-$(EXAMPLE_PATH)/$(LIB_NAME):
+$(EXAMPLE_PATH)/$(LIB_NAME): $(LIB_NAME)
cp $(LIB_NAME) $(EXAMPLE_PATH)
Modified: trunk/src/host/pye17/evas/Makefile
===================================================================
--- trunk/src/host/pye17/evas/Makefile 2008-10-17 07:34:57 UTC (rev 4719)
+++ trunk/src/host/pye17/evas/Makefile 2008-10-17 09:49:54 UTC (rev 4720)
@@ -23,5 +23,5 @@
examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME)
-$(EXAMPLE_PATH)/$(LIB_NAME):
+$(EXAMPLE_PATH)/$(LIB_NAME): $(LIB_NAME)
cp $(LIB_NAME) $(EXAMPLE_PATH)
More information about the commitlog
mailing list
