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

Added non-edc resource dependencies on .edc while dumping dependencies 

Summary: Added code to include non-edc resource (image, sound, video etc) path in dep file while dumping include dependencies for edc files.

Reviewers: raster, cedric, Sergeant_Whitespace

Reviewed By: cedric, Sergeant_Whitespace

Subscribers: Sergeant_Whitespace

Projects: #efl

Maniphest Tasks: T2252

Differential Revision: https://phab.enlightenment.org/D2270
This commit is contained in:
Cedric BAIL 2015-04-06 16:01:19 +02:00
parent 4b0e879591
commit ae157734ff
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/edje/edje_cc.c
View File

@ -92,7 +92,7 @@ main_help(void)
"\n"
"-w files.txt Dump all sources files path into files.txt\n"
"-anotate Anotate the dumped files.\n"
"-deps files.txt Dump gnu style include dependencies path into files.txt\n"
"-deps files.txt Dump gnu style include dependencies path into files.txt (overrides -w/-anotate)\n"
"-id image/directory Add a directory to look in for relative path images\n"
"-fd font/directory Add a directory to look in for relative path fonts\n"
"-sd sound/directory Add a directory to look in for relative path sounds samples\n"

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

@ -3578,17 +3578,29 @@ using_file(const char *filename, const char type)
{
FILE *f;
if (!watchfile) return;
f = fopen(watchfile, "ab");
if (!f) return;
if (anotate)
if (depfile)
{
fprintf(f, "%c: %s\n", type, filename);
f = fopen(depfile, "ab");
if (!f) return;
if (type != 'O')
{
fprintf(f, " \\\n %s", filename);
}
fclose(f);
}
else
else if (watchfile)
{
fputs(filename, f);
fputc('\n', f);
f = fopen(watchfile, "ab");
if (!f) return;
if (anotate)
{
fprintf(f, "%c: %s\n", type, filename);
}
else
{
fputs(filename, f);
fputc('\n', f);
}
fclose(f);
}
fclose(f);
}

1
src/bin/edje/epp/cpplib.c
View File

@ -6775,7 +6775,6 @@ cpp_finish(cpp_reader * pfile)
else if (!(deps_stream = fopen(opts->deps_file, deps_mode)))
cpp_pfatal_with_name(pfile, opts->deps_file);
fputs(pfile->deps_buffer, deps_stream);
putc('\n', deps_stream);
if (opts->deps_file)
{
if (ferror(deps_stream) || fclose(deps_stream) != 0)