enlightenment
/
efl
7
7
Fork 11
Code Issues 14 Pull Requests 9 Projects Releases Wiki Activity

* edje: only link edje_convert with eina and eet.

Browse Source 
SVN revision: 51051
devs/devilhorns/wayland_egl
Cedric BAIL 14 years ago
parent 2ecda40ecd
commit 74fe3f6247
5 changed files with 79 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      legacy/edje/configure.ac
  2. 4
      legacy/edje/src/bin/Makefile.am
  3. 91
      legacy/edje/src/lib/edje_data.c
  4. 41
      legacy/edje/src/lib/edje_private.h
  5. 25
      legacy/edje/src/lib/edje_util.c

6
legacy/edje/configure.ac
Unescape View File

@ -244,6 +244,12 @@ if test "x${have_lua}" = "xno" ; then
AC_MSG_ERROR([Cannot find lua library. Be sure that you have installed it and set CFLAGS and LDFLAGS correctly])
fi
PKG_CHECK_MODULES([MINIMAL],
[
eina-0
eet >= 1.2.3
])
PKG_CHECK_MODULES([EDJE],
[
eina-0

4
legacy/edje/src/bin/Makefile.am
Unescape View File

@ -46,8 +46,8 @@ edje_player_SOURCES = edje_player.c
edje_player_LDADD = $(top_builddir)/src/lib/libedje.la $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
edje_player_LDFLAGS = @lt_enable_auto_import@
edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c
edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS)
edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c ../lib/edje_data.c
edje_convert_LDADD = $(EVIL_LIBS) @MINIMAL_LIBS@ -lm
edje_convert_LDFLAGS = @lt_enable_auto_import@
EXTRA_DIST = @EDJE_RECC_PRG@ edje_prefix.h edje_cc.h edje_convert.h

91
legacy/edje/src/lib/edje_data.c
Unescape View File

@ -1,50 +1,51 @@
#include "edje_private.h"
EAPI Eet_Data_Descriptor *_edje_edd_edje_file = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_string = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_style = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_style_tag = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_color_class = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_external_directory = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_external_directory_entry = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_font_directory_entry = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_image_directory = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_image_directory_entry = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_image_directory_set = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_image_directory_set_entry = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_program = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_program_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_program_target = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_program_after = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory_entry = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_pack_element = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_pack_element_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_collection = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_variant = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_rectangle = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_swallow = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_group = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_image = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_text = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_textblock = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_box = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_table = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_external = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_variant_list = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_rectangle_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_swallow_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_group_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_image_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_text_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_textblock_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_box_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_table_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description_external_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_image_id = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_part_image_id_pointer = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_external_param = NULL;
Eet_Data_Descriptor *_edje_edd_edje_string = NULL;
Eet_Data_Descriptor *_edje_edd_edje_style = NULL;
Eet_Data_Descriptor *_edje_edd_edje_style_tag = NULL;
Eet_Data_Descriptor *_edje_edd_edje_color_class = NULL;
Eet_Data_Descriptor *_edje_edd_edje_external_directory = NULL;
Eet_Data_Descriptor *_edje_edd_edje_external_directory_entry = NULL;
Eet_Data_Descriptor *_edje_edd_edje_font_directory_entry = NULL;
Eet_Data_Descriptor *_edje_edd_edje_image_directory = NULL;
Eet_Data_Descriptor *_edje_edd_edje_image_directory_entry = NULL;
Eet_Data_Descriptor *_edje_edd_edje_image_directory_set = NULL;
Eet_Data_Descriptor *_edje_edd_edje_image_directory_set_entry = NULL;
Eet_Data_Descriptor *_edje_edd_edje_program = NULL;
Eet_Data_Descriptor *_edje_edd_edje_program_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_program_target = NULL;
Eet_Data_Descriptor *_edje_edd_edje_program_after = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory_entry = NULL;
Eet_Data_Descriptor *_edje_edd_edje_pack_element = NULL;
Eet_Data_Descriptor *_edje_edd_edje_pack_element_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_variant = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_rectangle = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_swallow = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_group = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_image = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_text = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_textblock = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_box = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_table = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_external = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_variant_list = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_rectangle_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_swallow_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_group_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_image_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_text_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_textblock_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_box_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_table_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_description_external_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_image_id = NULL;
Eet_Data_Descriptor *_edje_edd_edje_part_image_id_pointer = NULL;
Eet_Data_Descriptor *_edje_edd_edje_external_param = NULL;
#define EMP(Type, Minus) \
Eina_Mempool *_emp_##Type = NULL; \
@ -147,7 +148,7 @@ _edje_eina_hash_add_alloc(Eina_Hash *hash,
return hash;
}
EAPI void
void
_edje_edd_shutdown(void)
{
FREED(_edje_edd_edje_file);
@ -211,7 +212,7 @@ _edje_edd_shutdown(void)
EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_##Name##_pointer, Edje_##Type##_Pointer, "pointer", pointer, _edje_edd_edje_##Name); \
}
EAPI void
void
_edje_edd_init(void)
{
Eet_Data_Descriptor_Class eddc;

41
legacy/edje/src/lib/edje_private.h
Unescape View File

@ -1347,21 +1347,7 @@ const Eina_List *edje_match_signal_source_hash_get(const char *signal,
void edje_match_signal_source_free(Edje_Signal_Source_Char *key, void *data);
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_file;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_style;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_style_tag;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_data;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_font_directory;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_font_directory_entry;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_image_directory;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_image_directory_entry;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_program;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_program_target;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory_entry;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_collection;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_description;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_image_id;
extern int _edje_anim_count;
extern Ecore_Animator *_edje_timer;
@ -1743,8 +1729,31 @@ void _edje_external_parsed_params_free(Evas_Object *obj, void *params);
EAPI void _edje_module_init();
EAPI void _edje_module_shutdown();
EAPI Eina_Bool edje_program_is_strncmp(const char *str);
EAPI Eina_Bool edje_program_is_strrncmp(const char *str);
static inline Eina_Bool
edje_program_is_strncmp(const char *str)
{
unsigned int length;
length = strlen(str);
if (strpbrk(str, "*?[\\") != str + length)
return EINA_FALSE;
if (str[length] == '['
|| str[length] == '\\')
return EINA_FALSE;
return EINA_TRUE;
}
static inline Eina_Bool
edje_program_is_strrncmp(const char *str)
{
if (*str != '*' && *str != '?')
return EINA_FALSE;
if (strpbrk(str + 1, "*?[\\") != NULL)
return EINA_FALSE;
return EINA_TRUE;
}
void edje_edit_program_insert(Edje *ed, Edje_Program *p);
void edje_edit_program_remove(Edje *ed, Edje_Program *p);

25
legacy/edje/src/lib/edje_util.c
Unescape View File

@ -4911,31 +4911,6 @@ edje_edit_program_insert(Edje *ed, Edje_Program *p)
(*array)[(*count)++] = p;
}
EAPI Eina_Bool
edje_program_is_strncmp(const char *str)
{
unsigned int length;
length = strlen(str);
if (strpbrk(str, "*?[\\") != str + length)
return EINA_FALSE;
if (str[length] == '['
|| str[length] == '\\')
return EINA_FALSE;
return EINA_TRUE;
}
EAPI Eina_Bool
edje_program_is_strrncmp(const char *str)
{
if (*str != '*' && *str != '?')
return EINA_FALSE;
if (strpbrk(str + 1, "*?[\\") != NULL)
return EINA_FALSE;
return EINA_TRUE;
}
const char *
edje_string_get(const Edje_String *es)
{

Write Preview
Loading…
Cancel
Save