summaryrefslogtreecommitdiff
path: root/src/bin/edje
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-06 16:01:19 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-04-06 16:37:53 +0200
commitae157734ffd686a782f7d96eb22321f34e0f38b8 (patch)
treefa2b715b9ca37a0ef5f249d79e9c02dcaa53f7c7 /src/bin/edje
parent4b0e8795919d146b66f14b64d70dbb5a2796b8b9 (diff)
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
Diffstat (limited to 'src/bin/edje')
-rw-r--r--src/bin/edje/edje_cc.c2
-rwxr-xr-xsrc/bin/edje/edje_cc_out.c30
-rw-r--r--src/bin/edje/epp/cpplib.c1
3 files changed, 22 insertions, 11 deletions
diff --git a/src/bin/edje/edje_cc.c b/src/bin/edje/edje_cc.c
index 728e5cae47..7b61271064 100644
--- a/src/bin/edje/edje_cc.c
+++ b/src/bin/edje/edje_cc.c
@@ -92,7 +92,7 @@ main_help(void)
92 "\n" 92 "\n"
93 "-w files.txt Dump all sources files path into files.txt\n" 93 "-w files.txt Dump all sources files path into files.txt\n"
94 "-anotate Anotate the dumped files.\n" 94 "-anotate Anotate the dumped files.\n"
95 "-deps files.txt Dump gnu style include dependencies path into files.txt\n" 95 "-deps files.txt Dump gnu style include dependencies path into files.txt (overrides -w/-anotate)\n"
96 "-id image/directory Add a directory to look in for relative path images\n" 96 "-id image/directory Add a directory to look in for relative path images\n"
97 "-fd font/directory Add a directory to look in for relative path fonts\n" 97 "-fd font/directory Add a directory to look in for relative path fonts\n"
98 "-sd sound/directory Add a directory to look in for relative path sounds samples\n" 98 "-sd sound/directory Add a directory to look in for relative path sounds samples\n"
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index b80e59dd4d..74df749c37 100755
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -3578,17 +3578,29 @@ using_file(const char *filename, const char type)
3578{ 3578{
3579 FILE *f; 3579 FILE *f;
3580 3580
3581 if (!watchfile) return; 3581 if (depfile)
3582 f = fopen(watchfile, "ab");
3583 if (!f) return;
3584 if (anotate)
3585 { 3582 {
3586 fprintf(f, "%c: %s\n", type, filename); 3583 f = fopen(depfile, "ab");
3584 if (!f) return;
3585 if (type != 'O')
3586 {
3587 fprintf(f, " \\\n %s", filename);
3588 }
3589 fclose(f);
3587 } 3590 }
3588 else 3591 else if (watchfile)
3589 { 3592 {
3590 fputs(filename, f); 3593 f = fopen(watchfile, "ab");
3591 fputc('\n', f); 3594 if (!f) return;
3595 if (anotate)
3596 {
3597 fprintf(f, "%c: %s\n", type, filename);
3598 }
3599 else
3600 {
3601 fputs(filename, f);
3602 fputc('\n', f);
3603 }
3604 fclose(f);
3592 } 3605 }
3593 fclose(f);
3594} 3606}
diff --git a/src/bin/edje/epp/cpplib.c b/src/bin/edje/epp/cpplib.c
index 22a4c7aacf..310401247c 100644
--- a/src/bin/edje/epp/cpplib.c
+++ b/src/bin/edje/epp/cpplib.c
@@ -6775,7 +6775,6 @@ cpp_finish(cpp_reader * pfile)
6775 else if (!(deps_stream = fopen(opts->deps_file, deps_mode))) 6775 else if (!(deps_stream = fopen(opts->deps_file, deps_mode)))
6776 cpp_pfatal_with_name(pfile, opts->deps_file); 6776 cpp_pfatal_with_name(pfile, opts->deps_file);
6777 fputs(pfile->deps_buffer, deps_stream); 6777 fputs(pfile->deps_buffer, deps_stream);
6778 putc('\n', deps_stream);
6779 if (opts->deps_file) 6778 if (opts->deps_file)
6780 { 6779 {
6781 if (ferror(deps_stream) || fclose(deps_stream) != 0) 6780 if (ferror(deps_stream) || fclose(deps_stream) != 0)