summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2016-09-29 17:37:53 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2016-10-07 11:54:23 +0200
commit74934d8d0115e311dea9de789788a444e977482e (patch)
tree0ab91111d9b283827ee38593abfdcc7d2b265ea9
parent809e2ed4de22e68fe897465b38e7919b10b378c9 (diff)
eolian gen2: switch EFL to new generator (doesn't work yet)
-rw-r--r--src/Makefile_Eolian_Files_Helper.am8
-rw-r--r--src/Makefile_Eolian_Helper.am4
-rw-r--r--src/bin/eolian2/main.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile_Eolian_Files_Helper.am b/src/Makefile_Eolian_Files_Helper.am
index 1260d718c5..bf14567554 100644
--- a/src/Makefile_Eolian_Files_Helper.am
+++ b/src/Makefile_Eolian_Files_Helper.am
@@ -8,19 +8,19 @@ SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h
8%.eo.c: %.eo ${_EOLIAN_GEN_DEP} 8%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
9 $(AM_V_EOL) \ 9 $(AM_V_EOL) \
10 $(MKDIR_P) $(dir $@); \ 10 $(MKDIR_P) $(dir $@); \
11 $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o $@ $< 11 $(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:$@ $<
12 12
13%.eo.h: %.eo ${_EOLIAN_GEN_DEP} 13%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
14 $(AM_V_EOL) \ 14 $(AM_V_EOL) \
15 $(MKDIR_P) $(dir $@); \ 15 $(MKDIR_P) $(dir $@); \
16 $(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $< 16 $(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:$@ $<
17 17
18%.eot.h: %.eot ${_EOLIAN_GEN_DEP} 18%.eot.h: %.eot ${_EOLIAN_GEN_DEP}
19 $(AM_V_EOL) \ 19 $(AM_V_EOL) \
20 $(MKDIR_P) $(dir $@); \ 20 $(MKDIR_P) $(dir $@); \
21 $(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $< 21 $(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:$@ $<
22 22
23%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP} 23%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
24 $(AM_V_EOL) \ 24 $(AM_V_EOL) \
25 $(MKDIR_P) $(dir $@); \ 25 $(MKDIR_P) $(dir $@); \
26 $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $< 26 $(EOLIAN_GEN) $(EOLIAN_FLAGS) -gl -o l:$@ $<
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index ddf09e54a4..1b013ab181 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -2,8 +2,8 @@ if HAVE_EOLIAN_GEN
2EOLIAN_GEN = @eolian_gen@ 2EOLIAN_GEN = @eolian_gen@
3_EOLIAN_GEN_DEP = @eolian_gen@ 3_EOLIAN_GEN_DEP = @eolian_gen@
4else 4else
5EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT} 5EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian2/eolian_gen2${EXEEXT}
6_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT} 6_EOLIAN_GEN_DEP = bin/eolian2/eolian_gen2${EXEEXT}
7endif 7endif
8 8
9include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am 9include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am
diff --git a/src/bin/eolian2/main.c b/src/bin/eolian2/main.c
index a1cda50c1b..4452660b65 100644
--- a/src/bin/eolian2/main.c
+++ b/src/bin/eolian2/main.c
@@ -110,8 +110,8 @@ static void _fill_all_outs(char **outs, const char *val)
110static Eina_Strbuf * 110static Eina_Strbuf *
111_include_guard(const char *fname, const char *gname, Eina_Strbuf *buf) 111_include_guard(const char *fname, const char *gname, Eina_Strbuf *buf)
112{ 112{
113 if (!buf || !eina_strbuf_length_get(buf)) 113 if (!buf)
114 return buf; 114 return NULL;
115 115
116 if (!gname) 116 if (!gname)
117 gname = ""; 117 gname = "";
@@ -454,7 +454,7 @@ main(int argc, char **argv)
454 } 454 }
455 455
456 const char *ext = strrchr(input, '.'); 456 const char *ext = strrchr(input, '.');
457 if (!ext || strcmp(ext, ".eo")) 457 if (!ext || (strcmp(ext, ".eo") && strcmp(ext, ".eot")))
458 { 458 {
459 fprintf(stderr, "eolian: invalid input file '%s'\n", input); 459 fprintf(stderr, "eolian: invalid input file '%s'\n", input);
460 goto end; 460 goto end;