X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.h;h=4da49354a3bbe0a408d5a8c3cee44a7fa6f1e149;hp=6f732378d331d51bae5e2820934df6cc728acb95;hb=HEAD;hpb=687cde2a8c561b68f17609b615eb930ea02f5aac

diff --git a/tools/tools.h b/tools/tools.h
index 6f732378..4da49354 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -1,46 +1,111 @@
 #ifndef CCAN_TOOLS_H
 #define CCAN_TOOLS_H
+#include "config.h"
+#include <ccan/compiler/compiler.h>
+#include <ccan/rbuf/rbuf.h>
+#include <ccan/tal/tal.h>
+#include <ccan/tal/str/str.h>
+#include <stdlib.h>
 #include <stdbool.h>
 
+/* These are the defaults. */
+#define DEFAULT_CCAN_COMPILER "cc"
+#define DEFAULT_CCAN_CFLAGS "-g"
+#define DEFAULT_CCAN_OUTPUT_EXE_CFLAG "-o"
+
 #define IDENT_CHARS	"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
 			"abcdefghijklmnopqrstuvwxyz" \
 			"01234567889_"
 
 #define SPACE_CHARS	" \f\n\r\t\v"
 
-/* FIXME: Remove some -I */
-#define CFLAGS "-O -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan/ -I.. -I../.."
+#define COVERAGE_CFLAGS "-fprofile-arcs -ftest-coverage"
+
+/* Actual compiler and cflags
+ * (defaults to CCAN_COMPILER, CCAN_CFLAGS, CCAN_OUTPUT_EXE_CFLAG). */
+extern const char *compiler, *cflags, *outexecflag;
+
+/* This compiles up the _info file into a temporary. */
+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, const char *name,
-		bool recurse, char **infofile);
+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_safe_ccan_deps(const void *ctx, const char *dir, const char *name,
-			  bool recurse, char **infofile);
+char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *style,
+			  bool recurse);
+
+/* This also needs to compile the info file:
+ * style == NULL: don't recurse.
+ * style == depends: recurse dependencies.
+ * style == testdepends: recurse testdepends and depends.
+ */
+char **get_libs(const void *ctx, const char *dir, const char *style,
+		char *(*get_info)(const void *ctx, const char *dir));
+
+char **get_cflags(const void *ctx, const char *dir,
+		char *(*get_info)(const void *ctx, const char *dir));
+
+char **get_ccanlint(const void *ctx, const char *dir,
+		    char *(*get_info)(const void *ctx, const char *dir));
 
-/* This also needs to compile the info file. */
-char **get_libs(const void *ctx, const char *dir,
-		const char *name, unsigned int *num, char **infofile);
+char *get_ported(const void *ctx, const char *dir, bool recurse,
+		 char *(*get_info)(const void *ctx, const char *dir));
 
 /* From tools.c */
-char *talloc_basename(const void *ctx, const char *dir);
-char *talloc_dirname(const void *ctx, const char *dir);
-char *talloc_getcwd(const void *ctx);
-char *run_command(const void *ctx, const char *fmt, ...);
-char *temp_file(const void *ctx, const char *extension);
+/* If set, print all commands run, all output they give and exit status. */
+extern bool tools_verbose;
+bool PRINTF_FMT(4,5) run_command(const void *ctx,
+				 unsigned int *time_ms,
+				 char **output,
+				 const char *fmt, ...);
+char *run_with_timeout(const void *ctx, const char *cmd,
+		       bool *ok, unsigned *timeout_ms);
+const char *temp_dir(void);
+void keep_temp_dir(void);
+bool move_file(const char *oldname, const char *newname);
+
+void *tal_rbuf_enlarge(struct membuf *mb, void *p, size_t len);
+
+/* Freed on exit: a good parent for auto cleanup. */
+tal_t *autofree(void);
 
 /* From compile.c.
  *
  * These all compile into a temporary dir, and return the filename.
  * On failure they return NULL, and errmsg is set to compiler output.
  */
+/* If set, say what we're compiling to. */
+extern bool compile_verbose;
 /* Compile multiple object files into a single. */
-char *link_objects(const void *ctx, const char *objs, char **errmsg);
-/* Compile a single C file to an object file.  Returns errmsg if fails. */
-char *compile_object(const void *ctx, const char *cfile, char **errmsg);
+char *link_objects(const void *ctx, const char *basename,
+		   const char *objs, char **errmsg);
+/* Compile a single C file to an object file.  Returns false if fails. */
+bool compile_object(const void *ctx, const char *cfile, const char *ccandir,
+		    const char *compiler,
+		    const char *cflags,
+		    const char *outfile, char **output);
 /* Compile and link single C file, with object files, libs, etc. */
-char *compile_and_link(const void *ctx, const char *cfile, const char *objs,
-		       const char *extra_cflags, const char *libs,
-		       char **errmsg);
+bool compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
+		      const char *objs,
+		      const char *compiler, const char *cflags,
+		      const char *libs, const char *outfile, char **output);
+
+/* Returns a file in temp_dir() */
+char *temp_file(const void *ctx, const char *extension, const char *srcname);
+
+/* Default wait for run_command.  Should never time out. */
+extern const unsigned int default_timeout_ms;
+
+/* Get ccan/ top dir, given a directory within it. */
+const char *find_ccan_dir(const char *base);
+
+/* Run gcov coverage tool */
+extern const char *gcov;
+const char *gcov_unavailable(void *ctx);
+bool run_gcov(const void *ctx, unsigned int *time_ms, char **output,
+	      const char *fmt, ...);
+
 #endif /* CCAN_TOOLS_H */