efl: merge edje.

this is still in progress, mostly the multisense stuff is pending.

it seems that when we merge ecore_audio in edje the libremix and
similar are gone, at least from Edje, and will be in ecore_audio
itself (or pulseaudio).

Changes:
 * __UNUSED__ to EINA_UNUSED
 * binaries (epp, embryo_cc, edje_cc) now consider EFL_RUN_IN_TREE and
   will assume the binaries are still not installed, running from
   build tree location (needs more testing, maybe doesn't work with
   srcdir != builddir, still doesn't solve cross compile builds)



SVN revision: 82139
This commit is contained in:
Gustavo Sverzut Barbieri 2013-01-04 02:08:14 +00:00
parent e2ce20e9a4
commit 9ea2ce1041
190 changed files with 49745 additions and 314 deletions

View File

@ -100,7 +100,8 @@ pc/efreet.pc \
pc/efreet-mime.pc \
pc/efreet-trash.pc \
pc/eeze.pc \
pc/ephysics.pc
pc/ephysics.pc \
pc/edje.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
@ -132,7 +133,8 @@ pc/eio.pc \
pc/edbus2.pc \
pc/efreet.pc \
pc/efreet-mime.pc \
pc/efreet-trash.pc
pc/efreet-trash.pc \
pc/edje.pc
if BUILD_ENGINE_SOFTWARE_X11
pkgconfig_DATA += pc/evas-software-x11.pc

View File

@ -3266,6 +3266,63 @@ EFL_LIB_END_OPTIONAL([EPhysics])
#### End of EPhysics
#### Edje
EFL_LIB_START([Edje])
### Additional options to configure
### Default values
want_multisense="no" # TODO: move to ecore_audio and enable
want_edje_program_cache="no"
want_edje_calc_cache="yes"
want_fixed_point="no"
### Checks for programs
### Checks for libraries
EFL_PLATFORM_DEPEND([EDJE], [evil])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eina])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eo])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eet])
EFL_INTERNAL_DEPEND_PKG([EDJE], [evas])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-evas])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-file])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-input])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf-evas])
EFL_INTERNAL_DEPEND_PKG([EDJE], [embryo])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eio])
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_physics}], [ephysics])
#EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio])
EFL_CHECK_LUA_5_1([EDJE])
EFL_ADD_LIBS([EDJE], [-lm])
EFL_EVAL_PKGS([EDJE])
AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"])
AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
[1], [Use Multisense])
AC_SUBST([want_multisense])
### Checks for header files
### Checks for types
### Checks for structures
### Checks for compiler characteristics
### Checks for linker characteristics
### Checks for library functions
EFL_LIB_END([Edje])
#### End of Edje
AC_CONFIG_FILES([
Makefile
data/Makefile
@ -3284,6 +3341,7 @@ src/examples/ecore/Makefile
src/examples/eio/Makefile
src/examples/edbus/Makefile
src/examples/ephysics/Makefile
src/examples/edje/Makefile
src/lib/eina/eina_config.h
src/lib/ecore_x/ecore_x_version.h
spec/efl.spec
@ -3331,6 +3389,7 @@ pc/efreet-mime.pc
pc/efreet-trash.pc
pc/eeze.pc
pc/ephysics.pc
pc/edje.pc
dbus-services/org.enlightenment.Efreet.service
$po_makefile_in
])
@ -3537,6 +3596,7 @@ echo
echo "Eeze...................: ${efl_lib_optional_eeze} (tizen: ${want_tizen})"
echo "EPhysics...............: ${efl_lib_optional_ephysics}"
echo "Edje...................: yes (physics=${efl_lib_optional_ephysics}, multisense=${want_multisense})"
echo "Tests..................: ${build_tests}"
echo "Examples...............: make examples"

View File

@ -1,12 +1,28 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST =
########################################################################
# Embryo
embryofilesdir = $(datadir)/embryo/include
embryofiles_DATA = embryo/default.inc
########################################################################
# Evas
evasfilesdir = $(datadir)/evas
evasfiles_DATA = evas/checkme
########################################################################
# Eo
eofilesdir = $(datadir)/eo
eofiles_DATA = eo/eo_step.py
EXTRA_DIST = embryo/default.inc evas/checkme eo/eo_step.py
########################################################################
# Edje
edjefilesdir = $(datadir)/edje/include
edjefiles_DATA = edje/include/edje.inc
mimedir = $(datadir)/mime/packages
mime_DATA = edje/edje.xml
EXTRA_DIST += edje/edc.vim edje/edje-mode.el

View File

@ -602,7 +602,8 @@ INPUT = @top_srcdir@/src/lib \
@srcdir@/eo_tutorial.dox \
@srcdir@/eio_examples.dox \
@srcdir@/edbus_examples.dox \
@srcdir@/ephysics_examples.dox
@srcdir@/ephysics_examples.dox \
@srcdir@/edje_examples.dox
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@ -810,7 +811,8 @@ eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \
edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ \
efreet_ _efreet_ Efreet_ _Efreet_ EFREET_ _EFREET_ \
eeze_ _eeze_ Eeze_ _Eeze_ EEZE_ _EEZE_ \
ephysics_ _ephysics_ EPhysics_ _EPhysics_ EPHYSICS_ _EPHYSICS_
ephysics_ _ephysics_ EPhysics_ _EPhysics_ EPHYSICS_ _EPHYSICS_ \
edje_ _edje_ Edje_ _Edje_ EDJE_ _EDJE_
#---------------------------------------------------------------------------

View File

@ -1,8 +1,7 @@
/**
* @page Examples Examples
*
* Here is a page with examples.
* @page edje_examples Examples
*
* Examples:
* @li @ref Example_Edje_Basics
* @li @ref tutorial_edje_nested
* @li @ref tutorial_edje_swallow

View File

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

7202
doc/img/edje-text.eps Normal file

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

15032
doc/img/signal2final.eps Normal file

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

26
m4/efl_lua.m4 Normal file
View File

@ -0,0 +1,26 @@
dnl EFL_CHECK_LUA_5_1(EFL)
dnl checks for lua5.1 in pkg-config (multiple names) and -llua directly
dnl will call EFL_ADD_LIBS() or EFL_DEPEND_PKG() as required.
dnl this is a strict call and will abort if lua is not found
AC_DEFUN([EFL_CHECK_LUA_5_1],
[dnl
requirement_lua=""
PKG_CHECK_EXISTS([lua >= 5.1.0], [requirement_lua="lua >= 5.1.0"],
[PKG_CHECK_EXISTS([lua5.1 >= 5.1.0], [requirement_lua="lua5.1 >= 5.1.0"],
[PKG_CHECK_EXISTS([lua-5.1 >= 5.1.0], [requirement_lua="lua-5.1 >= 5.1.0"],
[PKG_CHECK_EXISTS([lua51 >= 5.1.0], [requirement_lua="lua51 >= 5.1.0"])])])])
if test "x${requirement_lua}" = "x"; then
AC_MSG_CHECKING([whether lua_newstate() is in liblua])
AC_CHECK_LIB([lua], [lua_newstate],
[have_lua="yes"
EFL_ADD_LIBS([$1], [-llua])],
[have_lua="no"])
AC_MSG_RESULT([${have_lua}])
if test "${have_lua}" = "no"; then
AC_MSG_ERROR([Missing lua 5.1 support])
fi
else
EFL_DEPEND_PKG([$1], [LUA], [${requirement_lua}])
fi
])

View File

@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
modules=@libdir@/@PACKAGE@/modules
modules=@libdir@/edje/modules
includedir=@includedir@
datarootdir=@datarootdir@
datadir=@datadir@/edje
@ -10,8 +10,8 @@ multisense=@want_multisense@
Name: edje
Description: Enlightened graphical design and layout engine.
@pkgconfig_requires_private@: @requirement_edje@
Requires.private: @requirements_pc_edje@
Version: @VERSION@
Libs: -L${libdir} -ledje
Libs.private: @lua_libs@
Libs.private: @requirements_libs_edje@
Cflags: -I${includedir}/edje-@VMAJ@

View File

@ -67,6 +67,7 @@ endif
if HAVE_EPHYSICS
include Makefile_EPhysics.am
endif
include Makefile_Edje.am
.PHONY: benchmark examples
@ -85,6 +86,7 @@ clean-local:
rm -rf bin/eet/*.gcno
rm -rf bin/efreet/*.gcno
rm -rf bin/eeze/*.gcno
rm -rf bin/edje/*.gcno
rm -rf lib/evil/*.gcno
rm -rf lib/eina/*.gcno
rm -rf lib/eo/*.gcno
@ -103,6 +105,7 @@ clean-local:
rm -rf lib/efreet/*.gcno
rm -rf lib/eeze/*.gcno
rm -rf lib/ephysics/*.gcno
rm -rf lib/edje/*.gcno
rm -rf modules/eina/mp/pass_through/*.gcno
rm -rf modules/eina/mp/one_big/*.gcno
rm -rf modules/eina/mp/chained_pool/*.gcno
@ -139,5 +142,8 @@ clean-local:
rm -rf modules/evas/savers/jpeg/*.gcno
rm -rf modules/evas/savers/png/*.gcno
rm -rf modules/evas/savers/tiff/*.gcno
rm -rf modules/edje/alsa_snd_player/*.gcno
rm -rf modules/edje/eet_snd_reader/*.gcno
rm -rf modules/edje/multisense_factory/*.gcno
rm -rf static_libs/liblinebreak/*.gcno
rm -rf static_libs/lz4/*.gcno

255
src/Makefile_Edje.am Normal file
View File

@ -0,0 +1,255 @@
### Library
lib_LTLIBRARIES += lib/edje/libedje.la
EDJE_COMMON_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eo \
-I$(top_srcdir)/src/lib/eet \
-I$(top_builddir)/src/lib/eet \
-I$(top_srcdir)/src/lib/evas \
-I$(top_builddir)/src/lib/evas \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_builddir)/src/lib/ecore_evas \
-I$(top_srcdir)/src/lib/ecore_file \
-I$(top_builddir)/src/lib/ecore_file \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_builddir)/src/lib/ecore_input \
-I$(top_srcdir)/src/lib/ecore_imf \
-I$(top_builddir)/src/lib/ecore_imf \
-I$(top_srcdir)/src/lib/embryo \
-I$(top_builddir)/src/lib/embryo \
-I$(top_srcdir)/src/lib/eio \
-I$(top_builddir)/src/lib/eio \
-I$(top_srcdir)/src/lib/ephysics \
-I$(top_builddir)/src/lib/ephysics \
-I$(top_srcdir)/src/lib/edje \
-I$(top_builddir)/src/lib/edje \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DEFL_EDJE_BUILD \
@EFL_COV_CFLAGS@ \
@EDJE_CFLAGS@ \
@USE_EVIL_CFLAGS@
EDJE_COMMON_LIBS = \
lib/eina/libeina.la \
lib/eo/libeo.la \
lib/eet/libeet.la \
lib/evas/libevas.la \
lib/ecore/libecore.la \
lib/ecore_evas/libecore_evas.la \
lib/ecore_file/libecore_file.la \
lib/ecore_input/libecore_input.la \
lib/ecore_imf/libecore_imf.la \
lib/ecore_imf/libecore_imf_evas.la \
lib/embryo/libembryo.la \
lib/eio/libeio.la \
@USE_EVIL_LIBS@ \
@EFL_COV_LIBS@
if HAVE_EPHYSICS
EDJE_COMMON_LIBS += lib/ephysics/libephysics.la
endif
installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@
dist_installed_edjemainheaders_DATA = \
lib/edje/Edje.h \
lib/edje/Edje_Edit.h
lib_edje_libedje_la_SOURCES = \
lib/edje/edje_private.h \
lib/edje/edje_container.h \
lib/edje/edje_convert.h \
lib/edje/edje_box_layout.c \
lib/edje/edje_cache.c \
lib/edje/edje_calc.c \
lib/edje/edje_callbacks.c \
lib/edje/edje_container.c \
lib/edje/edje_data.c \
lib/edje/edje_edit.c \
lib/edje/edje_embryo.c \
lib/edje/edje_entry.c \
lib/edje/edje_external.c \
lib/edje/edje_load.c \
lib/edje/edje_lua.c \
lib/edje/edje_lua2.c \
lib/edje/edje_lua_script_only.c \
lib/edje/edje_main.c \
lib/edje/edje_match.c \
lib/edje/edje_message_queue.c \
lib/edje/edje_misc.c \
lib/edje/edje_module.c \
lib/edje/edje_multisense.c \
lib/edje/edje_program.c \
lib/edje/edje_script_only.c \
lib/edje/edje_smart.c \
lib/edje/edje_text.c \
lib/edje/edje_textblock_styles.c \
lib/edje/edje_util.c \
lib/edje/edje_var.c
lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
lib_edje_libedje_la_LIBADD = $(EDJE_COMMON_LIBS) @EDJE_LIBS@
lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
if ENABLE_MULTISENSE
# edjemoduleXXXdir = $(libdir)/edje/modules/
# edjemoduleXXX_LTLIBRARIES = modules/edje/XXX/module.la
#
# modules_edje_XXX_module_la_SOURCES = modules/edje/XXX/XXX.c
# modules_edje_XXX_module_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) @XXX_LIBS@
# modules_edje_XXX_module_la_LIBADD = $(EDJE_COMMON_USER_LIBADD)
# modules_edje_XXX_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
# modules_edje_XXX_module_la_LIBTOOLFLAGS = --tag=disable-static
# edjemodulemultisensefactorydir = $(libdir)/edje/modules/multisense_factory/$(MODULE_ARCH)
# edjemodulemultisensefactory_LTLIBRARIES = modules/edje/multisense_factory/module.la
#
# modules_edje_multisense_factory_module_la_SOURCES = \
# modules/edje/multisense_factory/multisense_factory.c
# modules_edje_multisense_factory_module_la_CPPFLAGS = \
# $(EDJE_COMMON_CPPFLAGS) \
# @REMIX_CFLAGS@
# modules_edje_multisense_factory_module_la_LIBADD = \
# $(EDJE_COMMON_USER_LIBADD) \
# @REMIX_LIBS@
# modules_edje_multisense_factory_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
# modules_edje_multisense_factory_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
### Binary
EDJE_COMMON_USER_LDADD = \
$(EDJE_COMMON_LIBS) \
lib/edje/libedje.la \
@EDJE_LDFLAGS@
bin_PROGRAMS += \
bin/edje/edje_cc \
bin/edje/edje_decc \
bin/edje/edje_player \
bin/edje/edje_inspector \
bin/edje/edje_external_inspector \
bin/edje/edje_codegen \
bin/edje/edje_pick \
bin/edje/edje_watch
bin_edje_edje_cc_SOURCES = \
bin/edje/edje_multisense_convert.h \
bin/edje/edje_cc.h \
bin/edje/edje_cc.c \
bin/edje/edje_cc_out.c \
bin/edje/edje_cc_parse.c \
bin/edje/edje_cc_mem.c \
bin/edje/edje_cc_handlers.c \
bin/edje/edje_cc_sources.c \
bin/edje/edje_multisense_convert.c
bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_cc_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_decc_SOURCES = \
bin/edje/edje_decc.c \
bin/edje/edje_decc.h \
bin/edje/edje_cc_mem.c \
bin/edje/edje_cc_sources.c
bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_decc_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_player_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_inspector_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_external_inspector_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_codegen_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_pick_LDADD = $(EDJE_COMMON_USER_LDADD)
bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
bin_edje_edje_watch_LDADD = $(EDJE_COMMON_USER_LDADD)
# EPP (Edje's CPP)
eppdir = $(libdir)/edje/utils
epp_PROGRAMS = bin/edje/epp/epp
bin_edje_epp_epp_SOURCES = \
bin/edje/epp/cpplib.h \
bin/edje/epp/cpphash.h \
bin/edje/epp/cppalloc.c \
bin/edje/epp/cpperror.c \
bin/edje/epp/cppexp.c \
bin/edje/epp/cpphash.c \
bin/edje/epp/cpplib.c \
bin/edje/epp/cppmain.c
# Note: eina is included only because of EINA_UNUSED
bin_edje_epp_epp_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
$(CWARNFLAGS) \
-DHAVE_CONFIG_H \
-DHAVE_STRERROR \
-DFATAL_EXIT_CODE=1 \
-DSUCCESS_EXIT_CODE=0 \
-DGCC_INCLUDE_DIR=\"/usr/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"/usr/include\" \
-DTOOL_INCLUDE_DIR=\"/usr/bin\" \
-DHOST_BITS_PER_LONG=32 \
-DBITS_PER_UNIT=8 \
-DHOST_BITS_PER_INT=32 \
-DBITS_PER_WORD=16 \
-DTARGET_BELL=7 \
-DTARGET_BS=8 \
-DTARGET_FF=12 \
-DTARGET_NEWLINE=10 \
-DTARGET_CR=13 \
-DTARGET_TAB=9 \
-DTARGET_VT=11
# TODO: why keep these?
EXTRA_DIST += \
bin/edje/edje_convert.h \
bin/edje/edje_convert.c \
bin/edje/edje_data_convert.c
### Unit tests
if EFL_ENABLE_TESTS
check_PROGRAMS += tests/edje/edje_suite
tests_edje_edje_suite_SOURCES = \
tests/edje/edje_suite.c \
tests/edje/edje_test_edje.c \
tests/edje/edje_suite.h
tests_edje_edje_suite_CPPFLAGS = \
$(EDJE_COMMON_CPPFLAGS) \
@CHECK_CFLAGS@
tests_edje_edje_suite_LDADD = \
$(EDJE_COMMON_USER_LDADD) \
@CHECK_LIBS@
endif

View File

@ -60,6 +60,7 @@ bin_embryo_embryo_cc_CPPFLAGS = \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
@EMBRYO_CFLAGS@ \
@USE_EVIL_CFLAGS@

View File

@ -40,7 +40,7 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
const char *fnc,
int fline,
const char *fmt,
__UNUSED__ void *data,
EINA_UNUSED void *data,
va_list args)
{
if ((d->name) && (d->namelen == sizeof("edje_cc") - 1) &&

View File

@ -2464,9 +2464,6 @@ st_collections_group_name(void)
current_pc = eina_list_data_get(eina_list_last(edje_collections));
if (current_de->entry)
goto double_named_group;
current_de->entry = parse_str(0);
current_pc->part = current_de->entry;
@ -2489,10 +2486,6 @@ st_collections_group_name(void)
break;
}
double_named_group:
ERR("Invalid group, only a single name statement is valid for group, use "
"alias instead.");
exit(-1);
}
typedef struct _Edje_List_Foreach_Data Edje_List_Foreach_Data;
@ -2502,7 +2495,7 @@ struct _Edje_List_Foreach_Data
};
static Eina_Bool
_edje_data_item_list_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata)
_edje_data_item_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data EINA_UNUSED, void *fdata)
{
Edje_List_Foreach_Data *fd;

View File

@ -204,7 +204,7 @@ static Eina_Hash *part_dest_lookup = NULL;
static Eina_Hash *part_pc_dest_lookup = NULL;
void
error_and_abort(Eet_File *ef __UNUSED__, const char *fmt, ...)
error_and_abort(Eet_File *ef EINA_UNUSED, const char *fmt, ...)
{
va_list ap;
@ -218,20 +218,20 @@ error_and_abort(Eet_File *ef __UNUSED__, const char *fmt, ...)
}
static unsigned int
_double_pointer_key_length(const void *key __UNUSED__)
_double_pointer_key_length(const void *key EINA_UNUSED)
{
return sizeof (void*) * 2;
}
static int
_double_pointer_key_cmp(const void *key1, int key1_length,
const void *key2, int key2_length __UNUSED__)
const void *key2, int key2_length EINA_UNUSED)
{
return memcmp(key1, key2, key1_length);
}
static int
_double_pointer_key_hash(const void *key, int key_length __UNUSED__)
_double_pointer_key_hash(const void *key, int key_length EINA_UNUSED)
{
#ifdef __LP64__
return eina_hash_int64(key, sizeof (void*)) ^
@ -359,7 +359,7 @@ check_program(Edje_Part_Collection *pc, Edje_Program *ep, Eet_File *ef)
}
static void
data_thread_head(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_head(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Head_Write *hw = data;
int bytes = 0;
@ -417,7 +417,7 @@ data_thread_head(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_thread_head_end(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_head_end(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Head_Write *hw = data;
@ -449,7 +449,7 @@ data_write_header(Eet_File *ef)
}
static void
data_thread_fonts(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_fonts(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Fonts_Write *fc = data;
Eina_List *ll;
@ -516,7 +516,7 @@ data_thread_fonts(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_thread_fonts_end(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_fonts_end(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Fonts_Write *fc = data;
pending_threads--;
@ -645,7 +645,7 @@ error_and_abort_image_load_error(Eet_File *ef, const char *file, int error)
}
static void
data_thread_image(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_image(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Image_Write *iw = data;
char buf[PATH_MAX], buf2[PATH_MAX];
@ -754,7 +754,7 @@ data_thread_image(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_thread_image_end(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_image_end(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Image_Write *iw = data;
@ -771,7 +771,7 @@ data_thread_image_end(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_image_preload_done(void *data, Evas *e __UNUSED__, Evas_Object *o, void *event_info __UNUSED__)
data_image_preload_done(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void *event_info EINA_UNUSED)
{
Image_Write *iw = data;
@ -872,7 +872,7 @@ data_write_images(Eet_File *ef, int *image_num)
}
static void
data_thread_sounds(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_sounds(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Sound_Write *sw = data;
Eina_List *ll;
@ -954,7 +954,7 @@ data_thread_sounds(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_thread_sounds_end(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_sounds_end(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Sound_Write *sw = data;
pending_threads--;
@ -1018,7 +1018,7 @@ check_groups(Eet_File *ef)
}
static void
data_thread_group(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_group(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Group_Write *gw = data;
int bytes;
@ -1043,7 +1043,7 @@ data_thread_group(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_thread_group_end(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_group_end(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Group_Write *gw = data;
pending_threads--;
@ -1165,7 +1165,7 @@ create_script_file(Eet_File *ef, const char *filename, const Code *cd, int fd)
}
static void
data_thread_script(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_script(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Script_Write *sc = data;
FILE *f;
@ -1243,7 +1243,7 @@ data_thread_script(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_thread_script_end(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_script_end(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Script_Write *sc = data;
pending_threads--;
@ -1257,7 +1257,7 @@ data_thread_script_end(void *data, Ecore_Thread *thread __UNUSED__)
}
static Eina_Bool
data_scripts_exe_del_cb(void *data __UNUSED__, int evtype __UNUSED__, void *evinfo)
data_scripts_exe_del_cb(void *data EINA_UNUSED, int evtype EINA_UNUSED, void *evinfo)
{
Script_Write *sc = data;
Ecore_Exe_Event_Del *ev = evinfo;
@ -1289,6 +1289,8 @@ static void
data_write_scripts(Eet_File *ef)
{
Eina_List *l;
char embryo_cc_path[PATH_MAX] = "";
char inc_path[PATH_MAX] = "";
int i;
if (!tmp_dir)
@ -1298,6 +1300,33 @@ data_write_scripts(Eet_File *ef)
tmp_dir = "/tmp";
#endif
#ifdef _WIN32
# define BIN_EXT ".exe"
#else
# define BIN_EXT
#endif
if (getenv("EFL_RUN_IN_TREE"))
{
snprintf(embryo_cc_path, sizeof(embryo_cc_path),
"%s/src/bin/embryo/embryo_cc" BIN_EXT,
PACKAGE_BUILD_DIR);
snprintf(inc_path, sizeof(inc_path),
"%s/data/edje/include", PACKAGE_BUILD_DIR);
if (!ecore_file_exists(embryo_cc_path))
embryo_cc_path[0] = '\0';
}
if (embryo_cc_path[0] == '\0')
{
snprintf(embryo_cc_path, sizeof(embryo_cc_path),
"%s/embryo_cc" BIN_EXT,
eina_prefix_bin_get(pfx));
snprintf(inc_path, sizeof(inc_path),
"%s/include",
eina_prefix_data_get(pfx));
}
#undef BIN_EXT
for (i = 0, l = codes; l; l = eina_list_next(l), i++)
{
Code *cd = eina_list_data_get(l);
@ -1327,9 +1356,7 @@ data_write_scripts(Eet_File *ef)
}
create_script_file(ef, sc->tmpn, cd, sc->tmpn_fd);
snprintf(buf, sizeof(buf),
"%s/embryo_cc -i %s/include -o %s %s",
eina_prefix_bin_get(pfx),
eina_prefix_data_get(pfx),
"%s -i %s -o %s %s", embryo_cc_path, inc_path,
sc->tmpo, sc->tmpn);
pending_threads++;
sc->exe = ecore_exe_run(buf, sc);
@ -1340,7 +1367,7 @@ data_write_scripts(Eet_File *ef)
#ifdef LUA_BINARY
static int
_edje_lua_script_writer(lua_State *L __UNUSED__, const void *chunk_buf, size_t chunk_size, void *_data)
_edje_lua_script_writer(lua_State *L EINA_UNUSED, const void *chunk_buf, size_t chunk_size, void *_data)
{
Script_Lua_Writer *data;
void *old;
@ -1387,7 +1414,7 @@ _edje_lua_error_and_abort(lua_State *L, int err_code, Script_Write *sc)
}
static void
data_thread_lua_script(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_lua_script(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Script_Write *sc = data;
char buf[PATH_MAX];
@ -1483,7 +1510,7 @@ data_thread_lua_script(void *data, Ecore_Thread *thread __UNUSED__)
}
static void
data_thread_lua_script_end(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_lua_script_end(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Script_Write *sc = data;
pending_threads--;
@ -1529,28 +1556,28 @@ data_write_lua_scripts(Eet_File *ef)
}
static void
data_thread_source(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_source(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Eet_File *ef = data;
source_append(ef);
}
static void
data_thread_source_end(void *data __UNUSED__, Ecore_Thread *thread __UNUSED__)
data_thread_source_end(void *data EINA_UNUSED, Ecore_Thread *thread EINA_UNUSED)
{
pending_threads--;
if (pending_threads <= 0) ecore_main_loop_quit();
}
static void
data_thread_fontmap(void *data, Ecore_Thread *thread __UNUSED__)
data_thread_fontmap(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Eet_File *ef = data;
source_fontmap_save(ef, fonts);
}
static void
data_thread_fontmap_end(void *data __UNUSED__, Ecore_Thread *thread __UNUSED__)
data_thread_fontmap_end(void *data EINA_UNUSED, Ecore_Thread *thread EINA_UNUSED)
{
pending_threads--;
if (pending_threads <= 0) ecore_main_loop_quit();
@ -2521,12 +2548,12 @@ _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int
code_lookups = eina_list_append(code_lookups, cl);
}
static void
_data_queue_group_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr __UNUSED__, int len __UNUSED__)
_data_queue_group_lookup(Edje_Part_Collection *pc EINA_UNUSED, char *name, char *ptr EINA_UNUSED, int len EINA_UNUSED)
{
data_queue_group_lookup(name, NULL);
}
static void
_data_queue_image_pc_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr, int len)
_data_queue_image_pc_lookup(Edje_Part_Collection *pc EINA_UNUSED, char *name, char *ptr, int len)
{
Code_Lookup *cl;

View File

@ -823,8 +823,19 @@ compile(void)
/*
* Run the input through the C pre-processor.
*/
snprintf(buf2, sizeof(buf2), "%s/edje/utils/epp" EPP_EXT,
eina_prefix_lib_get(pfx));
buf2[0] = '\0';
if (getenv("EFL_RUN_IN_TREE"))
{
snprintf(buf2, sizeof(buf2), "%s/src/bin/edje/epp/epp" EPP_EXT,
PACKAGE_BUILD_DIR);
if (!ecore_file_exists(buf2))
buf2[0] = '\0';
}
if (buf2[0] == '\0')
snprintf(buf2, sizeof(buf2), "%s/edje/utils/epp" EPP_EXT,
eina_prefix_lib_get(pfx));
if (ecore_file_exists(buf2))
{
if (anotate)

View File

@ -45,7 +45,7 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
const char *fnc,
int line,
const char *fmt,
__UNUSED__ void *data,
EINA_UNUSED void *data,
va_list args)
{
if ((d->name) && (d->namelen == sizeof("edje_decc") - 1) &&

View File

@ -12,7 +12,7 @@
# endif
Edje_Sound_Encode *
_edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double quality __UNUSED__)
_edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double quality EINA_UNUSED)
{
SF_INFO sfinfo;
SNDFILE* sfile;

View File

@ -440,14 +440,14 @@ _slave_mode_info(Evas_Object *edje, char *args)
}
static void
_slave_mode_quit(Evas_Object *edje __UNUSED__, char *args __UNUSED__)
_slave_mode_quit(Evas_Object *edje EINA_UNUSED, char *args EINA_UNUSED)
{
puts("Bye!");
ecore_main_loop_quit();
}
static void
_slave_mode_help(Evas_Object *edje __UNUSED__, char *args __UNUSED__)
_slave_mode_help(Evas_Object *edje EINA_UNUSED, char *args EINA_UNUSED)
{
puts("Help:\n"
"One command per line, arguments separated by space.\n"
@ -571,13 +571,13 @@ _slave_mode(void *data, Ecore_Fd_Handler *fd_handler)
}
static void
_print_signal(void *data __UNUSED__, Evas_Object *o __UNUSED__, const char *emission, const char *source)
_print_signal(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, const char *emission, const char *source)
{
printf("SIGNAL: \"%s\" \"%s\"\n", emission, source);
}
static void
_print_message(void *data __UNUSED__, Evas_Object *edje __UNUSED__, Edje_Message_Type type, int id, void *msg)
_print_message(void *data EINA_UNUSED, Evas_Object *edje EINA_UNUSED, Edje_Message_Type type, int id, void *msg)
{
const char *typestr;
char buf[64];
@ -711,7 +711,7 @@ _print_message(void *data __UNUSED__, Evas_Object *edje __UNUSED__, Edje_Message
}
static void
_reset_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *stack, void *event_info __UNUSED__)
_reset_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *stack, void *event_info EINA_UNUSED)
{
Evas_Coord minw, minh;
Evas_Object *edje = data;
@ -724,7 +724,7 @@ _reset_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *stack, void *even
}
static void
_key_down(void *data, Evas *e __UNUSED__, Evas_Object *stack __UNUSED__, void *event_info)
_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *stack EINA_UNUSED, void *event_info)
{
Evas_Event_Key_Down *ev = event_info;
struct opts *opts = data;
@ -778,7 +778,7 @@ _create_bg(Evas *evas, const struct opts *opts)
}
static void
_edje_reload(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
_edje_reload(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
{
const char *file;
const char *group;
@ -877,7 +877,7 @@ _create_edje(Evas *evas, const struct opts *opts)
return edje;
}
static unsigned char _parse_color(__UNUSED__ const Ecore_Getopt *parser, __UNUSED__ const Ecore_Getopt_Desc *desc, const char *str, __UNUSED__ void *data, Ecore_Getopt_Value *storage)
static unsigned char _parse_color(EINA_UNUSED const Ecore_Getopt *parser, EINA_UNUSED const Ecore_Getopt_Desc *desc, const char *str, EINA_UNUSED void *data, Ecore_Getopt_Value *storage)
{
unsigned char *color = (unsigned char *)storage->ptrp;
@ -890,7 +890,7 @@ static unsigned char _parse_color(__UNUSED__ const Ecore_Getopt *parser, __UNUSE
return 1;
}
static void _cb_delete(__UNUSED__ Ecore_Evas *ee)
static void _cb_delete(EINA_UNUSED Ecore_Evas *ee)
{
ecore_main_loop_quit();
}

View File

@ -64,7 +64,7 @@ read_watch_file(const char *file)
}
Eina_Bool
rebuild(void *data __UNUSED__)
rebuild(void *data EINA_UNUSED)
{
double start, end;
int ret;
@ -85,7 +85,7 @@ rebuild(void *data __UNUSED__)
}
Eina_Bool
some_change(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
some_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
{
if (timeout) ecore_timer_del(timeout);
timeout = ecore_timer_add(0.5, rebuild, NULL);

View File

@ -27,6 +27,7 @@
# include <config.h>
#endif
#include <Eina.h>
#include <stdio.h>
#include <stdlib.h>
@ -77,7 +78,7 @@ cpp_print_containing_files(cpp_reader * pfile)
}
void
cpp_file_line_for_message(cpp_reader * pfile __UNUSED__, const char *filename,
cpp_file_line_for_message(cpp_reader * pfile EINA_UNUSED, const char *filename,
int line, int column)
{
if (column > 0)

View File

@ -36,6 +36,8 @@
# include <locale.h>
#endif
#include <Eina.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@ -620,7 +622,7 @@ left_shift(cpp_reader * pfile, long a, int unsignedp, unsigned long b)
}
static long
right_shift(cpp_reader * pfile __UNUSED__, long a, int unsignedp,
right_shift(cpp_reader * pfile EINA_UNUSED, long a, int unsignedp,
unsigned long b)
{
if (b >= HOST_BITS_PER_LONG)

View File

@ -27,6 +27,7 @@
# include <config.h>
#endif
#include <Eina.h>
#include <string.h>
#include <stdlib.h>
@ -186,7 +187,7 @@ install(const char *name, int len, enum node_type type, int ivalue, char *value,
}
void
cpp_hash_cleanup(cpp_reader * pfile __UNUSED__)
cpp_hash_cleanup(cpp_reader * pfile EINA_UNUSED)
{
int i;

View File

@ -27,19 +27,7 @@
# include <config.h>
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
void *alloca (size_t);
#endif
#include <Eina.h>
#ifdef __EMX__
#include <strings.h>
@ -862,19 +850,19 @@ init_parse_options(struct cpp_options *opts)
}
static enum cpp_token
null_underflow(cpp_reader * pfile __UNUSED__)
null_underflow(cpp_reader * pfile EINA_UNUSED)
{
return CPP_EOF;
}
static int
null_cleanup(cpp_buffer * pbuf __UNUSED__, cpp_reader * pfile __UNUSED__)
null_cleanup(cpp_buffer * pbuf EINA_UNUSED, cpp_reader * pfile EINA_UNUSED)
{
return 0;
}
static int
macro_cleanup(cpp_buffer * pbuf, cpp_reader * pfile __UNUSED__)
macro_cleanup(cpp_buffer * pbuf, cpp_reader * pfile EINA_UNUSED)
{
HASHNODE *macro = (HASHNODE *) pbuf->data;
@ -886,7 +874,7 @@ macro_cleanup(cpp_buffer * pbuf, cpp_reader * pfile __UNUSED__)
}
static int
file_cleanup(cpp_buffer * pbuf, cpp_reader * pfile __UNUSED__)
file_cleanup(cpp_buffer * pbuf, cpp_reader * pfile EINA_UNUSED)
{
if (pbuf->buf)
{
@ -3169,7 +3157,7 @@ get_directive_token(cpp_reader * pfile)
static int
do_include(cpp_reader * pfile, struct directive *keyword,
unsigned char *unused1 __UNUSED__, unsigned char *unused2 __UNUSED__)
unsigned char *unused1 EINA_UNUSED, unsigned char *unused2 EINA_UNUSED)
{
int importing = (keyword->type == T_IMPORT);
int skip_dirs = (keyword->type == T_INCLUDE_NEXT);
@ -3727,8 +3715,8 @@ convert_string(cpp_reader * pfile, char *result, char *in, char *limit,
#define FNAME_HASHSIZE 37
static int
do_line(cpp_reader * pfile, struct directive *keyword __UNUSED__,
unsigned char *unused1 __UNUSED__, unsigned char *unused2 __UNUSED__)
do_line(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *unused1 EINA_UNUSED, unsigned char *unused2 EINA_UNUSED)
{
cpp_buffer *ip = CPP_BUFFER(pfile);
int new_lineno;
@ -3892,7 +3880,7 @@ do_undef(cpp_reader * pfile, struct directive *keyword, unsigned char *buf,
*/
static int
do_error(cpp_reader * pfile, struct directive *keyword __UNUSED__,
do_error(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf, unsigned char *limit)
{
int length = limit - buf;
@ -3912,7 +3900,7 @@ do_error(cpp_reader * pfile, struct directive *keyword __UNUSED__,
*/
static int
do_warning(cpp_reader * pfile, struct directive *keyword __UNUSED__,
do_warning(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf, unsigned char *limit)
{
int length = limit - buf;
@ -3957,8 +3945,8 @@ do_once(cpp_reader * pfile)
/* #ident has already been copied to the output file, so just ignore it. */
static int
do_ident(cpp_reader * pfile, struct directive *keyword __UNUSED__,
unsigned char *buf __UNUSED__, unsigned char *limit __UNUSED__)
do_ident(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf EINA_UNUSED, unsigned char *limit EINA_UNUSED)
{
/* long old_written = CPP_WRITTEN (pfile); */
@ -3975,8 +3963,8 @@ do_ident(cpp_reader * pfile, struct directive *keyword __UNUSED__,
* Just check for some recognized pragmas that need validation here. */
static int
do_pragma(cpp_reader * pfile, struct directive *keyword __UNUSED__,
unsigned char *buf, unsigned char *limit __UNUSED__)
do_pragma(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf, unsigned char *limit EINA_UNUSED)
{
while (*buf == ' ' || *buf == '\t')
buf++;
@ -4034,7 +4022,7 @@ do_pragma(cpp_reader * pfile, struct directive *keyword __UNUSED__,
*/
static int
do_if(cpp_reader * pfile, struct directive *keyword __UNUSED__,
do_if(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf, unsigned char *limit)
{
HOST_WIDE_INT value = eval_if_expression(pfile, buf, limit - buf);
@ -4049,7 +4037,7 @@ do_if(cpp_reader * pfile, struct directive *keyword __UNUSED__,
*/
static int
do_elif(cpp_reader * pfile, struct directive *keyword __UNUSED__,
do_elif(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf, unsigned char *limit)
{
if (pfile->if_stack == CPP_BUFFER(pfile)->if_stack)
@ -4094,8 +4082,8 @@ do_elif(cpp_reader * pfile, struct directive *keyword __UNUSED__,
* then parse the result as a C expression and return the value as an int.
*/
static HOST_WIDE_INT
eval_if_expression(cpp_reader * pfile, unsigned char *buf __UNUSED__,
int length __UNUSED__)
eval_if_expression(cpp_reader * pfile, unsigned char *buf EINA_UNUSED,
int length EINA_UNUSED)
{
HASHNODE *save_defined;
HOST_WIDE_INT value;
@ -4121,7 +4109,7 @@ eval_if_expression(cpp_reader * pfile, unsigned char *buf __UNUSED__,
static int
do_xifdef(cpp_reader * pfile, struct directive *keyword,
unsigned char *unused1 __UNUSED__, unsigned char *unused2 __UNUSED__)
unsigned char *unused1 EINA_UNUSED, unsigned char *unused2 EINA_UNUSED)
{
int skip;
cpp_buffer *ip = CPP_BUFFER(pfile);
@ -4376,8 +4364,8 @@ skip_if_group(cpp_reader * pfile, int any)
*/
static int
do_else(cpp_reader * pfile, struct directive *keyword __UNUSED__,
unsigned char *buf __UNUSED__, unsigned char *limit __UNUSED__)
do_else(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf EINA_UNUSED, unsigned char *limit EINA_UNUSED)
{
cpp_buffer *ip = CPP_BUFFER(pfile);
@ -4422,8 +4410,8 @@ do_else(cpp_reader * pfile, struct directive *keyword __UNUSED__,
*/
static int
do_endif(cpp_reader * pfile, struct directive *keyword __UNUSED__,
unsigned char *buf __UNUSED__, unsigned char *limit __UNUSED__)
do_endif(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf EINA_UNUSED, unsigned char *limit EINA_UNUSED)
{
if (CPP_PEDANTIC(pfile))
validate_else(pfile, "#endif");
@ -5523,8 +5511,8 @@ open_include_file(cpp_reader * pfile, char *filename,
#else
static int
open_include_file(cpp_reader * pfile __UNUSED__, char *filename,
file_name_list * searchptr __UNUSED__)
open_include_file(cpp_reader * pfile EINA_UNUSED, char *filename,
file_name_list * searchptr EINA_UNUSED)
{
using_file(filename, 'E');
return open(filename, O_RDONLY | O_BINARY, 0666);
@ -6753,8 +6741,8 @@ cpp_finish(cpp_reader * pfile)
}
static int
do_assert(cpp_reader * pfile, struct directive *keyword __UNUSED__,
unsigned char *buf __UNUSED__, unsigned char *limit __UNUSED__)
do_assert(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf EINA_UNUSED, unsigned char *limit EINA_UNUSED)
{
long symstart; /* remember where symbol name starts */
int c;
@ -6827,8 +6815,8 @@ do_assert(cpp_reader * pfile, struct directive *keyword __UNUSED__,
}
static int
do_unassert(cpp_reader * pfile, struct directive *keyword __UNUSED__,
unsigned char *buf __UNUSED__, unsigned char *limit __UNUSED__)
do_unassert(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
unsigned char *buf EINA_UNUSED, unsigned char *limit EINA_UNUSED)
{
long symstart; /* remember where symbol name starts */
int sym_length; /* and how long it is */

View File

@ -33,6 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@ -581,8 +582,19 @@ parseoptions(int argc, char **argv, char *iname, char *oname,
int i, stack_size;
size_t len;
str[0] = '\0';
if (getenv("EFL_RUN_IN_TREE"))
{
struct stat st;
snprintf(str, sizeof(str), "%s/data/embryo/", PACKAGE_BUILD_DIR);
if (stat(str, &st) != 0)
str[0] = '\0';
}
if (str[0] == '\0')
snprintf(str, sizeof(str), "%s/include/", e_prefix_data_get());
/* use embryo include dir always */
snprintf(str, sizeof(str), "%s/include/", e_prefix_data_get());
insert_path(str);
insert_path("./");

View File

@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = eina eo eet evas ecore eio edbus ephysics
SUBDIRS = eina eo eet evas ecore eio edbus ephysics edje
examples:
@$(MAKE) $(AM_MAKEFLAGS) -C eina examples
@ -11,6 +11,7 @@ examples:
@$(MAKE) $(AM_MAKEFLAGS) -C eio examples
@$(MAKE) $(AM_MAKEFLAGS) -C edbus examples
@$(MAKE) $(AM_MAKEFLAGS) -C ephysics examples
@$(MAKE) $(AM_MAKEFLAGS) -C edje examples
install-examples:
@$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
@ -21,3 +22,4 @@ install-examples:
@$(MAKE) $(AM_MAKEFLAGS) -C eio install-examples
@$(MAKE) $(AM_MAKEFLAGS) -C edbus install-examples
@$(MAKE) $(AM_MAKEFLAGS) -C ephysics install-examples
@$(MAKE) $(AM_MAKEFLAGS) -C edje install-examples

View File

@ -0,0 +1,198 @@
MAINTAINERCLEANFILES = Makefile.in
EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
EDJE_CC_FLAGS_VERBOSE_0 =
EDJE_CC_FLAGS_VERBOSE_1 = -v
EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir)
AM_V_EDJ = $(am__v_EDJ_$(V))
am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
am__v_EDJ_0 = @echo " EDJ " $@;
EDJE_CODEGEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_codegen
EDJE_CODEGEN_FLAGS = --prefix=codegen_example
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
examplesdir = $(datadir)/edje/examples
if ENABLE_MULTISENSE
SND_DIR = -sd $(srcdir)
endif
#put here all EDCs one needs to the examples
EDCS = \
animations2.edc \
animations.edc \
basic2.edc \
basic.edc \
box.edc \
codegen.edc \
color-class.edc \
drag.edc \
edje_example.edc \
edje-nested.edc \
embryo_custom_state.edc \
embryo_pong.edc \
embryo_run_program.edc \
embryo_set_state.edc \
embryo_set_text.edc \
embryo_timer.edc \
external_elm_anchorblock.edc \
external_elm_button.edc \
external_elm_check.edc \
external_elm_panes.edc \
external_emotion_elm.edc \
lua_script.edc \
messages_echo.edc \
perspective.edc \
signalsBubble.edc \
signals-messages.edc \
sigtest.edc \
swallow.edc \
table.edc \
text.edc \
toggle_using_filter.edc
if ENABLE_MULTISENSE
EDCS += multisense.edc
endif
if HAVE_EPHYSICS
EDCS += \
physics_3d.edc \
physics_actions.edc \
physics_backcull.edc \
physics_basic.edc \
physics_complex.edc \
physics_soft_bodies.edc
endif
.edc.edj:
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
EDJS = $(EDCS:%.edc=%.edj)
filesdir = $(datadir)/edje/examples
files_DATA = \
$(EDCS) \
bubble.png \
bubble-blue.png \
red.png \
test.png \
Vera.ttf \
duck.wav \
edje-codegen-example.c \
edje_example.c \
edje-basic.c \
edje-swallow.c \
edje-text.c \
edje-table.c \
edje-box.c \
edje-box2.c \
edje-drag.c \
edje-signals-messages.c \
edje-color-class.c \
edje-perspective.c \
edje-animations.c \
sigtest.c \
animations2.c \
edje-basic2.c \
signals2.c \
edje-swallow2.c
if ENABLE_MULTISENSE
files_DATA += edje-multisense.c
endif
EXTRA_DIST = $(files_DATA)
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eo \
-I$(top_srcdir)/src/lib/eet \
-I$(top_builddir)/src/lib/eet \
-I$(top_srcdir)/src/lib/evas \
-I$(top_builddir)/src/lib/evas \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_builddir)/src/lib/ecore_evas \
-I$(top_srcdir)/src/lib/ecore_file \
-I$(top_builddir)/src/lib/ecore_file \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_builddir)/src/lib/ecore_input \
-I$(top_srcdir)/src/lib/ecore_imf \
-I$(top_builddir)/src/lib/ecore_imf \
-I$(top_srcdir)/src/lib/embryo \
-I$(top_builddir)/src/lib/embryo \
-I$(top_srcdir)/src/lib/edje \
-I$(top_srcdir)/src/lib/edje/include \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
@EDJE_CFLAGS@
codegen_example_generated.c codegen_example_generated.h: codegen.edj
$(AM_V_GEN)$(EDJE_CODEGEN) $(EDJE_CODEGEN_FLAGS) codegen.edj example_group $(builddir)/codegen_example_generated.c $(builddir)/codegen_example_generated.h
BUILT_SOURCES = codegen_example_generated.c codegen_example_generated.h
edje_codegen_example_SOURCES = \
edje-codegen-example.c
nodist_edje_codegen_example_SOURCES = \
codegen_example_generated.c \
codegen_example_generated.h
files_DATA += $(EDJS)
examples_PROGRAMS = \
edje-animations \
edje-basic \
edje-box \
edje-box2 \
edje-codegen-example \
edje-color-class \
edje-drag\
edje-perspective \
edje-signals-messages \
edje-swallow \
edje-table \
edje-text \
sigtest \
animations2 \
edje-basic2 \
signals2 \
edje-swallow2
if ENABLE_MULTISENSE
examples_PROGRAMS += edje-multisense
endif
LDADD = \
$(top_builddir)/src/lib/eina/libeina.la \
$(top_builddir)/src/lib/eo/libeo.la \
$(top_builddir)/src/lib/eet/libeet.la \
$(top_builddir)/src/lib/evas/libevas.la \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
$(top_builddir)/src/lib/ecore_file/libecore_file.la \
$(top_builddir)/src/lib/ecore_input/libecore_input.la \
$(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
$(top_builddir)/src/lib/ecore_imf/libecore_imf_evas.la \
$(top_builddir)/src/lib/embryo/libembryo.la \
$(top_builddir)/src/lib/edje/libedje.la \
@EDJE_LDFLAGS@
if HAVE_EPHYSICS
LDADD += $(top_builddir)/src/lib/ephysics/libephysics.la
endif
clean-local:
rm -f *.edj

View File

@ -2,7 +2,7 @@
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#define EINA_UNUSED
#endif
#include <Ecore.h>
@ -20,7 +20,7 @@ _on_delete(Ecore_Evas *ee)
}
int
main(int argc __UNUSED__, char **argv)
main(int argc EINA_UNUSED, char **argv)
{
char edje_file_path[PATH_MAX];
const char *edje_file = "animations2.edj";

View File

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

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