This allows us to separate dependencies only needed for testing.
This matters: they don't have the same impact on licensing, nor necessarily
on end-users.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
bool compile = false;
bool recurse = true;
bool ccan = true;
bool compile = false;
bool recurse = true;
bool ccan = true;
+ const char *style = "depends";
if (argv[1] && streq(argv[1], "--direct")) {
argv++;
if (argv[1] && streq(argv[1], "--direct")) {
argv++;
+ if (argv[1] && streq(argv[1], "--tests")) {
+ argv++;
+ argc--;
+ style = "testdepends";
+ }
- errx(1, "Usage: ccan_depends [--direct] [--compile] [--non-ccan] <dir>\n"
+ errx(1, "Usage: ccan_depends [--direct] [--compile] [--non-ccan] [--tests] <dir>\n"
"Spits out all the ccan dependencies (recursively unless --direct)");
/* We find depends without compiling by looking for ccan/ */
"Spits out all the ccan dependencies (recursively unless --direct)");
/* We find depends without compiling by looking for ccan/ */
if (compile)
deps = get_deps(talloc_autofree_context(), argv[1],
if (compile)
deps = get_deps(talloc_autofree_context(), argv[1],
- recurse, compile_info);
+ style, recurse, compile_info);
else
deps = get_safe_ccan_deps(talloc_autofree_context(),
else
deps = get_safe_ccan_deps(talloc_autofree_context(),
+ argv[1], style, recurse);
for (i = 0; deps[i]; i++)
if (strstarts(deps[i], "ccan/") == ccan)
for (i = 0; deps[i]; i++)
if (strstarts(deps[i], "ccan/") == ccan)
- deps = get_safe_ccan_deps(m, m->dir, true);
+ deps = get_safe_ccan_deps(m, m->dir, "depends", true);
- deps = get_deps(m, m->dir, true, get_or_compile_info);
+ deps = get_deps(m, m->dir, "depends", true,
+ get_or_compile_info);
for (i = 0; deps[i]; i++) {
if (!strstarts(deps[i], "ccan/"))
for (i = 0; deps[i]; i++) {
if (!strstarts(deps[i], "ccan/"))
if (m->info_file) {
char **infodeps;
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/"))
for (i = 0; infodeps[i]; i++) {
if (strstarts(infodeps[i], "ccan/"))
-static char **get_one_deps(const void *ctx, const char *dir,
+static char **get_one_deps(const void *ctx, const char *dir, const char *style,
char *(*get_info)(const void *ctx, const char *dir))
{
char **deps, *cmd;
char *(*get_info)(const void *ctx, const char *dir))
{
char **deps, *cmd;
if (!infofile)
return NULL;
if (!infofile)
return NULL;
- cmd = talloc_asprintf(ctx, "%s depends", infofile);
+ cmd = talloc_asprintf(ctx, "%s %s", infofile, style);
deps = lines_from_cmd(cmd, "%s", cmd);
deps = lines_from_cmd(cmd, "%s", cmd);
- if (!deps)
- err(1, "Could not run '%s'", cmd);
+ if (!deps) {
+ /* You must understand depends, maybe not testdepends. */
+ if (streq(style, "depends"))
+ err(1, "Could not run '%s'", cmd);
+ deps = talloc(ctx, char *);
+ deps[0] = NULL;
+ }
/* This is a terrible hack. We scan for ccan/ strings. */
static char **get_one_safe_deps(const void *ctx,
const char *dir,
/* This is a terrible hack. We scan for ccan/ strings. */
static char **get_one_safe_deps(const void *ctx,
const char *dir,
char *(*unused)(const void *, const char *))
{
char **deps, **lines, *raw, *fname;
unsigned int i, n;
char *(*unused)(const void *, const char *))
{
char **deps, **lines, *raw, *fname;
unsigned int i, n;
+ bool correct_style = false;
fname = talloc_asprintf(ctx, "%s/_info", dir);
raw = grab_file(fname, fname, NULL);
fname = talloc_asprintf(ctx, "%s/_info", dir);
raw = grab_file(fname, fname, NULL);
if (lines[i][0] == '#')
continue;
if (lines[i][0] == '#')
continue;
+ if (strstr(lines[i], "\"testdepends\""))
+ correct_style = streq(style, "testdepends");
+ else if (strstr(lines[i], "\"depends\""))
+ correct_style = streq(style, "depends");
+
+ if (!correct_style)
+ continue;
+
/* Start of line, or after ". */
if (strstarts(lines[i], "ccan/"))
str = lines[i];
/* Start of line, or after ". */
if (strstarts(lines[i], "ccan/"))
str = lines[i];
/* Gets all the dependencies, recursively. */
static char **
/* Gets all the dependencies, recursively. */
static char **
-get_all_deps(const void *ctx, const char *dir,
+get_all_deps(const void *ctx, const char *dir, const char *style,
char *(*get_info)(const void *ctx, const char *dir),
char *(*get_info)(const void *ctx, const char *dir),
- char **(*get_one)(const void *, const char *,
+ char **(*get_one)(const void *, const char *, const char *,
char *(*get_info)(const void *, const char *)))
{
char **deps;
unsigned int i;
char *(*get_info)(const void *, const char *)))
{
char **deps;
unsigned int i;
- deps = get_one(ctx, dir, get_info);
+ deps = get_one(ctx, dir, style, get_info);
for (i = 0; i < talloc_array_length(deps)-1; i++) {
char **newdeps;
unsigned int j;
for (i = 0; i < talloc_array_length(deps)-1; i++) {
char **newdeps;
unsigned int j;
subdir = talloc_asprintf(ctx, "%s/%s",
talloc_dirname(ctx, dir),
deps[i] + strlen("ccan/"));
subdir = talloc_asprintf(ctx, "%s/%s",
talloc_dirname(ctx, dir),
deps[i] + strlen("ccan/"));
- newdeps = get_one(ctx, subdir, get_info);
+ newdeps = get_one(ctx, subdir, "depends", get_info);
/* Should be short, so brute-force out dups. */
for (j = 0; j < talloc_array_length(newdeps)-1; j++) {
/* Should be short, so brute-force out dups. */
for (j = 0; j < talloc_array_length(newdeps)-1; j++) {
len = talloc_array_length(libs);
if (recurse) {
len = talloc_array_length(libs);
if (recurse) {
- deps = get_deps(ctx, dir, true, get_info);
+ deps = get_deps(ctx, dir, "depends", true, get_info);
for (i = 0; deps[i]; i++) {
char **newlibs, *subdir;
size_t newlen;
for (i = 0; deps[i]; i++) {
char **newlibs, *subdir;
size_t newlen;
return talloc_realloc(NULL, deps, char *, num + 1);
}
return talloc_realloc(NULL, deps, char *, num + 1);
}
-char **get_deps(const void *ctx, const char *dir, bool recurse,
+char **get_deps(const void *ctx, const char *dir, const char *style,
+ bool recurse,
char *(*get_info)(const void *ctx, const char *dir))
{
char **ret;
if (!recurse) {
char *(*get_info)(const void *ctx, const char *dir))
{
char **ret;
if (!recurse) {
- ret = get_one_deps(ctx, dir, get_info);
+ ret = get_one_deps(ctx, dir, style, get_info);
- ret = get_all_deps(ctx, dir, get_info, get_one_deps);
+ ret = get_all_deps(ctx, dir, style, get_info, get_one_deps);
return uniquify_deps(ret);
}
return uniquify_deps(ret);
}
-char **get_safe_ccan_deps(const void *ctx, const char *dir,
+char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *style,
bool recurse)
{
char **ret;
if (!recurse) {
bool recurse)
{
char **ret;
if (!recurse) {
- ret = get_one_safe_deps(ctx, dir, NULL);
+ ret = get_one_safe_deps(ctx, dir, style, NULL);
- ret = get_all_deps(ctx, dir, NULL, get_one_safe_deps);
+ ret = get_all_deps(ctx, dir, style, NULL, get_one_safe_deps);
}
return uniquify_deps(ret);
}
}
return uniquify_deps(ret);
}
verbose("Adjusting %s\n", dir);
verbose_indent();
verbose("Adjusting %s\n", dir);
verbose_indent();
- for (deps = get_deps(parent, dir, false, compile_info); *deps; deps++) {
+ for (deps = get_deps(parent, dir, "depends", false, compile_info);
+ *deps;
+ deps++) {
char *depdir;
struct adjusted *adj = NULL;
struct replace *repl;
char *depdir;
struct adjusted *adj = NULL;
struct replace *repl;
if (access(info, R_OK) != 0)
continue;
if (access(info, R_OK) != 0)
continue;
- for (deps = get_deps(*file, *file, false, compile_info);
+ for (deps = get_deps(*file, *file, "depends", false,
+ compile_info);
*deps; deps++) {
if (!strstarts(*deps, "ccan/"))
continue;
*deps; deps++) {
if (!strstarts(*deps, "ccan/"))
continue;
char *compile_info(const void *ctx, const char *dir);
/* This actually compiles and runs the info file to get dependencies. */
char *compile_info(const void *ctx, const char *dir);
/* This actually compiles and runs the info file to get dependencies. */
-char **get_deps(const void *ctx, const char *dir, bool recurse,
+char **get_deps(const void *ctx, const char *dir, const char *style,
+ bool recurse,
char *(*get_info)(const void *ctx, const char *dir));
/* This is safer: just looks for ccan/ strings in info */
char *(*get_info)(const void *ctx, const char *dir));
/* This is safer: just looks for ccan/ strings in info */
-char **get_safe_ccan_deps(const void *ctx, const char *dir, bool recurse);
+char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *style,
+ bool recurse);
/* This also needs to compile the info file. */
char **get_libs(const void *ctx, const char *dir, bool recurse,
/* This also needs to compile the info file. */
char **get_libs(const void *ctx, const char *dir, bool recurse,