Merge branch 'master' of asynk.ch:ffi-efl

3 files changed, 10 insertions, 13 deletions

diff --git a/tools/check_loading b/tools/check_loading
index 0814e78..0d082ed 100755
--- a/tools/check_loading
+++ b/tools/check_loading
@@ -18,11 +18,11 @@ function run () {
 function each () {
     echo $($RUBY --version)
     echo "  lib/efl/native/*.rb"
-    for native in $(find $parentdir/lib/efl/native/ -name *.rb | sort); do
+    for native in $(find $parentdir/lib/efl/native/ -name 'e*.rb' | sort); do
         run $native
     done
     echo "  lib/efl/*.rb"
-    for wrapper in $(find $parentdir/lib/efl/ -name e*.rb | grep -v native | sort); do
+    for wrapper in $(find $parentdir/lib/efl/ -name 'e*.rb' | grep -v native | sort); do
         run $wrapper
     done
 }
diff --git a/tools/extract-api.sh b/tools/extract-api.sh
index 0702629..3750cac 100755
--- a/tools/extract-api.sh
+++ b/tools/extract-api.sh
@@ -101,7 +101,6 @@ for header in \
     "${INCLUDE}/elementary-0/elm_mirroring.h" \
     "${INCLUDE}/elementary-0/elm_need.h" \
     "${INCLUDE}/elementary-0/elm_notify.h" \
-    "${INCLUDE}/elementary-0/elm_pager.h" \
     "${INCLUDE}/elementary-0/elm_panel.h" \
     "${INCLUDE}/elementary-0/elm_panes.h" \
     "${INCLUDE}/elementary-0/elm_password.h" \
diff --git a/tools/genruby.rb b/tools/genruby.rb
index 15fd985..f0f546a 100755
--- a/tools/genruby.rb
+++ b/tools/genruby.rb
@@ -382,15 +382,15 @@ libs << elm_h('elm_cache.h', 'ElmCache')
 libs << elm_h('elm_calendar.h', 'ElmCalendar')
 libs << elm_h('elm_check.h', 'ElmCheck')
 libs << elm_h('elm_clock.h', 'ElmClock')
-#libs << elm_h('elm_cnp.h', 'ElmCnp')
+libs << elm_h('elm_cnp.h', 'ElmCnp')
 libs << elm_h('elm_colorselector.h', 'ElmColorSelector')
 libs << elm_h('elm_config.h', 'ElmConfig')
-#libs << elm_h('elm_conform.h', 'ElmConform')
+libs << elm_h('elm_conform.h', 'ElmConform')
 libs << elm_h('elm_cursor.h', 'ElmCursor')
 libs << elm_h('elm_debug.h', 'ElmDebug')
 libs << elm_h('elm_diskselector.h', 'ElmDiskSelector', ["#{NATIVE}/elementary","#{NATIVE}/elm/elm_scroller"])
-#libs << elm_h('elm_engine.h', 'ElmEngine')
-#libs << elm_h('elm_factory.h', 'ElmFactory')
+libs << elm_h('elm_engine.h', 'ElmEngine')
+libs << elm_h('elm_factory.h', 'ElmFactory')
 libs << elm_h('elm_finger.h', 'ElmFinger')
 libs << elm_h('elm_flip.h', 'ElmFlip')
 libs << elm_h('elm_flipselector.h', 'ElmFlipSelector')
@@ -399,8 +399,8 @@ libs << elm_h('elm_fonts.h', 'ElmFonts',  ["#{NATIVE}/eina_hash","#{NATIVE}/elem
 libs << elm_h('elm_frame.h', 'ElmFrame')
 libs << elm_h('elm_gengrid.h', 'ElmGenGrid')
 libs << elm_h('elm_genlist.h', 'ElmGenList', ["#{NATIVE}/elementary","#{NATIVE}/elm/elm_list","#{NATIVE}/elm/elm_scroller"])
-#libs << elm_h('elm_gesture_layer.h', 'ElmGestureLayer')
-#libs << elm_h('elm_glview.h', 'ElmGLView')
+libs << elm_h('elm_gesture_layer.h', 'ElmGestureLayer')
+libs << elm_h('elm_glview.h', 'ElmGLView')
 libs << elm_h('elm_grid.h', 'ElmGrid')
 libs << elm_h('elm_hover.h', 'ElmHover')
 libs << elm_h('elm_image.h', 'ElmImage')
@@ -413,7 +413,6 @@ libs << elm_h('elm_menu.h', 'ElmMenu')
 libs << elm_h('elm_mirroring.h', 'ElmMirroring')
 libs << elm_h('elm_need.h', 'ElmNeed')
 libs << elm_h('elm_notify.h', 'ElmNotify')
-libs << elm_h('elm_pager.h', 'ElmPager')
 libs << elm_h('elm_panel.h', 'ElmPanel')
 libs << elm_h('elm_panes.h', 'ElmPanes')
 libs << elm_h('elm_password.h', 'ElmPassword')
@@ -425,12 +424,12 @@ 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')
+libs << elm_h('elm_segment_control.h', 'ElmSegmentControl')
 libs << elm_h('elm_separator.h', 'ElmSeparator')
 libs << elm_h('elm_slider.h', 'ElmSlider')
 libs << elm_h('elm_slideshow.h', 'ElmSlideshow')
 libs << elm_h('elm_spinner.h', 'ElmSpinner')
-#libs << elm_h('elm_store.h', 'ElmStore')
+libs << elm_h('elm_store.h', 'ElmStore')
 libs << elm_h('elm_table.h', 'ElmTable')
 libs << elm_h('elm_theme.h', 'ElmTheme')
 libs << elm_h('elm_thumb.h', 'ElmThumb')
@@ -438,7 +437,6 @@ libs << elm_h('elm_toolbar.h', 'ElmToolbar', ["#{NATIVE}/elementary","#{NATIVE}/
 libs << elm_h('elm_transit.h', 'ElmTransit')
 libs << elm_h('elm_video.h', 'ElmVideo')
 libs << elm_h('elm_web.h', 'ElmWeb')
-#libs << elm_h('elm_widget.h', 'ElmWidget')
 libs << elm_h('elm_win.h', 'ElmWin')
 
 Dir.mkdir lib_path unless (File.exists? lib_path)