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

eolian gen: imply -gT if -o T:f is specified 

If you specify type-explicit output filename, this automatically
adds it so that it's generated even without specifying -gT.

This is meant to help user friendliness. Also add a note about
this to help listing.
This commit is contained in:
Daniel Kolesa 2017-01-27 17:11:43 +01:00
parent 2aeccd16f3
commit f84e7ddc70
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/eolian/main.c
View File

@ -52,7 +52,11 @@ _print_usage(const char *progn, FILE *outf)
"\n" "\n"
"By default, the 'hc' set is used ('h' for .eot files).\n" "By default, the 'hc' set is used ('h' for .eot files).\n"
"Output filenames are determined from input .eo filename.\n" "Output filenames are determined from input .eo filename.\n"
"Default filenames include input extension. (e.g. \".eo.c\")\n"); "Default filenames include input extension. (e.g. \".eo.c\")\n"
"Default output path is where the input file is.\n\n"
"Also, specifying a type-dependent input file automatically\n"
"adds it to generated files, so if you specify those, you\n"
"don't need to explicitly specify -g for those types anymore.\n");
} }
static void static void
@ -62,25 +66,30 @@ _print_version(FILE *outf)
} }
static Eina_Bool static Eina_Bool
_try_set_out(char t, char **outs, const char *val) _try_set_out(char t, char **outs, const char *val, int *what)
{ {
int pos = -1; int pos = -1;
switch (t) switch (t)
{ {
case 'h': case 'h':
pos = _get_bit_pos(GEN_H); pos = _get_bit_pos(GEN_H);
*what |= GEN_H;
break; break;
case 'l': case 'l':
pos = _get_bit_pos(GEN_H_LEGACY); pos = _get_bit_pos(GEN_H_LEGACY);
*what |= GEN_H_LEGACY;
break; break;
case 's': case 's':
pos = _get_bit_pos(GEN_H_STUB); pos = _get_bit_pos(GEN_H_STUB);
*what |= GEN_H_STUB;
break; break;
case 'c': case 'c':
pos = _get_bit_pos(GEN_C); pos = _get_bit_pos(GEN_C);
*what |= GEN_C;
break; break;
case 'i': case 'i':
pos = _get_bit_pos(GEN_C_IMPL); pos = _get_bit_pos(GEN_C_IMPL);
*what |= GEN_C_IMPL;
break; break;
} }
if (pos < 0) if (pos < 0)
@ -437,7 +446,8 @@ main(int argc, char **argv)
{ {
const char *abeg = optarg; const char *abeg = optarg;
const char *cpos = strchr(abeg, ':'); const char *cpos = strchr(abeg, ':');
if (((cpos - abeg) != 1) || !_try_set_out(*abeg, outs, cpos + 1)) if (((cpos - abeg) != 1) ||
!_try_set_out(*abeg, outs, cpos + 1, &gen_what))
{ {
char *oa = strdup(abeg); char *oa = strdup(abeg);
oa[cpos - abeg] = '\0'; oa[cpos - abeg] = '\0';