ffi-efl 0.0.16 → 0.1.0

data/lib/efl/native/evas.rb

@@ -1214,7 +1214,7 @@ module Efl
         # EAPI const Evas_Object_Box_Api *evas_object_box_smart_class_get(void);
         [ :evas_object_box_smart_class_get, [  ], :evas_object_box_api ],
         # EAPI void evas_object_box_layout_set(Evas_Object *o, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
-        # FIXME
+        [ :evas_object_box_layout_set, [ :evas_object, :evas_object_box_layout_cb, :pointer, (callback [:pointer], :void) ], :void ],
         # EAPI Evas_Object *evas_object_box_add(Evas *evas);
         [ :evas_object_box_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_box_add_to(Evas_Object *parent);

data/tools/extract-api.sh

@@ -56,6 +56,18 @@ for header in \
     "${INCLUDE}/efreet-1/efreet_utils.h" \
     "${INCLUDE}/efreet-1/Efreet_Mime.h" \
     "${INCLUDE}/efreet-1/Efreet_Trash.h" \
+    "${INCLUDE}/e_dbus-1/E_DBus.h" \
+    "${INCLUDE}/e_dbus-1/E_Notify.h" \
+    "${INCLUDE}/e_dbus-1/E_Notification_Daemon.h" \
+    "${INCLUDE}/e_dbus-1/E_Bluez.h" \
+    "${INCLUDE}/e_dbus-1/E_Hal.h" \
+    "${INCLUDE}/e_dbus-1/E_Ofono.h" \
+    "${INCLUDE}/e_dbus-1/E_Ukit.h" \
+    "${INCLUDE}/e_dbus-1/connman0_7x/E_Connman.h" \
+    "${INCLUDE}/eeze-1/Eeze.h" \
+    "${INCLUDE}/eeze-1/Eeze_Disk.h" \
+    "${INCLUDE}/eeze-1/Eeze_Net.h" \
+    "${INCLUDE}/emotion-1/Emotion.h" \
     "${INCLUDE}/ethumb-1/Ethumb.h" \
     "${INCLUDE}/ethumb-1/Ethumb_Client.h" \
     "${INCLUDE}/ethumb-1/Ethumb_Plugin.h" \

data/tools/genruby.rb

@@ -14,8 +14,8 @@ def set_type t, sym
         printf "\033[0;35m%40s\033[0m => \033[0;36m%s\033[0m\n",t,v
         return v
     else
-        printf "\033[0;31mERROR type #{t} => #{sym} alredy exists!\033[0m\n"
-        exit 1
+        printf "\033[0;31mERROR type #{t} => #{sym} already exists!\033[0m\n"
+        # exit 1
     end
 end
 #
@@ -42,11 +42,9 @@ def get_type_from_arg arg, l
     if arg =~ /\.\.\./
         return ':varargs'
     end
-    k = arg.gsub(/const/,'').gsub(/\s{2,}/,' ').strip
-    if k=~/(.*?)(\w+)$/
-        return get_type $1.strip
-    end
-    # try with unchanged argument string
+    k = arg.gsub(/const/,'').sub(/^\s+/,'').gsub(/\s{2,}/,' ').strip
+    k=~/(.*?)(\w+)$/ # remove var name if any
+    k = $1.strip if not $1.nil? and $1.length > 0
     t = get_type k
     if t.nil?
         printf "\033[0;31mwrong arg >#{k}< #{arg} (#{l})\033[0m\n"
@@ -140,7 +138,7 @@ def gen_callbacks path, indent
     r = []
     open(path+'-callbacks','r').readlines.each do |l|
         l.strip!
-        if not l=~/^\s*typedef\s+(.*)((?:\(\*?\w+\)| \*?\w+))\s*\((.*)\);/
+        if not l=~/^\s*typedef\s+(.*)((?:\(\*\s*?\w+\)| \*?\w+))\s*\((.*)\);/
             printf "\033[0;31m# #{l}\n#{indent}# FIXME\033[0m\n"
             r << indent+"# #{l}\n#{indent}# FIXME"
             next
@@ -148,7 +146,7 @@ def gen_callbacks path, indent
         ret = $1.strip
         name = $2.strip
         args = $3.split(',').collect { |arg| get_type_from_arg arg, l }.join ', '
-        t = name.sub(/\(/,'').sub(/\)/,'').sub(/\*/,'')
+        t = name.sub(/^\(\* */,'').sub(/\)$/,'')
         sym = ( t.downcase=~/_cb$/ ? t : t+'_cb' )
         tsym = set_type t, sym
         r << indent+"# #{l}"
@@ -244,8 +242,12 @@ TYPES = {
     'unsigned int' => ':uint',
     'unsigned char' => ':uchar',
     'unsigned short' => ':ushort',
+    'unsigned long' => ':ulong',
     'unsigned long int' => ':ulong',
     'unsigned long long' => ':ulong_long',
+    'uint32_t' => ':uint',
+    'int64_t' => ':long_long',
+    'uint64_t' => ':ulong_long',
     'char *' => ':string',                                              # FIXME ?!?!
     'fd_set *' => ':pointer',
     'FILE *' => ':pointer',
@@ -253,6 +255,8 @@ TYPES = {
     'struct tm *' => ':pointer',
     'struct timeval *' => ':pointer',
     'struct sockaddr *' => ':pointer',
+    'DBusBusType' => ':int',
+    'E_Notification_Closed_Reason' => ':e_notification_closed_reason',   # cheating
 }
 ETYPES = {
     'Eina_Bool' => ':bool'
@@ -303,6 +307,18 @@ libs << efl_h('efreet','efreet_ini.h','EfreetIni','efreet_ini')
 libs << efl_h('efreet','efreet_utils.h','EfreetUtils','efreet_utils',nil,["#{NATIVE}/efreet_desktop"])
 libs << efl_h('efreet_mime','Efreet_Mime.h','EfreetMime')
 libs << efl_h('efreet_trash','Efreet_Trash.h','EfreetTrash',nil,nil,["#{NATIVE}/eina_list","#{NATIVE}/efreet_uri"])
+libs << efl_h('edbus','E_DBus.h','Edbus',nil,'edbus.rb',["#{NATIVE}/eina_list"])
+libs << efl_h('enotify','E_Notify.h','Enotify','e_notification','enotify.rb',["#{NATIVE}/evas","#{NATIVE}/edbus"])
+libs << efl_h('enotify','E_Notification_Daemon.h','EnotificationDaemon','e_notification_daemon','enotification_daemon.rb',["#{NATIVE}/enotify"])
+libs << efl_h('ebluez','E_Bluez.h','Ebluez','e_bluez','ebluez.rb',["#{NATIVE}/edbus"])
+libs << efl_h('eofono','E_Ofono.h','Eofono','e_ofono','eofono.rb',["#{NATIVE}/edbus"])
+libs << efl_h('eukit','E_Ukit.h','Eukit','e_ukit','eukit.rb',["#{NATIVE}/edbus"])
+libs << efl_h('ehal','E_Hal.h','Ehal','e_hal','ehal.rb',["#{NATIVE}/edbus"])
+libs << efl_h('econnman0_7x','E_Connman.h','EConnman','e_connman','econnman.rb',["#{NATIVE}/edbus"])
+libs << efl_h('eeze','Eeze.h','Eeze',nil,nil,["#{NATIVE}/eina_list"])
+libs << efl_h('eeze','Eeze_Disk.h','EezeDisk')
+libs << efl_h('eeze','Eeze_Net.h','EezeNet',nil,nil,["#{NATIVE}/eina_list"])
+libs << efl_h('emotion','Emotion.h','Emotion',nil,nil,["#{NATIVE}/evas"])
 libs << efl_h('ethumb','Ethumb.h','Ethumb')
 libs << efl_h('ethumb_client','Ethumb_Client.h','EthumbClient',nil,nil,["#{NATIVE}/ethumb"])
 libs << efl_h('ethumb','Ethumb_Plugin.h','EthumbPlugin',nil,nil,["#{NATIVE}/evas","#{NATIVE}/ecore_evas","#{NATIVE}/ethumb"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-efl
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &17504240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17504240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17503400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *17503400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17502560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17502560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "It covers most of eina, eet, evas, ecore, emap, elementary.\n    Prototypes
   are extracted from C headers with sed scripts. FFI calls are generated with a ruby
   script."
@@ -150,12 +165,18 @@ files:
 - lib/efl/elm/elm_win.rb
 - lib/efl/evas.rb
 - lib/efl/native.rb
+- lib/efl/native/ebluez.rb
+- lib/efl/native/econnman.rb
 - lib/efl/native/ecore.rb
 - lib/efl/native/ecore_evas.rb
 - lib/efl/native/ecore_getopt.rb
 - lib/efl/native/ecore_input.rb
+- lib/efl/native/edbus.rb
 - lib/efl/native/edje.rb
 - lib/efl/native/eet.rb
+- lib/efl/native/eeze.rb
+- lib/efl/native/eeze_disk.rb
+- lib/efl/native/eeze_net.rb
 - lib/efl/native/efreet.rb
 - lib/efl/native/efreet_base.rb
 - lib/efl/native/efreet_desktop.rb
@@ -166,6 +187,7 @@ files:
 - lib/efl/native/efreet_trash.rb
 - lib/efl/native/efreet_uri.rb
 - lib/efl/native/efreet_utils.rb
+- lib/efl/native/ehal.rb
 - lib/efl/native/eina.rb
 - lib/efl/native/eina_file.rb
 - lib/efl/native/eina_hash.rb
@@ -256,9 +278,14 @@ files:
 - lib/efl/native/elm/elm_web.rb
 - lib/efl/native/elm/elm_win.rb
 - lib/efl/native/embryo.rb
+- lib/efl/native/emotion.rb
+- lib/efl/native/enotification_daemon.rb
+- lib/efl/native/enotify.rb
+- lib/efl/native/eofono.rb
 - lib/efl/native/ethumb.rb
 - lib/efl/native/ethumb_client.rb
 - lib/efl/native/ethumb_plugin.rb
+- lib/efl/native/eukit.rb
 - lib/efl/native/evas.rb
 - spec/ecore_evas_spec.rb
 - spec/ecore_getopt_spec.rb
@@ -307,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A ruby-ffi binding to efl libraries (Enlightenment Foundation Libraries).