kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje_cc: temporarily disable aborting compile when namespace validation fails 

Summary:
there are far too many issues here for me to fix them all, the authors of
these failures should be responsible for helping to clean this up

revert this patch once all issues are resolved

ref T6966
Depends on D6042

Reviewers: cedric, Hermet, stephenmhouston, devilhorns

Reviewed By: stephenmhouston

Subscribers: #committers

Tags: #efl

Maniphest Tasks: T6966

Differential Revision: https://phab.enlightenment.org/D6215
This commit is contained in:
Mike Blumenkrantz 2018-06-15 12:27:19 -05:00 committed by Stephen 'Okra' Houston
parent ddd2da2ae5
commit 0dc492087e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/edje/edje_cc_out.c
View File

@ -245,6 +245,17 @@ static int cur_image_entry;
static void data_write_images(void);
static void
print_error(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
eina_log_vprint(_edje_cc_log_dom, EINA_LOG_LEVEL_CRITICAL,
"unknown", "unknown", 0, fmt, ap);
va_end(ap);
}
void
error_and_abort(Eet_File *ef EINA_UNUSED, const char *fmt, ...)
{
@ -589,7 +600,7 @@ check_state(Edje_Part_Collection *pc, Edje_Part *ep, Edje_Part_Description_Commo
}
static void
_part_namespace_verify(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef, Eina_Bool ns_required)
_part_namespace_verify(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef EINA_UNUSED, Eina_Bool ns_required)
{
char buf[1024], *p;
size_t len;
@ -614,7 +625,7 @@ _part_namespace_verify(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef, Ei
if ((!ns_required) && (!p)) return;
if (strncmp(ep->name, buf, len))
error_and_abort(ef, "Part '%s' from group %s is not properly namespaced (should begin with '%s.')!", ep->name, de->entry, buf);
print_error("Part '%s' from group %s is not properly namespaced (should begin with '%s.')!", ep->name, de->entry, buf);
}
static void
@ -676,7 +687,7 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef)
}
static void
_program_signal_namespace_verify(Edje_Part_Collection *pc, Eet_File *ef, const char *sig, const char *src)
_program_signal_namespace_verify(Edje_Part_Collection *pc, Eet_File *ef EINA_UNUSED, const char *sig, const char *src)
{
char buf[1024], *p;
size_t len;
@ -699,7 +710,7 @@ _program_signal_namespace_verify(Edje_Part_Collection *pc, Eet_File *ef, const c
if (eina_strlcpy(buf, de->entry, len + 1) >= sizeof(buf)) return;
if (strncmp(sig, buf, len))
error_and_abort(ef, "SIGNAL_EMIT (%s:%s) does not match group namespace (%s)!", sig, src, de->entry);
print_error("SIGNAL_EMIT (%s:%s) does not match group namespace (%s)!", sig, src, de->entry);
}
static void