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
devs/devilhorns/wayland_egl
Gustavo Sverzut Barbieri 10 years ago
parent e2ce20e9a4
commit 9ea2ce1041
  1. 6
      Makefile.am
  2. 60
      configure.ac
  3. 18
      data/Makefile.am
  4. 0
      data/edje/edc.vim
  5. 0
      data/edje/edje-mode.el
  6. 0
      data/edje/edje.xml
  7. 0
      data/edje/include/edje.inc
  8. 0
      data/edje/vim/autoload/edccomplete.vim
  9. 0
      data/edje/vim/ftdetect/edc.vim
  10. 0
      data/edje/vim/ftplugin/edc.vim
  11. 0
      data/edje/vim/indent/edc.vim
  12. 0
      data/edje/vim/plugin-info.txt
  13. 0
      data/edje/vim/snippets/edc.snippets
  14. 0
      data/edje/vim/syntax/edc.vim
  15. 0
      data/edje/vim/syntax/embryo.vim
  16. 6
      doc/Doxyfile.in
  17. 5
      doc/edje_examples.dox
  18. 0
      doc/img/basic2final.eps
  19. 0
      doc/img/basic2final.png
  20. 0
      doc/img/edje-animations.eps
  21. 0
      doc/img/edje-animations.png
  22. 0
      doc/img/edje-animations2.eps
  23. 0
      doc/img/edje-animations2.png
  24. 7202
      doc/img/edje-basics-example.eps
  25. 0
      doc/img/edje-basics-example.png
  26. 0
      doc/img/edje-box-example.eps
  27. 0
      doc/img/edje-box-example.png
  28. 0
      doc/img/edje-box2-example.eps
  29. 0
      doc/img/edje-box2-example.png
  30. 0
      doc/img/edje-color-class-example.eps
  31. 0
      doc/img/edje-color-class-example.png
  32. 0
      doc/img/edje-color-class-example2.eps
  33. 0
      doc/img/edje-color-class-example2.png
  34. 7202
      doc/img/edje-drag-example.eps
  35. 0
      doc/img/edje-drag-example.png
  36. 12094
      doc/img/edje-perspective-example.eps
  37. 0
      doc/img/edje-perspective-example.png
  38. 0
      doc/img/edje-signals-messages-example.eps
  39. 0
      doc/img/edje-signals-messages-example.png
  40. 0
      doc/img/edje-table-example.eps
  41. 0
      doc/img/edje-table-example.png
  42. 7202
      doc/img/edje-text.eps
  43. 0
      doc/img/edje-text.png
  44. 15032
      doc/img/signal2final.eps
  45. 0
      doc/img/signal2final.png
  46. 0
      doc/img/swallow2final.eps
  47. 0
      doc/img/swallow2final.png
  48. 26
      m4/efl_lua.m4
  49. 0
      old/ChangeLog.edje
  50. 0
      old/NEWS.edje
  51. 0
      old/README.edje
  52. 6
      pc/edje.pc.in
  53. 6
      src/Makefile.am
  54. 255
      src/Makefile_Edje.am
  55. 1
      src/Makefile_Embryo.am
  56. 2
      src/bin/edje/edje_cc.c
  57. 0
      src/bin/edje/edje_cc.h
  58. 9
      src/bin/edje/edje_cc_handlers.c
  59. 0
      src/bin/edje/edje_cc_mem.c
  60. 87
      src/bin/edje/edje_cc_out.c
  61. 15
      src/bin/edje/edje_cc_parse.c
  62. 0
      src/bin/edje/edje_cc_sources.c
  63. 0
      src/bin/edje/edje_codegen.c
  64. 0
      src/bin/edje/edje_convert.c
  65. 0
      src/bin/edje/edje_convert.h
  66. 0
      src/bin/edje/edje_convert_main.c
  67. 0
      src/bin/edje/edje_data_convert.c
  68. 2
      src/bin/edje/edje_decc.c
  69. 0
      src/bin/edje/edje_decc.h
  70. 0
      src/bin/edje/edje_external_inspector.c
  71. 0
      src/bin/edje/edje_inspector.c
  72. 2
      src/bin/edje/edje_multisense_convert.c
  73. 0
      src/bin/edje/edje_multisense_convert.h
  74. 0
      src/bin/edje/edje_pick.c
  75. 18
      src/bin/edje/edje_player.c
  76. 0
      src/bin/edje/edje_recc
  77. 4
      src/bin/edje/edje_watch.c
  78. 0
      src/bin/edje/epp/cppalloc.c
  79. 3
      src/bin/edje/epp/cpperror.c
  80. 4
      src/bin/edje/epp/cppexp.c
  81. 3
      src/bin/edje/epp/cpphash.c
  82. 0
      src/bin/edje/epp/cpphash.h
  83. 70
      src/bin/edje/epp/cpplib.c
  84. 0
      src/bin/edje/epp/cpplib.h
  85. 0
      src/bin/edje/epp/cppmain.c
  86. 14
      src/bin/embryo/embryo_cc_sc1.c
  87. 4
      src/examples/Makefile.am
  88. 198
      src/examples/edje/Makefile.am
  89. 0
      src/examples/edje/Vera.ttf
  90. 0
      src/examples/edje/animations.edc
  91. 4
      src/examples/edje/animations2.c
  92. 0
      src/examples/edje/animations2.edc
  93. 0
      src/examples/edje/basic.edc
  94. 0
      src/examples/edje/basic2.edc
  95. 0
      src/examples/edje/box.edc
  96. 0
      src/examples/edje/bubble-blue.png
  97. 0
      src/examples/edje/bubble.png
  98. 0
      src/examples/edje/codegen.edc
  99. 0
      src/examples/edje/color-class.edc
  100. 0
      src/examples/edje/drag.edc
  101. Some files were not shown because too many files have changed in this diff Show More

@ -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

@ -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"

@ -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

@ -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_
#---------------------------------------------------------------------------

@ -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

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

@ -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
])

@ -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@

@ -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

@ -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

@ -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@

@ -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) &&

@ -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;

@ -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;

@ -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)

@ -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) &&

@ -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;

@ -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();
}

@ -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);

@ -27,6 +27,7 @@
# include <config.h>
#endif
#include <Eina.h>
#include <stdio.h>
#include <stdlib.h>