Interfaces: Integration into Makefile + fix of .eo

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index c5fe87fd7a95ad67618b12a63c0fc92841389703..aea1c48877da0d13604a479bba6664b4475ec658 100644 (file)
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -1,3 +1,29 @@
+BUILT_SOURCES += \
+                 lib/efl/interfaces/efl_interface_color.eo.c \
+                 lib/efl/interfaces/efl_interface_color.eo.h \
+                 lib/efl/interfaces/efl_interface_file.eo.c \
+                 lib/efl/interfaces/efl_interface_file.eo.h \
+                 lib/efl/interfaces/efl_interface_gui_object.eo.c \
+                 lib/efl/interfaces/efl_interface_gui_object.eo.h \
+                 lib/efl/interfaces/efl_interface_image.eo.c \
+                 lib/efl/interfaces/efl_interface_image.eo.h \
+                 lib/efl/interfaces/efl_interface_text.eo.c \
+                 lib/efl/interfaces/efl_interface_text.eo.h \
+                 lib/efl/interfaces/efl_interface_text_properties.eo.c \
+                 lib/efl/interfaces/efl_interface_text_properties.eo.h
+
+efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
+efleolianfiles_DATA = \
+              lib/efl/interfaces/efl_interface_color.eo \
+              lib/efl/interfaces/efl_interface_file.eo \
+              lib/efl/interfaces/efl_interface_gui_object.eo \
+              lib/efl/interfaces/efl_interface_image.eo \
+              lib/efl/interfaces/efl_interface_text.eo \
+              lib/efl/interfaces/efl_interface_text_properties.eo
+
+EXTRA_DIST += \
+              ${efleolianfiles_DATA}
+
 installed_eflheadersdir = $(includedir)/efl-@VMAJ@
 dist_installed_eflheaders_DATA = \
 lib/efl/Efl_Config.h

diff --git a/src/lib/efl/interfaces/efl_interface_color.eo b/src/lib/efl/interfaces/efl_interface_color.eo
index d3cc615df7107a2a7ce25d77a586e0228c6c32e1..2dba646287ead92f42e5e23146e886f636c60aa8 100644 (file)
--- a/src/lib/efl/interfaces/efl_interface_color.eo
+++ b/src/lib/efl/interfaces/efl_interface_color.eo
@@ -1,12 +1,20 @@
+interface Efl_Interface_Part
+{
+   legacy_prefix: null;
+}
+
 interface Efl_Interface_Color_Enum_Part (Efl_Interface_Part)
 {
+   legacy_prefix: null;
 }
 
 interface Efl_Interface_Color_Text_Part (Efl_Interface_Part)
 {
+   legacy_prefix: null;
 }
 
 interface Efl_Interface_Color {
+   legacy_prefix: null;
    properties {
       color {
          set {

diff --git a/src/lib/efl/interfaces/efl_interface_file.eo b/src/lib/efl/interfaces/efl_interface_file.eo
index cf6098637c1a6939e486d44baf82e3e5ba94b963..464b7fa48e8c35abc594d223688f195f388700fd 100644 (file)
--- a/src/lib/efl/interfaces/efl_interface_file.eo
+++ b/src/lib/efl/interfaces/efl_interface_file.eo
@@ -1,4 +1,5 @@
 interface Efl_Interface_File {
+   legacy_prefix: null;
    properties {
       file {
          set {

diff --git a/src/lib/efl/interfaces/efl_interface_gui_object.eo b/src/lib/efl/interfaces/efl_interface_gui_object.eo
index c572df758371ba2f0e8c6df6cdcf260927f31d2b..ae0e17bffd848829aa60607aed9ed039b1ae1c1c 100644 (file)
--- a/src/lib/efl/interfaces/efl_interface_gui_object.eo
+++ b/src/lib/efl/interfaces/efl_interface_gui_object.eo
@@ -1,4 +1,5 @@
 interface Efl_Interface_Gui_Object {
+   legacy_prefix: null;
    properties {
       size {
          set {
@@ -46,6 +47,21 @@ interface Efl_Interface_Gui_Object {
             return Evas_Object * @warn_unused;
          }
       }
+      visibility {
+         set {
+            /*@ Makes the given Evas object visible or invisible. */
+            legacy null;
+         }
+         get {
+            /*@ Retrieves whether or not the given Evas object is visible. */
+            legacy null;
+         }
+         values {
+            Eina_Bool v; /*@ @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise */
+         }
+      }
+   }
+   methods {
       stack_above {
          /*@
          Stack @p obj immediately above @p above
@@ -126,19 +142,6 @@ interface Efl_Interface_Gui_Object {
          @see evas_object_raise() */
 
       }
-      visibility {
-         set {
-            /*@ Makes the given Evas object visible or invisible. */
-            legacy null;
-         }
-         get {
-            /*@ Retrieves whether or not the given Evas object is visible. */
-            legacy evas_object_visible_get;
-         }
-         values {
-            Eina_Bool v; /*@ @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise */
-         }
-      }
    }
 }
 

diff --git a/src/lib/efl/interfaces/efl_interface_image.eo b/src/lib/efl/interfaces/efl_interface_image.eo
index f6a2e37aa0999659fa3978fb6f8ad6326a8d7d26..edbf69355038b28b2222a10ed2c2295ffb404b28 100644 (file)
--- a/src/lib/efl/interfaces/efl_interface_image.eo
+++ b/src/lib/efl/interfaces/efl_interface_image.eo
@@ -1,4 +1,5 @@
 interface Efl_Interface_File {
+   legacy_prefix: null;
    properties {
       data_copy {
          set {

diff --git a/src/lib/efl/interfaces/efl_interface_text.eo b/src/lib/efl/interfaces/efl_interface_text.eo
index 8f4ef8466b649fc4bb8f4d359abb2544dc14b6b9..587799d4a11721f2d27da5d8905d59b9ece9b151 100644 (file)
--- a/src/lib/efl/interfaces/efl_interface_text.eo
+++ b/src/lib/efl/interfaces/efl_interface_text.eo
@@ -1,4 +1,5 @@
 interface Efl_Interface_Text {
+   legacy_prefix: null;
    properties {
       text_markup {
          set {

diff --git a/src/lib/efl/interfaces/efl_interface_text_properties.eo b/src/lib/efl/interfaces/efl_interface_text_properties.eo
index 4d0bac04cfdd0c12dfda4a33331836a448abb48d..120012912a1b28c37fbe536a9a23022bd4abb49e 100644 (file)
--- a/src/lib/efl/interfaces/efl_interface_text_properties.eo
+++ b/src/lib/efl/interfaces/efl_interface_text_properties.eo
@@ -1,4 +1,5 @@
 interface Efl_Interface_Text_Properties {
+   legacy_prefix: null;
    properties {
       font {
          set {
@@ -33,4 +34,5 @@ interface Efl_Interface_Text_Properties {
    }
    implements {
       virtual::font;
+   }
 }