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

edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files

This commit is contained in:
Boris Faure 2013-08-29 15:11:12 +02:00
parent 42a46214c4
commit 18ee1e1789
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-08-29 Boris Faure
* Edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
2013-08-29 Cedric Bail 2013-08-29 Cedric Bail
* Evas: add interceptor for focus_set. * Evas: add interceptor for focus_set.

20
src/bin/edje/edje_cc_parse.c
View File

@ -843,23 +843,31 @@ compile(void)
buf2[0] = '\0'; buf2[0] = '\0';
if (getenv("EFL_RUN_IN_TREE")) if (getenv("EFL_RUN_IN_TREE"))
{ {
snprintf(buf2, sizeof(buf2), "%s/src/bin/edje/epp/epp" EPP_EXT, snprintf(buf2, sizeof(buf2),
"%s/src/bin/edje/epp/epp" EPP_EXT,
PACKAGE_BUILD_DIR); PACKAGE_BUILD_DIR);
if (!ecore_file_exists(buf2)) if (!ecore_file_exists(buf2))
buf2[0] = '\0'; buf2[0] = '\0';
} }
if (buf2[0] == '\0') if (buf2[0] == '\0')
snprintf(buf2, sizeof(buf2), "%s/edje/utils/" MODULE_ARCH "/epp" EPP_EXT, snprintf(buf2, sizeof(buf2),
"%s/edje/utils/" MODULE_ARCH "/epp" EPP_EXT,
eina_prefix_lib_get(pfx)); eina_prefix_lib_get(pfx));
if (ecore_file_exists(buf2)) if (ecore_file_exists(buf2))
{ {
if (anotate) if (anotate)
snprintf(buf, sizeof(buf), "%s -anotate -a %s %s -I%s %s -o %s", snprintf(buf, sizeof(buf), "%s -anotate -a %s %s -I%s %s -o %s"
buf2, watchfile ? watchfile : "/dev/null", file_in, inc, def, tmpn); " -DEINA_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
buf2, watchfile ? watchfile : "/dev/null", file_in,
inc, def, tmpn,
EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
else else
snprintf(buf, sizeof(buf), "%s -a %s %s -I%s %s -o %s", snprintf(buf, sizeof(buf), "%s -a %s %s -I%s %s -o %s"
buf2, watchfile ? watchfile : "/dev/null", file_in, inc, def, tmpn); " -DEINA_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
buf2, watchfile ? watchfile : "/dev/null", file_in,
inc, def, tmpn,
EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
ret = system(buf); ret = system(buf);
} }
else else