From 570cba583ec844216d5bf90177880600e134adc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 26 Nov 2012 02:19:49 +0100 Subject: tools: take care of elm_win, forget about elm_map and elm_route --- lib/efl/native/elm/elm_route.rb | 2 +- tools/extract-api.sh | 10 +++++----- tools/genruby.rb | 16 +++------------- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/lib/efl/native/elm/elm_route.rb b/lib/efl/native/elm/elm_route.rb index 4135069..bf7dffa 100644 --- a/lib/efl/native/elm/elm_route.rb +++ b/lib/efl/native/elm/elm_route.rb @@ -27,7 +27,7 @@ module Efl # EAPI Evas_Object *elm_route_add(Evas_Object *parent); [ :elm_route_add, [ :evas_object ], :evas_object ], # EAPI void elm_route_emap_set(Evas_Object *obj, EMap_Route *emap); - [ :elm_route_emap_set, [ :evas_object, :emap_route ], :void ], + [ :elm_route_emap_set, [ :evas_object, :pointer ], :void ], # EAPI void elm_route_longitude_min_max_get(const Evas_Object *obj, double *min, double *max); [ :elm_route_longitude_min_max_get, [ :evas_object, :pointer, :pointer ], :void ], # EAPI void elm_route_latitude_min_max_get(const Evas_Object *obj, double *min, double *max); diff --git a/tools/extract-api.sh b/tools/extract-api.sh index 89186c9..ff0b6ff 100755 --- a/tools/extract-api.sh +++ b/tools/extract-api.sh @@ -46,14 +46,12 @@ for header in \ "${INCLUDE}/ethumb-1/Ethumb.h" \ "${INCLUDE}/ethumb-1/Ethumb_Client.h" \ "${INCLUDE}/ethumb-1/Ethumb_Plugin.h" \ - "${INCLUDE}/EMap.h" \ "${ELM_INCLUDE_DIR}/Elementary.h" \ "${ELM_INCLUDE_DIR}/elm_general.h" \ "${ELM_INCLUDE_DIR}/elm_tooltip.h" \ "${ELM_INCLUDE_DIR}/elm_object.h" \ "${ELM_INCLUDE_DIR}/elm_object_item.h" \ "${ELM_INCLUDE_DIR}/elc_ctxpopup.h" \ - "${ELM_INCLUDE_DIR}/elm_dayselector.h" \ "${ELM_INCLUDE_DIR}/elc_fileselector_button.h" \ "${ELM_INCLUDE_DIR}/elc_fileselector_entry.h" \ "${ELM_INCLUDE_DIR}/elc_fileselector.h" \ @@ -78,6 +76,7 @@ for header in \ "${ELM_INCLUDE_DIR}/elm_conform.h" \ "${ELM_INCLUDE_DIR}/elm_cursor.h" \ "${ELM_INCLUDE_DIR}/elm_datetime.h" \ + "${ELM_INCLUDE_DIR}/elm_dayselector.h" \ "${ELM_INCLUDE_DIR}/elm_debug.h" \ "${ELM_INCLUDE_DIR}/elm_diskselector.h" \ "${ELM_INCLUDE_DIR}/elm_entry.h" \ @@ -98,11 +97,11 @@ for header in \ "${ELM_INCLUDE_DIR}/elm_image.h" \ "${ELM_INCLUDE_DIR}/elm_index.h" \ "${ELM_INCLUDE_DIR}/elm_intro.h" \ + "${ELM_INCLUDE_DIR}/elm_inwin.h" \ "${ELM_INCLUDE_DIR}/elm_label.h" \ "${ELM_INCLUDE_DIR}/elm_layout.h" \ "${ELM_INCLUDE_DIR}/elm_list.h" \ "${ELM_INCLUDE_DIR}/elm_mapbuf.h" \ - "${ELM_INCLUDE_DIR}/elm_map.h" \ "${ELM_INCLUDE_DIR}/elm_menu.h" \ "${ELM_INCLUDE_DIR}/elm_mirroring.h" \ "${ELM_INCLUDE_DIR}/elm_need.h" \ @@ -114,7 +113,6 @@ for header in \ "${ELM_INCLUDE_DIR}/elm_plug.h" \ "${ELM_INCLUDE_DIR}/elm_progressbar.h" \ "${ELM_INCLUDE_DIR}/elm_radio.h" \ - "${ELM_INCLUDE_DIR}/elm_route.h" \ "${ELM_INCLUDE_DIR}/elm_scale.h" \ "${ELM_INCLUDE_DIR}/elm_scroller.h" \ "${ELM_INCLUDE_DIR}/elm_scroll.h" \ @@ -137,7 +135,9 @@ for header in \ # if [ ! -e "$header" ]; then echo "$header not found, we won't generate bindings for this header." - continue + continue + else + echo "extracting API from $header" fi # DIR=$(dirname $header) diff --git a/tools/genruby.rb b/tools/genruby.rb index 4b87ff4..fcf1543 100755 --- a/tools/genruby.rb +++ b/tools/genruby.rb @@ -339,11 +339,6 @@ libs << { :modname=>'EthumbPlugin', :prefix=>'ethumb_plugin', :outfile=>'ethumb_plugin.rb', :requires=>["#{NATIVE}/evas","#{NATIVE}/ecore_evas","#{NATIVE}/ethumb"], :constants=>[] } -libs << { - :lib=>'emap', :header=>'EMap.h', - :modname=>'Emap', :prefix=>'emap', :outfile=>'emap.rb', - :requires=>["#{NATIVE}/eina_list"], :constants=>[] -} # ELM_LIB='elementary' # @@ -369,11 +364,7 @@ libs << { :modname=>'Elm', :prefix=>'elm', :outfile=>'elm/elm_general.rb', :requires=>["#{NATIVE}/evas","#{NATIVE}/elementary"], :constants=>[] } -libs << { - :lib=>ELM_LIB,:header=>'elm_tooltip.h', - :modname=>'ElmTooltip', :prefix=>'elm', :outfile=>'elm/elm_tooltip.rb', - :requires=>["#{NATIVE}/elementary"], :constants=>[] -} +libs << elm_h('elm_tooltip.h', 'ElmTooltip') libs << elm_h('elm_object_item.h', 'ElmObjectItem') libs << elm_h('elm_object.h', 'ElmObject', ["#{NATIVE}/edje","#{NATIVE}/elementary"]) libs << elm_h('elm_icon.h', 'ElmIcon') @@ -381,7 +372,6 @@ libs << elm_h('elm_scroller.h', 'ElmScroller') libs << elm_h('elm_entry.h', 'ElmEntry', ["#{NATIVE}/edje","#{NATIVE}/elementary","#{NATIVE}/elm/elm_icon","#{NATIVE}/elm/elm_scroller"]) libs << elm_h('elm_list.h', 'ElmList', ["#{NATIVE}/elementary","#{NATIVE}/elm/elm_scroller"]) libs << elm_h('elc_ctxpopup.h', 'ElmCtxPopup') -libs << elm_h('elm_dayselector.h', 'ElmDaySelector') libs << elm_h('elc_fileselector_button.h', 'ElmFileSelectorButton') libs << elm_h('elc_fileselector_entry.h', 'ElmFileSelectorEntry') libs << elm_h('elc_fileselector.h', 'ElmFileSelector') @@ -405,6 +395,7 @@ libs << elm_h('elm_config.h', 'ElmConfig') libs << elm_h('elm_conform.h', 'ElmConform') libs << elm_h('elm_cursor.h', 'ElmCursor') libs << elm_h('elm_datetime.h', 'ElmDatetime') +libs << elm_h('elm_dayselector.h', 'ElmDaySelector') libs << elm_h('elm_debug.h', 'ElmDebug') libs << elm_h('elm_diskselector.h', 'ElmDiskSelector', ["#{NATIVE}/elementary","#{NATIVE}/elm/elm_scroller"]) libs << elm_h('elm_finger.h', 'ElmFinger') @@ -421,10 +412,10 @@ libs << elm_h('elm_grid.h', 'ElmGrid') libs << elm_h('elm_hover.h', 'ElmHover') libs << elm_h('elm_image.h', 'ElmImage') libs << elm_h('elm_index.h', 'ElmIndex') +libs << elm_h('elm_inwin.h', 'ElmInwin') libs << elm_h('elm_label.h', 'ElmLabel', ["#{NATIVE}/elementary","#{NATIVE}/elm/elm_entry"]) libs << elm_h('elm_layout.h', 'ElmLayout', ["#{NATIVE}/edje"]) libs << elm_h('elm_mapbuf.h', 'ElmMapBuf') -libs << elm_h('elm_map.h', 'ElmMap', ["#{NATIVE}/emap","#{NATIVE}/elementary"]) libs << elm_h('elm_menu.h', 'ElmMenu') libs << elm_h('elm_mirroring.h', 'ElmMirroring') libs << elm_h('elm_need.h', 'ElmNeed') @@ -436,7 +427,6 @@ libs << elm_h('elm_photo.h', 'ElmPhoto') libs << elm_h('elm_plug.h', 'ElmPlug') libs << elm_h('elm_progressbar.h', 'ElmProgressBar') libs << elm_h('elm_radio.h', 'ElmRadio') -libs << elm_h('elm_route.h', 'ElmRoute', ["#{NATIVE}/emap","#{NATIVE}/elementary"]) libs << elm_h('elm_scale.h', 'ElmScale') libs << elm_h('elm_scroll.h', 'ElmScroll') libs << elm_h('elm_segment_control.h', 'ElmSegmentControl') -- cgit v1.1-2-g2b99