#include <tools/ccanlint/ccanlint.h>
#include <tools/tools.h>
#include <ccan/talloc/talloc.h>
+#include <ccan/str_talloc/str_talloc.h>
#include <ccan/cast/cast.h>
#include <ccan/str/str.h>
#include <sys/types.h>
(*deps)[num] = m;
}
-static bool have_mod(struct manifest *deps[], const char *basename)
+static bool have_mod(struct manifest *deps[], const char *modname)
{
unsigned int i;
for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++)
- if (strcmp(deps[i]->basename, basename) == 0)
+ if (strcmp(deps[i]->modname, modname) == 0)
return true;
return false;
}
-static void add_dep(struct manifest ***deps, const char *basename)
+static void add_dep(struct manifest ***deps, const char *modname)
{
unsigned int i;
struct manifest *m;
char *errstr;
- if (have_mod(*deps, basename))
+ if (have_mod(*deps, modname))
return;
m = get_manifest(*deps, talloc_asprintf(*deps, "%s/ccan/%s",
- ccan_dir, basename));
+ ccan_dir, modname));
errstr = build_submodule(m, cflags, COMPILE_NORMAL);
if (errstr)
errx(1, "%s", errstr);
if (m->info_file) {
char **infodeps;
- infodeps = get_deps(m, m->dir, false, get_or_compile_info);
+ infodeps = get_deps(m, m->dir, "depends", false,
+ get_or_compile_info);
for (i = 0; infodeps[i]; i++) {
if (strstarts(infodeps[i], "ccan/"))
struct manifest **deps = talloc_array(f, struct manifest *, 0);
/* This one for a start. */
- add_dep(&deps, m->basename);
+ add_dep(&deps, m->modname);
/* Other modules implied by includes. */
for (lines = get_ccan_file_lines(f); *lines; lines++) {
- unsigned preflen = strspn(*lines, " \t");
- if (strstarts(*lines + preflen, "#include <ccan/")) {
- char *modname;
-
- modname = talloc_strdup(f, *lines + preflen
- + strlen("#include <ccan/"));
- modname[strcspn(modname, "/")] = '\0';
+ char *modname;
+ if (strreg(f, *lines,
+ "^[ \t]*#[ \t]*include[ \t]*[<\"]"
+ "ccan/+(.+)/+[^/]+\\.h", &modname)) {
if (!have_mod(deps, modname))
add_dep(&deps, modname);
}
/* FIXME: This doesn't uniquify. */
for (i = 0; i < talloc_array_length(deps); i++) {
- libs = get_libs(ctx, deps[i]->dir, false, get_or_compile_info);
+ libs = get_libs(ctx, deps[i]->dir, NULL, get_or_compile_info);
for (j = 0; libs[j]; j++)
list = talloc_asprintf_append(list, "-l%s ", libs[j]);
}
const char *line = lines[i] + strspn(lines[i], " \t");
unsigned len = strspn(line, IDENT_CHARS);
- if (!line[0] || cisspace(line[0]) || strstarts(line, "//"))
+ if (!line[0] || cisspace(line[0]) || strstarts(line, "//")
+ || strstarts(line, "#line"))
continue;
assert(line[strlen(line)-1] != '\n');
"#include <sys/stat.h>\n"
"#include <sys/types.h>\n"
"#include <unistd.h>\n",
- m->basename, m->basename);
+ m->modname, m->basename);
ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n"
"extern int somefunc(void);\n"