Changeset 4720


Ignore:
Timestamp:
10/17/08 11:49:54 (5 years ago)
Author:
marek
Message:

[pye17] fix segfault on create x11_16, fix "make examples" to update built bindings, remove some warnings

Location:
trunk/src/host/pye17
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/host/pye17/Makefile

    r4717 r4720  
    33ifeq ($(wildcard $(E_PATH)),) 
    44 
    5 E_PATH_TMP=~/openmoko/e17/libs 
     5E_PATH_TMP=~/openmoko/e17 
    66ifneq ($(wildcard $(E_PATH_TMP)),) 
    77E_PATH = $(E_PATH_TMP) 
    … …  
    1111 
    1212ifeq ($(wildcard $(E_PATH)),) 
    13 $(error Path to enlightenment libaries variable is missing, please set E_PATH (e.g. ~/e17/libs)) 
     13$(error Path to enlightenment libaries variable is missing, please set E_PATH (e.g. ~/e17)) 
    1414endif 
    1515 

  • trunk/src/host/pye17/ecore/Makefile

    r4717 r4720  
    2222        rm -f *.o *~ ecore.defs ecore.c $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/*/$(LIB_NAME) 
    2323 
    24 examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) 
     24examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/$(LIB_NAME) 
     25 
     26$(EXAMPLE_PATH)/$(LIB_NAME): $(LIB_NAME) 
     27        cp $(LIB_NAME) $(EXAMPLE_PATH) 
     28 
     29$(EXAMPLE_PATH)/ecore_evas/$(LIB_NAME): 
    2530        ln -s $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/ 
    26  
    27 $(EXAMPLE_PATH)/$(LIB_NAME): 
    28         cp $(LIB_NAME) $(EXAMPLE_PATH) 

  • trunk/src/host/pye17/ecore_evas/Makefile

    r4717 r4720  
    2121        rm -f *.o *~ ecore_evas.defs ecore_evas.c $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/*/$(LIB_NAME) 
    2222 
    23 examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) 
     23examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/$(LIB_NAME) 
     24 
     25$(EXAMPLE_PATH)/$(LIB_NAME): $(LIB_NAME) 
     26        cp $(LIB_NAME) $(EXAMPLE_PATH) 
     27 
     28$(EXAMPLE_PATH)/ecore_evas/$(LIB_NAME): 
    2429        ln -s $(EXAMPLE_PATH)/$(LIB_NAME) $(EXAMPLE_PATH)/ecore_evas/ 
    25  
    26 $(EXAMPLE_PATH)/$(LIB_NAME): 
    27         cp $(LIB_NAME) $(EXAMPLE_PATH) 

  • trunk/src/host/pye17/ecore_evas/ecore_evas.override

    r4719 r4720  
    1515%% 
    1616define software_x11_new kwargs 
    17 static Ecore_Evas * 
     17static PyObject * 
    1818_wrap_software_x11_new(PyObject *self, PyObject *args, PyObject *kwargs) 
    1919{ 
    … …  
    3333    new_self->weakreflist = NULL; 
    3434    new_self->private_flags.flags = 0; 
    35     new_self->obj = ecore_evas_software_x11_new(NULL, 0, 0, 0, w, h); 
     35    new_self->obj = (GObject *)ecore_evas_software_x11_new(NULL, 0, 0, 0, w, h); 
    3636 
    3737    if(new_self->obj == NULL) { 
    38         Py_DECREF(new_self); 
     38        // seems unnecessary - makes python crash on exception 
     39        // Py_DECREF(new_self); 
    3940        PyErr_SetString(PyExc_RuntimeError, "Can't create ecore_evas object. Check your DISPLAY variable!"); 
    4041        return NULL; 
    … …  
    4748    //PyObject_GC_Track((PyObject *)new_self); 
    4849 
    49     return (PyObject*)new_self; 
     50    return (PyObject *)new_self; 
    5051} 
    5152%% 
    5253define software_x11_16_new kwargs 
    53 static Ecore_Evas * 
     54static PyObject * 
    5455_wrap_software_x11_16_new(PyObject *self, PyObject *args, PyObject *kwargs) 
    5556{ 
    … …  
    6970    new_self->weakreflist = NULL; 
    7071    new_self->private_flags.flags = 0; 
    71     new_self->obj = ecore_evas_software_x11_16_new(NULL, 0, 0, 0, w, h); 
     72    new_self->obj = (GObject *)ecore_evas_software_x11_16_new(NULL, 0, 0, 0, w, h); 
    7273 
    7374    if(new_self->obj == NULL) { 
    74         Py_DECREF(new_self); 
     75        // seems unnecessary - makes python crash on exception 
     76        // Py_DECREF(new_self); 
    7577        PyErr_SetString(PyExc_RuntimeError, "Can't create ecore_evas object. Check your DISPLAY variable!"); 
    7678        return NULL; 
    … …  
    8385    //PyObject_GC_Track((PyObject *)new_self); 
    8486 
    85     return (PyObject*)new_self; 
     87    return (PyObject *)new_self; 
    8688} 

  • trunk/src/host/pye17/edje/Makefile

    r4717 r4720  
    2424examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) 
    2525 
    26 $(EXAMPLE_PATH)/$(LIB_NAME): 
     26$(EXAMPLE_PATH)/$(LIB_NAME): $(LIB_NAME) 
    2727        cp $(LIB_NAME) $(EXAMPLE_PATH) 

  • trunk/src/host/pye17/evas/Makefile

    r4717 r4720  
    2424examples: $(LIB_NAME) $(EXAMPLE_PATH)/$(LIB_NAME) 
    2525 
    26 $(EXAMPLE_PATH)/$(LIB_NAME): 
     26$(EXAMPLE_PATH)/$(LIB_NAME): $(LIB_NAME) 
    2727        cp $(LIB_NAME) $(EXAMPLE_PATH) 
Note: See TracChangeset for help on using the changeset viewer.