Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4681 - in trunk/src/host/pye17: . codegen ecore_evas edje
([EMAIL PROTECTED])
2. Openmoko's OpenEmbedded repository. This is used to build the
Openmoko distribution: Changes to 'org.openmoko.dev'
([EMAIL PROTECTED])
3. r4682 - trunk/src/host/pye17/codegen ([EMAIL PROTECTED])
4. Openmoko's OpenEmbedded repository. This is used to build the
Openmoko distribution: Changes to 'org.openmoko.dev'
([EMAIL PROTECTED])
5. r4683 - in trunk/src/host/pye17: codegen ecore_evas
([EMAIL PROTECTED])
6. r4684 - in trunk/src/host/pye17: ecore ecore_evas edje evas
([EMAIL PROTECTED])
--- Begin Message ---
Author: marek
Date: 2008-09-29 13:10:27 +0200 (Mon, 29 Sep 2008)
New Revision: 4681
Modified:
trunk/src/host/pye17/Makefile
trunk/src/host/pye17/codegen/argtypes.py
trunk/src/host/pye17/codegen/h2def.py
trunk/src/host/pye17/ecore_evas/ecore_evas.override
trunk/src/host/pye17/edje/Makefile
trunk/src/host/pye17/edje/edje.override
Log:
edje support added
Modified: trunk/src/host/pye17/Makefile
===================================================================
--- trunk/src/host/pye17/Makefile 2008-09-29 06:07:38 UTC (rev 4680)
+++ trunk/src/host/pye17/Makefile 2008-09-29 11:10:27 UTC (rev 4681)
@@ -19,7 +19,7 @@
PYTHON = $(shell which python)
-e_bindings = evas ecore ecore_evas
+e_bindings = evas ecore ecore_evas edje
### ToDo ###
# ecore
Modified: trunk/src/host/pye17/codegen/argtypes.py
===================================================================
--- trunk/src/host/pye17/codegen/argtypes.py 2008-09-29 06:07:38 UTC (rev
4680)
+++ trunk/src/host/pye17/codegen/argtypes.py 2008-09-29 11:10:27 UTC (rev
4681)
@@ -1148,5 +1148,11 @@
matcher.register_pointer('Ecore_Win32_Window', 'G_TYPE_OBJECT')
matcher.register_pointer('Ecore_WinCE_Window', 'G_TYPE_OBJECT')
+# edje
+matcher.register_pointer('Evas_List', 'G_TYPE_OBJECT')
+matcher.register_pointer('Evas_Coord', 'G_TYPE_OBJECT')
+matcher.register('Evas_Event_Flags', UIntArg()) # how to handle enum ?
+
+
# matcher.register_pointer('', 'G_TYPE_OBJECT')
Modified: trunk/src/host/pye17/codegen/h2def.py
===================================================================
--- trunk/src/host/pye17/codegen/h2def.py 2008-09-29 06:07:38 UTC (rev
4680)
+++ trunk/src/host/pye17/codegen/h2def.py 2008-09-29 11:10:27 UTC (rev
4681)
@@ -221,6 +221,8 @@
#print "name: " + m.group(1)
#print "alt. name: >" + m.group(3) + "<"
+ pos = m.end()
+
name = m.group(3)
if not name:
@@ -229,6 +231,10 @@
if name in enum_typedef:
name = enum_typedef[name]
+ # enums without names act like defines (e.g. #define bla 1)
+ if not name:
+ continue
+
vals = m.group(2)
isflags = string.find(vals, '<<') >= 0
@@ -239,8 +245,6 @@
if name != 'GdkCursorType':
enums.append((name, isflags, entries))
- pos = m.end()
-
# ------------------ Find function definitions -----------------
def clean_func(buf):
@@ -252,6 +256,11 @@
# bulk comments
buf = strip_comments(buf)
+ # e stuff - "//(/) <comments> \n"
+ pat = re.compile(r'/[/]+.*\n', re.VERBOSE)
+ buf = pat.sub('', buf)
+ #print "functions 0: >>" + buf + "<<"
+
# compact continued lines
pat = re.compile(r"""\\\n""", re.MULTILINE)
buf = pat.sub('', buf)
@@ -456,8 +465,10 @@
argument = args[begin_copy:i]
else:
argument = args[begin_copy:i + 1]
+
begin_copy = i + 1
- argument = argument.lstrip(", ")
+ argument = argument.lstrip(", ").rstrip(" ")
+
#print "argument: " + argument
callback = argument.find('(')
if callback > -1:
@@ -466,6 +477,7 @@
spaces = string.count(argument, ' ')
if spaces > 1:
argument = string.replace(argument, '
', '-', spaces - 1)
+ #print "argument: " + argument + "; num spaces:
" + str(spaces)
arguments.append(argument)
# look for callback parameters
Modified: trunk/src/host/pye17/ecore_evas/ecore_evas.override
===================================================================
--- trunk/src/host/pye17/ecore_evas/ecore_evas.override 2008-09-29 06:07:38 UTC
(rev 4680)
+++ trunk/src/host/pye17/ecore_evas/ecore_evas.override 2008-09-29 11:10:27 UTC
(rev 4681)
@@ -7,3 +7,4 @@
%%
ignore-glob
*_get_type
+%%
\ No newline at end of file
Modified: trunk/src/host/pye17/edje/Makefile
===================================================================
--- trunk/src/host/pye17/edje/Makefile 2008-09-29 06:07:38 UTC (rev 4680)
+++ trunk/src/host/pye17/edje/Makefile 2008-09-29 11:10:27 UTC (rev 4681)
@@ -1,8 +1,8 @@
-EVAS_PATH=$(E_PATH)/evas/src/lib
EDJE_PATH=$(E_PATH)/edje/src/lib
-CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/
-I/usr/include/python2.5 -I/usr/include/pygtk-2.0/ -I$(EVAS_PATH)
-I$(EDJE_PATH) -I.
+CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/
-I/usr/include/python2.5 -I/usr/include/pygtk-2.0/ -I$(EDJE_PATH) -I.
+LDFLAGS = -ledje -L/usr/local/lib -lglib-2.0
.PHONY: all clean edje.so
@@ -12,10 +12,11 @@
$(CC) $(LDFLAGS) -shared $^ -o $@
edje.c: edje.defs edje.override
- $(PYTHON) $(CODEGEN_PATH)/codegen.py --prefix edje --override
edje.override --register ../evas/evas.defs edje.defs > $@
+ $(PYTHON) $(CODEGEN_PATH)/codegen.py --prefix edje --override
edje.override edje.defs > $@
-edje.defs: $(CODEGEN_PATH)/h2def.py $(EDJE_PATH)/Edje.h
+edje.defs: $(CODEGEN_PATH)/h2def.py $(EDJE_PATH)/Edje.h
$(EDJE_PATH)/Edje_Edit.h
$(CODEGEN_PATH)/h2def.py $(EDJE_PATH)/Edje.h > edje.defs
+ $(CODEGEN_PATH)/h2def.py $(EDJE_PATH)/Edje_Edit.h >> edje.defs
clean:
- rm -f *.o edje.defs edje.c
+ rm -f *.o *~ edje.defs edje.c edje.so
Modified: trunk/src/host/pye17/edje/edje.override
===================================================================
--- trunk/src/host/pye17/edje/edje.override 2008-09-29 06:07:38 UTC (rev
4680)
+++ trunk/src/host/pye17/edje/edje.override 2008-09-29 11:10:27 UTC (rev
4681)
@@ -1,14 +1,11 @@
%%
headers
-#include <Python.h>
#include "pygobject.h"
-#include "Evas.h"
#include "Edje.h"
+#include "Edje_Edit.h"
%%
-modulename edje
+modulename edje
%%
-import gtk.Plug as PyGtkPlug_Type
-%%
ignore-glob
- *_get_type
-%%
+ *_get_type
+%%
\ No newline at end of file
--- End Message ---
--- Begin Message ---
conf/distro/include/sane-srcrevs.inc | 2 +-
..._d1e096c3267c1c9492041382b954e9327bc8bbec.patch | 2938 -----
..._9ced8313fb12f0f89ad6ced7c0fdc7241ff00d77.patch |13544 --------------------
.../packagekit/files/03_group_infomation.patch | 31 -
.../modify_summary_and_adding_reposi_info.patch | 69 +
packages/packagekit/files/pk-nodocs.patch | 10 -
packages/packagekit/packagekit_git.bb | 3 +-
7 files changed, 72 insertions(+), 16525 deletions(-)
New commits:
commit b36265cb0a71e53fe804c660120f69dd920e50bd
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date: Mon Sep 29 22:59:02 2008 +0800
[assassin] Bump up assassin to version 257.
New stuff:
Adding alias supports, and so that we can add Tags: alias::XXX to packages
Finish #2032 step 1.
commit 7713c9e3c3cc081105471f09ef59b0db92d5043f
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date: Mon Sep 29 22:57:45 2008 +0800
[packagekit] modify summary field to support alias Tags.
--- End Message ---
--- Begin Message ---
Author: marek
Date: 2008-09-30 06:52:40 +0200 (Tue, 30 Sep 2008)
New Revision: 4682
Modified:
trunk/src/host/pye17/codegen/argtypes.py
trunk/src/host/pye17/codegen/h2def.py
Log:
improve enum handling
ignore win32 only functions
Modified: trunk/src/host/pye17/codegen/argtypes.py
===================================================================
--- trunk/src/host/pye17/codegen/argtypes.py 2008-09-29 11:10:27 UTC (rev
4681)
+++ trunk/src/host/pye17/codegen/argtypes.py 2008-09-30 04:52:40 UTC (rev
4682)
@@ -1145,9 +1145,13 @@
matcher.register_pointer('Ecore_Evas', 'G_TYPE_OBJECT')
matcher.register('Ecore_X_Window', UIntArg())
matcher.register_pointer('Ecore_DirectFB_Window', 'G_TYPE_OBJECT')
-matcher.register_pointer('Ecore_Win32_Window', 'G_TYPE_OBJECT')
-matcher.register_pointer('Ecore_WinCE_Window', 'G_TYPE_OBJECT')
+# --> win32 only
+#matcher.register_pointer('Ecore_Win32_Window', 'G_TYPE_OBJECT')
+#matcher.register_pointer('Ecore_WinCE_Window', 'G_TYPE_OBJECT')
+# <--
+matcher.register('Evas_Callback_Type', UIntArg()) # enum
+
# edje
matcher.register_pointer('Evas_List', 'G_TYPE_OBJECT')
matcher.register_pointer('Evas_Coord', 'G_TYPE_OBJECT')
Modified: trunk/src/host/pye17/codegen/h2def.py
===================================================================
--- trunk/src/host/pye17/codegen/h2def.py 2008-09-29 11:10:27 UTC (rev
4681)
+++ trunk/src/host/pye17/codegen/h2def.py 2008-09-30 04:52:40 UTC (rev
4682)
@@ -386,7 +386,7 @@
if module:
fp.write(' (in-module "' + module + '")\n')
fp.write(' (c-name "' + cname + '")\n')
- fp.write(' (gtype-id "G_TYPE_OBJECT")\n')
+ fp.write(' (gtype-id "G_TYPE_ENUM")\n')
#fp.write(' (gtype-id "' + typecode(cname) + '")\n')
prefix = entries[0]
for ent in entries:
@@ -525,13 +525,13 @@
# Hmmm... Let's asume that a constructor function name
# ends with '_new' and it returns a pointer.
- m = func_new_pat.match(name)
- if pointer_pat.match(ret) and m:
- cname = ''
- for s in m.group(1).split ('_'):
- cname += s.title()
- if cname != '':
- self.fp.write(' (is-constructor-of "' + cname + '")\n')
+ #m = func_new_pat.match(name)
+ #if pointer_pat.match(ret) and m:
+ #cname = ''
+ #for s in m.group(1).split ('_'):
+ #cname += s.title()
+ #if cname != '':
+ #self.fp.write(' (is-constructor-of "' + cname + '")\n')
self._write_return(ret)
self._write_arguments(args)
--- End Message ---
--- Begin Message ---
packages/python/python-xlib_0.14.bb | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
New commits:
commit c32ee45dfb5cf63b3cc216ebaf95a969db3e66a2
Author: Julian_chu <[EMAIL PROTECTED]>
Date: Tue Sep 30 12:33:15 2008 +0800
[python-xlib] Add recipe python-xlib
Erin_Yueh provided this recipe.
It is a python binding for X library.
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2008-09-30 10:28:02 +0200 (Tue, 30 Sep 2008)
New Revision: 4683
Modified:
trunk/src/host/pye17/codegen/
trunk/src/host/pye17/ecore_evas/
Log:
[pye17] Ignore auto generated files
Property changes on: trunk/src/host/pye17/codegen
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Property changes on: trunk/src/host/pye17/ecore_evas
___________________________________________________________________
Name: svn:ignore
+ .*.sw?
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2008-09-30 10:47:23 +0200 (Tue, 30 Sep 2008)
New Revision: 4684
Modified:
trunk/src/host/pye17/ecore/Makefile
trunk/src/host/pye17/ecore_evas/Makefile
trunk/src/host/pye17/edje/Makefile
trunk/src/host/pye17/evas/Makefile
Log:
[pye17] Do not hardcode paths
- use pkg-config and python-config to get the required paths
- For dependencies E_PATH still needs to be set
Modified: trunk/src/host/pye17/ecore/Makefile
===================================================================
--- trunk/src/host/pye17/ecore/Makefile 2008-09-30 08:28:02 UTC (rev 4683)
+++ trunk/src/host/pye17/ecore/Makefile 2008-09-30 08:47:23 UTC (rev 4684)
@@ -1,9 +1,8 @@
+CFLAGS = `pkg-config --cflags ecore glib-2.0 pygtk-2.0` `python-config
--includes`
+LDFLAGS = `pkg-config --libs ecore glib-2.0 pygtk-2.0` `python-config --libs`
ECORE_PATH=$(E_PATH)/ecore/src/lib/ecore
-CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/
-I/usr/include/python2.5 -I/usr/include/pygtk-2.0/ -I$(ECORE_PATH) -I. -g
-LDFLAGS = -lecore -L/usr/local/lib -lglib-2.0
-
.PHONY: all clean ecore.so
all: ecore.so
Modified: trunk/src/host/pye17/ecore_evas/Makefile
===================================================================
--- trunk/src/host/pye17/ecore_evas/Makefile 2008-09-30 08:28:02 UTC (rev
4683)
+++ trunk/src/host/pye17/ecore_evas/Makefile 2008-09-30 08:47:23 UTC (rev
4684)
@@ -1,9 +1,8 @@
+CFLAGS = `pkg-config --cflags ecore-evas glib-2.0 pygtk-2.0` `python-config
--includes`
+LDFLAGS = `pkg-config --libs ecore-evas glib-2.0 pygtk-2.0` `python-config
--libs`
ECORE_EVAS_PATH=$(E_PATH)/ecore/src/lib/ecore_evas
-CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/
-I/usr/include/python2.5 -I/usr/include/pygtk-2.0/ -I$(ECORE_PATH) -I. -g
-LDFLAGS = -lecore_evas -L/usr/local/lib -lglib-2.0
-
.PHONY: all clean ecore_evas.so
all: ecore_evas.so
Modified: trunk/src/host/pye17/edje/Makefile
===================================================================
--- trunk/src/host/pye17/edje/Makefile 2008-09-30 08:28:02 UTC (rev 4683)
+++ trunk/src/host/pye17/edje/Makefile 2008-09-30 08:47:23 UTC (rev 4684)
@@ -1,9 +1,8 @@
+CFLAGS = `pkg-config --cflags edje glib-2.0 pygtk-2.0` `python-config
--includes`
+LDFLAGS = `pkg-config --libs edje glib-2.0 pygtk-2.0` `python-config --libs`
EDJE_PATH=$(E_PATH)/edje/src/lib
-CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/
-I/usr/include/python2.5 -I/usr/include/pygtk-2.0/ -I$(EDJE_PATH) -I.
-LDFLAGS = -ledje -L/usr/local/lib -lglib-2.0
-
.PHONY: all clean edje.so
all: edje.so
Modified: trunk/src/host/pye17/evas/Makefile
===================================================================
--- trunk/src/host/pye17/evas/Makefile 2008-09-30 08:28:02 UTC (rev 4683)
+++ trunk/src/host/pye17/evas/Makefile 2008-09-30 08:47:23 UTC (rev 4684)
@@ -1,9 +1,8 @@
+CFLAGS = `pkg-config --cflags evas glib-2.0 pygtk-2.0` `python-config
--includes`
+LDFLAGS = `pkg-config --libs evas glib-2.0 pygtk-2.0` `python-config --libs`
EVAS_PATH=$(E_PATH)/evas/src/lib
-CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/
-I/usr/include/python2.5 -I/usr/include/pygtk-2.0/ -I$(EVAS_PATH) -I. -g
-LDFLAGS = -levas -L/usr/local/lib -lglib-2.0
-
.PHONY: all clean evas.so
all: evas.so
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
