merge: add eo

SVN revision: 77072
This commit is contained in:
Vincent Torri 2012-09-26 06:56:52 +00:00
parent 195d31c73f
commit 3b5a3448b7
115 changed files with 772 additions and 114 deletions

View File

@ -31,15 +31,11 @@ m4/efl_threads.m4 \
m4/evil_windows.m4 \
m4/eina_check.m4
if HAVE_WINDOWS
EXTRA_DIST += \
ChangeLog.evil \
NEWS.evil \
README.evil \
evil.pc
endif
EXTRA_DIST += \
evil.pc \
ChangeLog.eina \
NEWS.eina \
README.eina \
@ -49,7 +45,8 @@ ChangeLog.eet \
NEWS.eet \
README.eet \
eet.spec \
eet.pc
eet.pc \
eo.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
@ -64,6 +61,10 @@ if EFL_BUILD_EET
pkgconfig_DATA += eet.pc
endif
if EFL_BUILD_EO
pkgconfig_DATA += eo.pc
endif
.PHONY: doc benchmark examples install-examples
@ -97,10 +98,12 @@ check-local:
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
endif
@./src/tests/eina/eina_suite$(EXEEXT)
if EFL_BUILD_EET
@./src/tests/eet/eet_suite$(EXEEXT)
endif
if EFL_BUILD_EO
@./src/tests/eo/eo_suite$(EXEEXT)
endif
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-report
endif
@ -112,7 +115,9 @@ endif
benchmark:
@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
@mkdir benchmark || true
@cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s`
if EFL_BUILD_EO
@cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
endif
benchmark-e17:
@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17

View File

@ -51,8 +51,6 @@ AC_SUBST([VMAJ])
#### Default values
want_eina="yes"
want_eet="yes"
want_evas="yes"
want_ecore="yes"
want_embryo="yes"
@ -97,6 +95,7 @@ requirements_libs_deps_elementary=""
requirements_pc_eina=""
requirements_pc_eet=""
requirements_pc_eo=""
requirements_pc_evas=""
requirements_pc_ecore=""
requirements_pc_embryo=""
@ -140,6 +139,7 @@ AC_SUBST([requirements_libs_elementary])
AC_SUBST([requirements_pc_eina])
AC_SUBST([requirements_pc_eet])
AC_SUBST([requirements_pc_eo])
AC_SUBST([requirements_pc_evas])
AC_SUBST([requirements_pc_ecore])
AC_SUBST([requirements_pc_embryo])
@ -197,6 +197,7 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
#### Additional options to configure
EFL_ENABLE_LIB([eet], [yes])
EFL_ENABLE_LIB([eo], [yes])
# Assert or fail.
@ -1141,6 +1142,62 @@ fi
#### End of Eet
#### Eo
efl_have_eo="no"
if test "x${efl_want_build_eo}" = "xyes" ; then
AC_MSG_NOTICE([Eo checks])
### Default values
### Additional options to configure
### Checks for programs
### Checks for libraries
# Eina library
requirements_pc_eo="eina >= 1.7.99"
PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
# Example (evas one)
PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
### Checks for header files
### Checks for types
### Checks for structures
### Checks for compiler characteristics
EFL_EO_BUILD=""
case "$host_os" in
mingw*)
EFL_EO_BUILD="-DEFL_EO_BUILD"
;;
esac
AC_SUBST([EFL_EO_BUILD])
### Checks for linker characteristics
### Checks for library functions
### Check availability
efl_have_eo="yes"
fi
#### End of Eo
#### Evas
#AC_MSG_NOTICE([Evas checks])
@ -1166,12 +1223,14 @@ doc/Doxyfile
src/Makefile
src/benchmarks/Makefile
src/benchmarks/eina/Makefile
src/benchmarks/eo/Makefile
src/bin/Makefile
src/bin/evil/Makefile
src/bin/eet/Makefile
src/examples/Makefile
src/examples/eina/Makefile
src/examples/eet/Makefile
src/examples/eo/Makefile
src/include/Makefile
src/include/eina/Makefile
src/include/eina/eina_config.h
@ -1179,6 +1238,7 @@ src/lib/Makefile
src/lib/evil/Makefile
src/lib/eina/Makefile
src/lib/eet/Makefile
src/lib/eo/Makefile
src/modules/Makefile
src/modules/eina/Makefile
src/modules/eina/mp/Makefile
@ -1194,11 +1254,13 @@ src/scripts/eina/Makefile
src/tests/Makefile
src/tests/eina/Makefile
src/tests/eet/Makefile
src/tests/eo/Makefile
eina.spec
eet.spec
evil.pc
eina.pc
eet.pc
eo.pc
])
AC_OUTPUT
@ -1263,6 +1325,7 @@ echo " Pass through.......: ${enable_pass_through}"
echo
if test "x${efl_have_eet}" = "xno" ; then
echo "Eet....................: no"
echo
else
echo "Eet"
echo
@ -1278,6 +1341,16 @@ echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
echo " Examples.............: make examples"
echo " installation.......: make install-examples"
fi
if test "x${efl_have_eo}" = "xno" ; then
echo "Eo.....................: no"
echo
else
echo "Eo"
echo
echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
echo " Examples.............: make examples"
echo " installation.......: make install-examples"
fi
echo
echo "Compilation............: make (or gmake)"
echo " CPPFLAGS.............: $CPPFLAGS"

View File

@ -1,11 +1,14 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = eina
SUBDIRS = eina eo
.PHONY: benchmark benchmark-e17
benchmark:
@$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark
if EFL_BUILD_EO
@$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark
endif
benchmark-e17:
@$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17

View File

@ -0,0 +1,29 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I$(top_srcdir)/src/include/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/include/eina \
-I$(top_builddir)/src/lib/eo \
@EFL_EO_BUILD@ \
@EO_CFLAGS@
EXTRA_PROGRAMS = eo_bench
benchmark: eo_bench
eo_bench_SOURCES = \
class_simple.c \
class_simple.h \
eo_bench.c \
eo_bench.h \
eo_bench_eo_do.c
eo_bench_LDADD = \
$(top_builddir)/src/lib/eo/libeo.la \
$(top_builddir)/src/lib/eina/libeina.la \
@EO_LIBS@
clean-local:
rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda

View File

@ -1,15 +1,21 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = eina eet
SUBDIRS = eina eet eo
examples:
@$(MAKE) $(AM_MAKEFLAGS) -C eina examples
if EFL_BUILD_EET
@$(MAKE) $(AM_MAKEFLAGS) -C eet examples
endif
if EFL_BUILD_EO
@$(MAKE) $(AM_MAKEFLAGS) -C eo examples
endif
install-examples:
@$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
if EFL_BUILD_EET
@$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
endif
if EFL_BUILD_EO
@$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
endif

View File

@ -0,0 +1,83 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eo \
@EFL_EO_BUILD@ \
@EO_CFLAGS@
EXTRA_PROGRAMS = eo_isa eo_simple
if EO_BUILD_EXAMPLE_EVAS
EXTRA_PROGRAMS += eo_evas
endif
eo_isa_SOURCES = \
isa/eo_isa_complex.c \
isa/eo_isa_complex.h \
isa/eo_isa_interface.c \
isa/eo_isa_interface.h \
isa/eo_isa_main.c \
isa/eo_isa_mixin.c \
isa/eo_isa_mixin.h \
isa/eo_isa_simple.c \
isa/eo_isa_simple.h
eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
if EO_BUILD_EXAMPLE_EVAS
eo_evas_SOURCES = \
evas/evas_elw_box.c \
evas/evas_elw_box.h \
evas/evas_elw_boxedbutton.c \
evas/evas_elw_boxedbutton.h \
evas/evas_elw_button.c \
evas/evas_elw_button.h \
evas/evas_elw_win.h \
evas/evas_elw_win.c \
evas/evas_evas_obj.c \
evas/evas_evas_obj.h \
evas/evas_test.c
eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LIBS@
endif
eo_simple_SOURCES = \
simple/simple_interface.c \
simple/simple_interface.h \
simple/simple_main.c \
simple/simple_mixin.c \
simple/simple_mixin.h \
simple/simple_simple.c \
simple/simple_simple.h
eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
examples: $(EXTRA_PROGRAMS)
clean-local:
rm -f $(EXTRA_PROGRAMS)
install-examples:
mkdir -p $(pkgdatadir)/examples/eo/isa
$(install_sh_DATA) -c $(eo_isa_SOURCES) $(pkgdatadir)/examples/eo/isa
mkdir -p $(pkgdatadir)/examples/eo/evas
$(install_sh_DATA) -c $(evas_SOURCES) $(pkgdatadir)/examples/eo/evas
mkdir -p $(pkgdatadir)/examples/eo/simple
$(install_sh_DATA) -c $(simple_SOURCES) $(pkgdatadir)/examples/eo/simple
uninstall-local:
for f in $(eo_isa_SOURCES) ; do \
rm -f $(pkgdatadir)/examples/eo/isa/$$f ; \
done
for f in $(evas_SOURCES) ; do \
rm -f $(pkgdatadir)/examples/eo/evas/$$f ; \
done
for f in $(simple_SOURCES) ; do \
rm -f $(pkgdatadir)/examples/eo/simple/$$f ; \
done

View File

@ -3,7 +3,7 @@
#endif
#include "Eo.h"
#include "complex.h"
#include "eo_isa_complex.h"
#define MY_CLASS COMPLEX_CLASS

View File

@ -2,7 +2,7 @@
#define COMPLEX_H
#include "Eo.h"
#include "simple.h"
#include "eo_isa_simple.h"
#define COMPLEX_CLASS complex_class_get()
const Eo_Class *complex_class_get(void);

View File

@ -3,7 +3,7 @@
#endif
#include "Eo.h"
#include "interface.h"
#include "eo_isa_interface.h"
EAPI Eo_Op INTERFACE_BASE_ID = 0;

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "complex.h"
#include "eo_isa_simple.h"
#include "eo_isa_complex.h"
int
main(int argc, char *argv[])

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple.h"
#include "eo_isa_mixin.h"
#include "eo_isa_simple.h"
EAPI Eo_Op MIXIN_BASE_ID = 0;

View File

@ -3,7 +3,7 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "eo_isa_simple.h"
EAPI Eo_Op SIMPLE_BASE_ID = 0;

View File

@ -2,8 +2,8 @@
#define SIMPLE_H
#include "Eo.h"
#include "interface.h"
#include "mixin.h"
#include "eo_isa_interface.h"
#include "eo_isa_mixin.h"
extern EAPI Eo_Op SIMPLE_BASE_ID;

View File

@ -0,0 +1,29 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "Eo.h"
#include "simple_interface.h"
EAPI Eo_Op INTERFACE_BASE_ID = 0;
#define MY_CLASS INTERFACE_CLASS
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(INTERFACE_SUB_ID_A_POWER_3_GET, "Get the a^3"),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Interface",
EO_CLASS_TYPE_INTERFACE,
EO_CLASS_DESCRIPTION_OPS(&INTERFACE_BASE_ID, op_desc, INTERFACE_SUB_ID_LAST),
NULL,
0,
NULL,
NULL
};
EO_DEFINE_CLASS(interface_class_get, &class_desc, NULL, NULL)

View File

@ -0,0 +1,26 @@
#ifndef INTERFACE_H
#define INTERFACE_H
#include "Eo.h"
extern EAPI Eo_Op INTERFACE_BASE_ID;
enum {
INTERFACE_SUB_ID_A_POWER_3_GET,
INTERFACE_SUB_ID_LAST
};
#define INTERFACE_ID(sub_id) (INTERFACE_BASE_ID + sub_id)
/**
* @def interface_a_power_3_get(ret)
* @brief Get a^3
* @param[out] ret integer pointer to ret - value
*/
#define interface_a_power_3_get(ret) INTERFACE_ID(INTERFACE_SUB_ID_A_POWER_3_GET), EO_TYPECHECK(int *, ret)
#define INTERFACE_CLASS interface_class_get()
const Eo_Class *interface_class_get(void);
#endif

View File

@ -3,7 +3,7 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "simple_simple.h"
int
main(int argc, char *argv[])

View File

@ -0,0 +1,53 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "Eo.h"
#include "simple_mixin.h"
#include "simple_simple.h"
EAPI Eo_Op MIXIN_BASE_ID = 0;
#define MY_CLASS MIXIN_CLASS
static void
_a_square_get(Eo *obj, void *class_data EINA_UNUSED, va_list *list)
{
int a;
eo_do(obj, simple_a_get(&a));
int *ret = va_arg(*list, int *);
if (ret)
*ret = a * a;
printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
}
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(MIXIN_ID(MIXIN_SUB_ID_A_SQUARE_GET), _a_square_get),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(MIXIN_SUB_ID_A_SQUARE_GET, "Get the value of A^2"),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Mixin",
EO_CLASS_TYPE_MIXIN,
EO_CLASS_DESCRIPTION_OPS(&MIXIN_BASE_ID, op_desc, MIXIN_SUB_ID_LAST),
NULL,
0,
_class_constructor,
NULL
};
EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, NULL)

View File

@ -0,0 +1,26 @@
#ifndef MIXIN_H
#define MIXIN_H
#include "Eo.h"
extern EAPI Eo_Op MIXIN_BASE_ID;
enum {
MIXIN_SUB_ID_A_SQUARE_GET,
MIXIN_SUB_ID_LAST
};
#define MIXIN_ID(sub_id) (MIXIN_BASE_ID + sub_id)
/**
* @def mixin_a_square_get(ret)
* @brief Get the square of a.
* @param[out] ret the square of a
*/
#define mixin_a_square_get(ret) MIXIN_ID(MIXIN_SUB_ID_A_SQUARE_GET), EO_TYPECHECK(int *, ret)
#define MIXIN_CLASS mixin_class_get()
const Eo_Class *mixin_class_get(void);
#endif

View File

@ -0,0 +1,78 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "Eo.h"
#include "simple_simple.h"
EAPI Eo_Op SIMPLE_BASE_ID = 0;
typedef struct
{
int a;
} Private_Data;
#define MY_CLASS SIMPLE_CLASS
static void
_a_get(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
{
const Private_Data *pd = class_data;
int *a;
a = va_arg(*list, int *);
*a = pd->a;
printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
}
static void
_a_set(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
{
Private_Data *pd = class_data;
int a;
a = va_arg(*list, int);
pd->a = a;
printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
}
static void
_a_power_3_get(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
{
const Private_Data *pd = class_data;
int *ret;
ret = va_arg(*list, int *);
if (ret)
*ret = pd->a * pd->a * pd->a;
printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
}
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set),
EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_GET), _a_get),
EO_OP_FUNC(INTERFACE_ID(INTERFACE_SUB_ID_A_POWER_3_GET), _a_power_3_get),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_GET, "Get property A"),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Simple",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&SIMPLE_BASE_ID, op_desc, SIMPLE_SUB_ID_LAST),
NULL,
sizeof(Private_Data),
_class_constructor,
NULL
};
EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL);

View File

@ -0,0 +1,35 @@
#ifndef SIMPLE_H
#define SIMPLE_H
#include "Eo.h"
#include "simple_interface.h"
#include "simple_mixin.h"
extern EAPI Eo_Op SIMPLE_BASE_ID;
enum {
SIMPLE_SUB_ID_A_SET,
SIMPLE_SUB_ID_A_GET,
SIMPLE_SUB_ID_LAST
};
#define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
/**
* @def simple_a_set(a)
* @brief Set value to a-property
* @param[in] a integer value to set
*/
#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
/**
* @def simple_a_get(a)
* @brief Get value of a-property
* @param[out] integer pointer to a-value
*/
#define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EO_TYPECHECK(int *, a)
#define SIMPLE_CLASS simple_class_get()
const Eo_Class *simple_class_get(void);
#endif

View File

@ -15,3 +15,9 @@ if EFL_BUILD_EET
SUBDIRS += eet
endif
if EFL_BUILD_EO
SUBDIRS += eo
endif

21
src/lib/eo/Makefile.am Normal file
View File

@ -0,0 +1,21 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I$(top_srcdir)/src/include/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/include/eina \
-I$(top_builddir)/src/lib/eo \
@EFL_EO_BUILD@ \
@EO_CFLAGS@
installed_headerdir = $(includedir)/eo-@VMAJ@
dist_installed_header_DATA = Eo.h
lib_LTLIBRARIES = libeo.la
libeo_la_SOURCES = eo.c eo_base_class.c eo_private.h
libeo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EO_LIBS@
libeo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
clean-local:
rm -rf *.gcno

View File

@ -7,3 +7,9 @@ if EFL_BUILD_EET
SUBDIRS += eet
endif
if EFL_BUILD_EO
SUBDIRS += eo
endif

126
src/tests/eo/Makefile.am Normal file
View File

@ -0,0 +1,126 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eo \
@EFL_EO_BUILD@ \
@EO_CFLAGS@ \
@CHECK_CFLAGS@
check_PROGRAMS = \
test_access \
test_composite_objects \
test_constructors \
test_function_overrides \
test_interface \
test_mixin \
test_signals
if EFL_ENABLE_TESTS
check_PROGRAMS += eo_suite
endif
test_access_SOURCES = \
access/access_inherit.c \
access/access_inherit.h \
access/access_main.c \
access/access_simple.c \
access/access_simple.h \
access/access_simple_protected.h
test_access_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
test_composite_objects_SOURCES = \
composite_objects/composite_objects_comp.c \
composite_objects/composite_objects_comp.h \
composite_objects/composite_objects_main.c \
composite_objects/composite_objects_simple.c \
composite_objects/composite_objects_simple.h
test_composite_objects_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
test_constructors_SOURCES = \
constructors/constructors_main.c \
constructors/constructors_mixin.c \
constructors/constructors_mixin.h \
constructors/constructors_simple.c \
constructors/constructors_simple.h \
constructors/constructors_simple2.c \
constructors/constructors_simple2.h \
constructors/constructors_simple3.c \
constructors/constructors_simple3.h \
constructors/constructors_simple4.c \
constructors/constructors_simple4.h \
constructors/constructors_simple5.c \
constructors/constructors_simple5.h \
constructors/constructors_simple6.c \
constructors/constructors_simple6.h \
constructors/constructors_simple7.c \
constructors/constructors_simple7.h
test_constructors_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
if EFL_ENABLE_TESTS
eo_suite_SOURCES = \
suite/eo_test_class_simple.c \
suite/eo_test_class_simple.h \
suite/eo_suite.c \
suite/eo_suite.h \
suite/eo_test_class_errors.c \
suite/eo_test_general.c \
suite/eo_test_init.c
eo_suite_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ @CHECK_LIBS@
endif
test_function_overrides_SOURCES = \
function_overrides/function_overrides_inherit.c \
function_overrides/function_overrides_inherit.h \
function_overrides/function_overrides_inherit2.c \
function_overrides/function_overrides_inherit2.h \
function_overrides/function_overrides_inherit3.c \
function_overrides/function_overrides_inherit3.h \
function_overrides/function_overrides_main.c \
function_overrides/function_overrides_simple.c \
function_overrides/function_overrides_simple.h
test_function_overrides_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
test_interface_SOURCES = \
interface/interface_interface.c \
interface/interface_interface.h \
interface/interface_interface2.c \
interface/interface_interface2.h \
interface/interface_main.c \
interface/interface_simple.c \
interface/interface_simple.h
test_interface_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
test_mixin_SOURCES = \
mixin/mixin_inherit.c \
mixin/mixin_inherit.h \
mixin/mixin_main.c \
mixin/mixin_mixin.c \
mixin/mixin_mixin.h \
mixin/mixin_mixin2.c \
mixin/mixin_mixin2.h \
mixin/mixin_mixin3.c \
mixin/mixin_mixin3.h \
mixin/mixin_mixin4.c \
mixin/mixin_mixin4.h \
mixin/mixin_simple.c \
mixin/mixin_simple.h
test_mixin_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
test_signals_SOURCES = \
signals/signals_main.c \
signals/signals_simple.c \
signals/signals_simple.h
test_signals_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
EXTRA_DIST = eunit_tests.h

View File

@ -3,10 +3,9 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "simple_protected.h"
#include "inherit.h"
#include "access_simple.h"
#include "access_simple_protected.h"
#include "access_inherit.h"
EAPI Eo_Op INHERIT_BASE_ID = 0;

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "inherit.h"
#include "access_simple.h"
#include "access_inherit.h"
int
main(int argc, char *argv[])

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "simple_protected.h"
#include "access_simple.h"
#include "access_simple_protected.h"
EAPI Eo_Op SIMPLE_BASE_ID = 0;

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "comp.h"
#include "composite_objects_simple.h"
#include "composite_objects_comp.h"
#include "../eunit_tests.h"

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "comp.h"
#include "composite_objects_simple.h"
#include "composite_objects_comp.h"
#include "../eunit_tests.h"

View File

@ -3,7 +3,7 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "composite_objects_simple.h"
EAPI Eo_Op SIMPLE_BASE_ID = 0;

View File

@ -3,14 +3,14 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "simple2.h"
#include "simple3.h"
#include "simple4.h"
#include "simple5.h"
#include "simple6.h"
#include "simple7.h"
#include "mixin.h"
#include "constructors_simple.h"
#include "constructors_simple2.h"
#include "constructors_simple3.h"
#include "constructors_simple4.h"
#include "constructors_simple5.h"
#include "constructors_simple6.h"
#include "constructors_simple7.h"
#include "constructors_mixin.h"
#include "../eunit_tests.h"

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple.h"
#include "constructors_mixin.h"
#include "constructors_simple.h"
EAPI Eo_Op MIXIN_BASE_ID = 0;

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple.h"
#include "constructors_mixin.h"
#include "constructors_simple.h"
EAPI Eo_Op SIMPLE_BASE_ID = 0;

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple2.h"
#include "constructors_mixin.h"
#include "constructors_simple2.h"
#define MY_CLASS SIMPLE2_CLASS

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple3.h"
#include "constructors_mixin.h"
#include "constructors_simple3.h"
#define MY_CLASS SIMPLE3_CLASS

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple.h"
#include "simple4.h"
#include "constructors_mixin.h"
#include "constructors_simple.h"
#include "constructors_simple4.h"
#define MY_CLASS SIMPLE4_CLASS

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple5.h"
#include "constructors_mixin.h"
#include "constructors_simple5.h"
#define MY_CLASS SIMPLE5_CLASS

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple6.h"
#include "constructors_mixin.h"
#include "constructors_simple6.h"
#define MY_CLASS SIMPLE6_CLASS

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple7.h"
#include "simple2.h"
#include "constructors_mixin.h"
#include "constructors_simple7.h"
#include "constructors_simple2.h"
#include "../eunit_tests.h"

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "inherit.h"
#include "function_overrides_simple.h"
#include "function_overrides_inherit.h"
#define MY_CLASS INHERIT_CLASS

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "inherit.h"
#include "inherit2.h"
#include "function_overrides_simple.h"
#include "function_overrides_inherit.h"
#include "function_overrides_inherit2.h"
#include "../eunit_tests.h"

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "inherit2.h"
#include "inherit3.h"
#include "function_overrides_simple.h"
#include "function_overrides_inherit2.h"
#include "function_overrides_inherit3.h"
#define MY_CLASS INHERIT3_CLASS

View File

@ -3,10 +3,10 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "inherit.h"
#include "inherit2.h"
#include "inherit3.h"
#include "function_overrides_simple.h"
#include "function_overrides_inherit.h"
#include "function_overrides_inherit2.h"
#include "function_overrides_inherit3.h"
#include "../eunit_tests.h"

View File

@ -3,7 +3,7 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "function_overrides_simple.h"
#include "../eunit_tests.h"

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "interface.h"
#include "simple.h"
#include "interface_interface.h"
#include "interface_simple.h"
EAPI Eo_Op INTERFACE_BASE_ID = 0;

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "interface.h"
#include "interface2.h"
#include "simple.h"
#include "interface_interface.h"
#include "interface_interface2.h"
#include "interface_simple.h"
EAPI Eo_Op INTERFACE2_BASE_ID = 0;

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "interface.h"
#include "interface2.h"
#include "interface_simple.h"
#include "interface_interface.h"
#include "interface_interface2.h"
#include "../eunit_tests.h"

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "interface.h"
#include "interface2.h"
#include "simple.h"
#include "interface_interface.h"
#include "interface_interface2.h"
#include "interface_simple.h"
EAPI Eo_Op SIMPLE_BASE_ID = 0;

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "mixin4.h"
#include "inherit.h"
#include "mixin_simple.h"
#include "mixin_mixin4.h"
#include "mixin_inherit.h"
#define MY_CLASS INHERIT_CLASS

View File

@ -0,0 +1,7 @@
#ifndef INHERIT_H
#define INHERIT_H
#define INHERIT_CLASS inherit_class_get()
const Eo_Class *inherit_class_get(void);
#endif

View File

@ -3,11 +3,11 @@
#endif
#include "Eo.h"
#include "simple.h"
#include "inherit.h"
#include "mixin.h"
#include "mixin2.h"
#include "mixin3.h"
#include "mixin_simple.h"
#include "mixin_inherit.h"
#include "mixin_mixin.h"
#include "mixin_mixin2.h"
#include "mixin_mixin3.h"
#include "../eunit_tests.h"

View File

@ -3,8 +3,8 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "simple.h"
#include "mixin_mixin.h"
#include "mixin_simple.h"
EAPI Eo_Op MIXIN_BASE_ID = 0;

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "mixin2.h"
#include "simple.h"
#include "mixin_mixin.h"
#include "mixin_mixin2.h"
#include "mixin_simple.h"
#include "../eunit_tests.h"

View File

@ -3,9 +3,9 @@
#endif
#include "Eo.h"
#include "mixin.h"
#include "mixin3.h"
#include "simple.h"
#include "mixin_mixin.h"
#include "mixin_mixin3.h"
#include "mixin_simple.h"
#include "../eunit_tests.h"

Some files were not shown because too many files have changed in this diff Show More