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. Openmoko's OpenEmbedded repository. This is used to build the
      Openmoko distribution: Changes to 'org.openmoko.dev'
      ([EMAIL PROTECTED])
   2. Openmoko's OpenEmbedded repository. This is used to build the
      Openmoko distribution: Changes to 'org.openmoko.dev'
      ([EMAIL PROTECTED])
   3. Openmoko's OpenEmbedded repository. This is used to build the
      Openmoko distribution: Changes to 'org.openmoko.dev'
      ([EMAIL PROTECTED])
   4. Openmoko's OpenEmbedded repository. This is used to build the
      Openmoko distribution: Changes to 'org.openmoko.dev'
      ([EMAIL PROTECTED])
   5. r4687 - trunk/src/host/norwp ([EMAIL PROTECTED])
   6. r4688 - in trunk/src/target/thumbnails: result source
      ([EMAIL PROTECTED])
   7. r4689 - developers/werner/dbgrst ([EMAIL PROTECTED])
   8. Openmoko's OpenEmbedded repository. This is used to build the
      Openmoko distribution: Changes to 'org.openmoko.dev'
      ([EMAIL PROTECTED])
   9. r4690 - in trunk/src/target/thumbnails: result source
      ([EMAIL PROTECTED])
  10. Openmoko's OpenEmbedded repository. This is used to build the
      Openmoko distribution: Changes to 'org.openmoko.dev'
      ([EMAIL PROTECTED])
  11. r4691 - trunk/src/host/pye17/codegen ([EMAIL PROTECTED])
--- Begin Message ---
 packages/gpe-scap/gpe-scap_1.3.bb                  |    4 ++--
 packages/openmoko-projects/diversity-radar_svn.bb  |    4 ++--
 packages/openmoko-projects/om-locations_git.bb     |    6 +++---
 .../openmoko-community-repository.bb               |    4 ++--
 packages/openmoko-projects/pyefl-sudoku_svn.bb     |    4 ++--
 .../openmoko-tools/openmoko-set-root-password.bb   |    4 ++--
 packages/openmoko2/openmoko-browser2_svn.bb        |    4 ++--
 packages/openmoko2/openmoko-calculator2_svn.bb     |    4 ++--
 packages/openmoko2/openmoko-contacts2_svn.bb       |    4 ++--
 packages/openmoko2/openmoko-dates2_svn.bb          |    4 ++--
 packages/openmoko2/openmoko-dialer2_svn.bb         |    4 ++--
 packages/openmoko2/openmoko-mediaplayer2_svn.bb    |    4 ++--
 packages/openmoko2/openmoko-messages2_svn.bb       |    4 ++--
 packages/openmoko2/openmoko-terminal2_svn.bb       |    4 ++--
 packages/qtopia-phone/qtopia-phone-x11_git.bb      |   14 ++++++++++++--
 packages/xorg-app/xterm_207.bb                     |    4 ++--
 16 files changed, 43 insertions(+), 33 deletions(-)

New commits:
commit 28e0e80477f13ba7453250daa4d48636fc5fd9b6
Merge: 5323655abd7f18499983732747eeba71e0895e69 
278c59500f5e16ed1876b1dcbafceb49a442dc17
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date:   Thu Oct 2 18:35:30 2008 +0800

    Merge branch 'org.openmoko.dev' of git+ssh://[EMAIL 
PROTECTED]/var/cache/git/openmoko into org.openmoko.dev

commit 5323655abd7f18499983732747eeba71e0895e69
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date:   Thu Oct 2 18:34:31 2008 +0800

    [Descriptions] Adding more description to applications




--- End Message ---
--- Begin Message ---
 conf/distro/include/sane-srcrevs.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

New commits:
commit 65f6a3ffa6c9d01d6520375430ef0c4ba8104929
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date:   Thu Oct 2 20:00:05 2008 +0800

    [Assassin] Bump up to version 263
    New stuff:
      Adding new default thumbnail.




--- End Message ---
--- Begin Message ---
 conf/checksums.ini                 |    4 ++++
 contrib/site-conf/aclocal.m4       |    1 +
 contrib/site-conf/configure.ac     |    4 ++++
 contrib/site-conf/m4/squeak.m4     |   15 +++++++++++++++
 packages/squeak/squeakvm_3.10.1.bb |   28 ++++++++++++++++++++++++++++
 site/arm-linux                     |    4 ++++
 6 files changed, 56 insertions(+), 0 deletions(-)

New commits:
commit b8dce443685f5e4538dec68f4339b8d065c6adb7
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date:   Thu Oct 2 14:05:18 2008 +0200

    [squeak] Attempt to add squeak 3.10-1
        - This does configure
        - But it fails to link, there is something wrong with the
          autoreconf...

commit 8cbdbb924d5d689b8cc1d661ed3e918dd8ebecb8
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date:   Thu Oct 2 10:53:28 2008 +0200

    [site-conf] Add the tests for the squeak vm




--- End Message ---
--- Begin Message ---
 conf/distro/include/sane-srcrevs.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

New commits:
commit 65f6a3ffa6c9d01d6520375430ef0c4ba8104929
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date:   Thu Oct 2 20:00:05 2008 +0800

    [Assassin] Bump up to version 263
    New stuff:
      Adding new default thumbnail.




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-10-02 15:12:23 +0200 (Thu, 02 Oct 2008)
New Revision: 4687

Modified:
   trunk/src/host/norwp/Makefile
Log:
Added -lusb, which seems to be needed for some builds.



Modified: trunk/src/host/norwp/Makefile
===================================================================
--- trunk/src/host/norwp/Makefile       2008-10-01 13:44:28 UTC (rev 4686)
+++ trunk/src/host/norwp/Makefile       2008-10-02 13:12:23 UTC (rev 4687)
@@ -1,5 +1,5 @@
 CFLAGS=-Wall -I/usr/local/include
-LDFLAGS=-L/usr/local/lib -lftdi
+LDFLAGS=-L/usr/local/lib -lftdi -lusb
 
 PREFIX=/usr
 




--- End Message ---
--- Begin Message ---
Author: tick
Date: 2008-10-02 15:14:30 +0200 (Thu, 02 Oct 2008)
New Revision: 4688

Added:
   trunk/src/target/thumbnails/source/communication_openmoko-dates2.png
   trunk/src/target/thumbnails/source/network_midori.png
   trunk/src/target/thumbnails/source/network_minimo.png
   trunk/src/target/thumbnails/source/network_openmoko-browser2.png
   trunk/src/target/thumbnails/source/programming_openmoko-terminal2.png
   trunk/src/target/thumbnails/source/programming_xterm.png
   trunk/src/target/thumbnails/source/unknown_gpe-scap.png
   trunk/src/target/thumbnails/source/unknown_illume-config.png
   trunk/src/target/thumbnails/source/unknown_openmoko-calculator2.png
   trunk/src/target/thumbnails/source/unknown_openmoko-mediaplayer2.png
Modified:
   trunk/src/target/thumbnails/result/thumbnail.eet
Log:
[thumbnail] update Installer thumbnails


Modified: trunk/src/target/thumbnails/result/thumbnail.eet
===================================================================
(Binary files differ)

Added: trunk/src/target/thumbnails/source/communication_openmoko-dates2.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/src/target/thumbnails/source/communication_openmoko-dates2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/thumbnails/source/network_midori.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/thumbnails/source/network_midori.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/thumbnails/source/network_minimo.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/thumbnails/source/network_minimo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/thumbnails/source/network_openmoko-browser2.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/src/target/thumbnails/source/network_openmoko-browser2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/thumbnails/source/programming_openmoko-terminal2.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/src/target/thumbnails/source/programming_openmoko-terminal2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/thumbnails/source/programming_xterm.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/thumbnails/source/programming_xterm.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/thumbnails/source/unknown_gpe-scap.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/thumbnails/source/unknown_gpe-scap.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/thumbnails/source/unknown_illume-config.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/src/target/thumbnails/source/unknown_illume-config.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/thumbnails/source/unknown_openmoko-calculator2.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/src/target/thumbnails/source/unknown_openmoko-calculator2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/thumbnails/source/unknown_openmoko-mediaplayer2.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/src/target/thumbnails/source/unknown_openmoko-mediaplayer2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-10-02 15:16:14 +0200 (Thu, 02 Oct 2008)
New Revision: 4689

Modified:
   developers/werner/dbgrst/Makefile
Log:
Add -lusb because libftdi needs it.



Modified: developers/werner/dbgrst/Makefile
===================================================================
--- developers/werner/dbgrst/Makefile   2008-10-02 13:14:30 UTC (rev 4688)
+++ developers/werner/dbgrst/Makefile   2008-10-02 13:16:14 UTC (rev 4689)
@@ -1,5 +1,5 @@
 CFLAGS=-Wall -I/usr/local/include
-LDFLAGS=-L/usr/local/lib -lftdi
+LDFLAGS=-L/usr/local/lib -lftdi -lusb
 
 PREFIX=/usr
 




--- End Message ---
--- Begin Message ---
 conf/distro/include/sane-srcrevs.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

New commits:
commit fc4f13774b55d8695f6ccf896a85179acb060b53
Merge: 6c7ef7d543fed379ea4f01b8c8bb61a24a129f0d 
b8dce443685f5e4538dec68f4339b8d065c6adb7
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date:   Thu Oct 2 21:46:02 2008 +0800

    Merge branch 'org.openmoko.dev' of git+ssh://[EMAIL 
PROTECTED]/var/cache/git/openmoko into org.openmoko.dev

commit 6c7ef7d543fed379ea4f01b8c8bb61a24a129f0d
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date:   Thu Oct 2 21:44:22 2008 +0800

    [assassin-thumbnail] Bump up the assassin-thumbnail to 2688
    adding new thumbnails




--- End Message ---
--- Begin Message ---
Author: tick
Date: 2008-10-02 15:53:01 +0200 (Thu, 02 Oct 2008)
New Revision: 4690

Added:
   trunk/src/target/thumbnails/source/maps_om-maps-hong-kong.png
Modified:
   trunk/src/target/thumbnails/result/thumbnail.eet
Log:
[assassin-thumbnail] adding hong kong thumbnail


Modified: trunk/src/target/thumbnails/result/thumbnail.eet
===================================================================
(Binary files differ)

Added: trunk/src/target/thumbnails/source/maps_om-maps-hong-kong.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/src/target/thumbnails/source/maps_om-maps-hong-kong.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




--- End Message ---
--- Begin Message ---
 conf/distro/include/sane-srcrevs.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

New commits:
commit 58d97deb1eab5ab83ac59b85f3e8dd7bd08e0b4c
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date:   Thu Oct 2 21:58:38 2008 +0800

    [assassin-thumbnail] Adding thumbnail of Hong Kong




--- End Message ---
--- Begin Message ---
Author: marek
Date: 2008-10-03 10:40:56 +0200 (Fri, 03 Oct 2008)
New Revision: 4691

Modified:
   trunk/src/host/pye17/codegen/argtypes.py
   trunk/src/host/pye17/codegen/codegen.py
   trunk/src/host/pye17/codegen/h2def.py
Log:
remove debugging output
help the parser to match "of-object" contructs

Modified: trunk/src/host/pye17/codegen/argtypes.py
===================================================================
--- trunk/src/host/pye17/codegen/argtypes.py    2008-10-02 13:53:01 UTC (rev 
4690)
+++ trunk/src/host/pye17/codegen/argtypes.py    2008-10-03 08:40:56 UTC (rev 
4691)
@@ -536,7 +536,7 @@
            #fd.close
 
             if typename != ptype:
-               info.arglist.append('(%s *) %s' % (ptype[:-1], pname))
+                info.arglist.append('(%s *) %s' % (ptype[:-1], pname))
             else:
                 info.arglist.append(pname)
 

Modified: trunk/src/host/pye17/codegen/codegen.py
===================================================================
--- trunk/src/host/pye17/codegen/codegen.py     2008-10-02 13:53:01 UTC (rev 
4690)
+++ trunk/src/host/pye17/codegen/codegen.py     2008-10-03 08:40:56 UTC (rev 
4691)
@@ -320,19 +320,19 @@
         if function_obj.varargs:
             raise argtypes.ArgTypeNotFoundError("varargs functions not 
supported")
 
-       fd = open("/tmp/codegen.log","a+")
-       fd.write(">>> write_function_wrapper() >>>\n")
-       fd.write("arglist 1: " + str(info.get_arglist()) + "\n")
+       #fd = open("/tmp/codegen.log","a+")
+       #fd.write(">>> write_function_wrapper() >>>\n")
+       #fd.write("arglist 1: " + str(info.get_arglist()) + "\n")
 
         for param in function_obj.params:
             if param.pdflt != None and '|' not in info.parsestr:
                 info.add_parselist('|', [], [])
             handler = argtypes.matcher.get(param.ptype)
-           fd.write("pname: " + param.pname + "; ptype: " + str(param.ptype) + 
"; pdflt: " + str(param.pdflt) + "; pnull: " + str(param.pnull) + "; handler: " 
+ str(handler) + "\n")
+           #fd.write("pname: " + param.pname + "; ptype: " + str(param.ptype) 
+ "; pdflt: " + str(param.pdflt) + "; pnull: " + str(param.pnull) + "; handler: 
" + str(handler) + "\n")
             handler.write_param(param.ptype, param.pname, param.pdflt,
                                 param.pnull, info)
 
-       fd.write("arglist 2: " + str(info.get_arglist()) + "\n")
+       #fd.write("arglist 2: " + str(info.get_arglist()) + "\n")
 
         substdict['setreturn'] = ''
         if handle_return:
@@ -342,7 +342,7 @@
             handler.write_return(function_obj.ret,
                                  function_obj.caller_owns_return, info)
 
-       fd.write("arglist 3: " + str(info.get_arglist()) + "\n")
+       #fd.write("arglist 3: " + str(info.get_arglist()) + "\n")
 
         if function_obj.deprecated != None:
             deprecated = self.deprecated_tmpl % {
@@ -389,10 +389,10 @@
             substdict['extraparams'] = ''
             flags = 'METH_NOARGS'
 
-       fd.write("arglist: " + str(info.get_arglist()) + "\n")
-       for key,item in substdict.iteritems():
-               fd.write("key: " + str(key) + ", item: " + str(item) + "\n")
-        fd.close()
+       #fd.write("arglist: " + str(info.get_arglist()) + "\n")
+       #for key,item in substdict.iteritems():
+               #fd.write("key: " + str(key) + ", item: " + str(item) + "\n")
+        #fd.close()
 
         return template % substdict, flags
 

Modified: trunk/src/host/pye17/codegen/h2def.py
===================================================================
--- trunk/src/host/pye17/codegen/h2def.py       2008-10-02 13:53:01 UTC (rev 
4690)
+++ trunk/src/host/pye17/codegen/h2def.py       2008-10-03 08:40:56 UTC (rev 
4691)
@@ -64,7 +64,7 @@
 
 split_prefix_pat = re.compile('([A-Za-z]*)_([A-Za-z0-9]+)')
 
-def find_obj_defs(buf, objdefs=[]):
+def find_obj_defs(buf, objdefs=[], objtypedefs={}):
     """
     Try to find object definitions in header files.
     """
@@ -72,8 +72,6 @@
     # filter out comments from buffer.
     buf = strip_comments(buf)
 
-    struct_typedef = {}
-
     # handle typedef enum style defs.
     pat = re.compile("typedef struct\s*([_A-Za-z]*)\s*([_A-Za-z]*)\s*;", 
re.MULTILINE)
     pos = 0
@@ -81,7 +79,7 @@
         m = pat.search(buf, pos)
         if not m: break
        #print "typedef struct: " + m.group(1) + " => " + m.group(2)
-       struct_typedef[m.group(1)] = m.group(2)
+       objtypedefs[m.group(1)] = m.group(2)
         pos = m.end()
 
     # first find all structures that look like they may represent a GtkObject
@@ -94,8 +92,8 @@
        #print "struct: " + m.group(1) + " => " + m.group(2)
 
        name = m.group(1)
-       if name in struct_typedef:
-               name = struct_typedef[name]
+       if name in objtypedefs:
+               name = objtypedefs[name]
 
         objdefs.append((name, None))
         pos = m.end()
@@ -327,7 +325,7 @@
 #"""
 arg_split_pat = re.compile("\s*,\s*")
 
-get_type_pat = re.compile(r'(const-)?([A-Za-z0-9]+)\*?\s+')
+get_type_pat = re.compile(r'(const-)?([A-Za-z0-9_]+)\*?\s+')
 pointer_pat = re.compile('.*\*$')
 func_new_pat = re.compile('(\w+)_new$')
 
@@ -401,10 +399,12 @@
             fp.write('  )\n')
             fp.write(')\n\n')
 
-    def write_obj_defs(self, objdefs, fp=None):
+    def write_obj_defs(self, objdefs, objtypedefs, fp=None):
         if not fp:
             fp = self.fp
 
+        written_objs = 0
+
         fp.write(';; -*- scheme -*-\n')
         fp.write('; object definitions ...\n')
 
@@ -413,23 +413,32 @@
             if filter:
                 if klass in filter:
                     continue
-            m = split_prefix_pat.match(klass)
-            cmodule = None
-            cname = klass
-            if m:
-                cmodule = m.group(1)
-                #cname = m.group(2)
-            fp.write('(define-object ' + cname + '\n')
-            if cmodule:
-                fp.write('  (in-module "' + cmodule + '")\n')
-            if parent:
-                fp.write('  (parent "' + parent + '")\n')
-            fp.write('  (c-name "' + klass + '")\n')
-            #fp.write('  (gtype-id "' + typecode(klass) + '")\n')
-           fp.write('  (gtype-id "' + klass + '")\n')
-            # should do something about accessible fields
-            fp.write(')\n\n')
+            self.write_obj_defs_to_file(fp, klass, parent)
+            written_objs += 1
 
+        # if we have no struct definitions (e.g. ecore_evas) we should try add 
some objects for the object generation
+        if written_objs == 0:
+            for klass in objtypedefs:
+                self.write_obj_defs_to_file(fp, objtypedefs[klass], None)
+
+    def write_obj_defs_to_file(self, fp, klass, parent):
+        m = split_prefix_pat.match(klass)
+        cmodule = None
+        cname = klass
+        if m:
+            cmodule = m.group(1)
+            #cname = m.group(2)
+        fp.write('(define-object ' + cname + '\n')
+        if cmodule:
+            fp.write('  (in-module "' + cmodule + '")\n')
+        if parent:
+            fp.write('  (parent "' + parent + '")\n')
+        fp.write('  (c-name "' + klass + '")\n')
+        #fp.write('  (gtype-id "' + typecode(klass) + '")\n')
+        fp.write('  (gtype-id "' + klass + '")\n')
+        # should do something about accessible fields
+        fp.write(')\n\n')
+
     def _define_func(self, buf):
         buf = clean_func(buf)
         buf = string.split(buf,'\n')
@@ -504,9 +513,9 @@
             # methods must have at least one argument
             munged_name = name.replace('_', '')
             m = get_type_pat.match(args[0])
-            if m:
+            if m and name.find('new') < 0:
                 obj = m.group(2)
-                if munged_name[:len(obj)] == obj.lower():
+                if name[:len(obj)].lower() == obj.lower():
                     self._write_method(obj, name, ret, args)
                     return
 
@@ -525,13 +534,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)
@@ -613,10 +622,11 @@
 
     # read all the object definitions in
     objdefs = []
+    objtypedefs = {}
     enums = []
     for filename in args:
         buf = open(filename).read()
-        find_obj_defs(buf, objdefs)
+        find_obj_defs(buf, objdefs, objtypedefs)
         find_enum_defs(buf, enums)
     #objdefs = sort_obj_defs(objdefs)
 
@@ -626,7 +636,7 @@
 
         dw = DefsWriter(methods, prefix=modulename, verbose=verbose,
                         defsfilter=defsfilter)
-        dw.write_obj_defs(objdefs, types)
+        dw.write_obj_defs(objdefs, objtypedefs, types)
         dw.write_enum_defs(enums, types)
         print "Wrote %s-types.defs" % separate
 
@@ -640,9 +650,9 @@
         if onlyenums:
             dw.write_enum_defs(enums)
         elif onlyobjdefs:
-            dw.write_obj_defs(objdefs)
+            dw.write_obj_defs(objdefs, objtypedefs)
         else:
-            dw.write_obj_defs(objdefs)
+            dw.write_obj_defs(objdefs, objtypedefs)
             dw.write_enum_defs(enums)
 
             for filename in args:




--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to