diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2011-08-13 10:48:47 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2011-08-13 10:48:47 +0200 |
| commit | 06e6afbce232c4c0b53d1e1bba95a52652c8c23c (patch) | |
| tree | 52a588a34526908c3bbf415f23e6ed45b97f7c3c | |
| parent | 4fae45790d7340e0082c989605f07778e49b7c96 (diff) | |
| download | ffi-efl-06e6afbce232c4c0b53d1e1bba95a52652c8c23c.zip ffi-efl-06e6afbce232c4c0b53d1e1bba95a52652c8c23c.tar.gz | |
fix and update native api extraction and generation
| -rwxr-xr-x | tools/extract-api.sh | 1 | ||||
| -rwxr-xr-x | tools/genruby.rb | 2 | ||||
| -rw-r--r-- | tools/sed-enums | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tools/extract-api.sh b/tools/extract-api.sh index 288f787..313176f 100755 --- a/tools/extract-api.sh +++ b/tools/extract-api.sh @@ -40,6 +40,7 @@ for header in \ "${INCLUDE}/ecore-1/Ecore_Evas.h" \ "${INCLUDE}/ecore-1/Ecore_Fb.h" \ "${INCLUDE}/ecore-1/Ecore_File.h" \ + "${INCLUDE}/EMap.h" \ "${INCLUDE}/elementary-0/Elementary.h" \ ; do # diff --git a/tools/genruby.rb b/tools/genruby.rb index e77ebf0..f844cc0 100755 --- a/tools/genruby.rb +++ b/tools/genruby.rb @@ -23,6 +23,7 @@ libraries = [ [ 'Ecore_Evas.h', 'EcoreEvas', 'ecore_evas', 'ecore_evas', 'ecore_evas.rb' ], # [ 'Ecore_Fb.h', 'EcoreFb', 'ecore', 'ecore', 'ecore/ecore_fb.rb' ], # [ 'Ecore_File.h', 'EcoreFile', 'ecore', 'ecore', 'ecore/ecore_file.rb' ], + [ 'EMap.h', 'EMap', 'emap', 'emap', 'emap.rb' ], [ 'Elementary.h', 'Elm', 'elm', 'libelementary-ver-pre-svn-09.so.0', 'elementary.rb' ], ] # @@ -67,6 +68,7 @@ TYPES = { 'short' => ':short', 'float' => ':float', 'pid_t' => ':ulong', + 'time_t' => ':ulong', 'size_t' => ':ulong', 'double' => ':double', 'long int' => ':long', diff --git a/tools/sed-enums b/tools/sed-enums index 4599859..ffc193b 100644 --- a/tools/sed-enums +++ b/tools/sed-enums @@ -1,4 +1,4 @@ -s/^\s*typedef\s+(enum(\s+\w+)?).*$/typedef \1 { / +s/^\s*(typedef)?\s+(enum(\s+\w+)?).*$/typedef \2 { / T;h :attrs;n s/^\s*([A-Z0-9_]+)(\s*=\s*-?[0-9]+)?.*$/\1\2, / @@ -8,8 +8,8 @@ T next;H;b attrs s/^\s*}\s*(\w+).*$/ } \1;/ t finish :close -s/^\s*typedef\s+enum\s+\w+\s+(\w+)\s+;/ } \1/ -t finish;n;T close +s/^\s*typedef\s+enum\s+\w+\s+(\w+)\s*;/ } \1/ +t finish;n;b close :finish H;x s/\n//g |