Move to new bHEADmaster

1 files changed, 26 insertions, 26 deletions

diff --git a/b.c b/b.c
index f0303bd..8151705 100644
--- a/b.c
+++ b/b.c
@@ -5,12 +5,12 @@
 #define BUILD_DIR "build/"
 #define TEMPLATE_DIR BUILD_DIR"templates/"
 
-int debug_level = 3;
+int debug_level = 0;
 bool force = false;
 bool tests = false;
 
 void
-debug_or_release(B_Cmd* cmd)
+debug_or_release(b_cmd* cmd)
 {
   if (debug_level == 0)
     b_cmd_append(cmd, "-O3", "-s", "-DNDEBUG");
@@ -27,13 +27,13 @@ debug_or_release(B_Cmd* cmd)
 }
 
 void
-inlcude_dirs(B_Cmd* cmd)
+inlcude_dirs(b_cmd* cmd)
 {
   b_cmd_append(cmd, "-I./src/", "-I./"TEMPLATE_DIR);
 }
 
 void
-cflags_common(B_Cmd* cmd)
+cflags_common(b_cmd* cmd)
 {
   b_cmd_append(cmd, "-Wall", "-Wextra");
 
@@ -44,7 +44,7 @@ cflags_common(B_Cmd* cmd)
 }
 
 void
-synth_libs(B_Cmd *cmd)
+synth_libs(b_cmd *cmd)
 {
   b_cmd_append(cmd, "-lportaudio", "-lrt", "-lasound", "-lraylib", "-lportmidi",
                "-lfftw3f", "-lsndfile", "-lconfig", "-lpthread",
@@ -54,21 +54,21 @@ synth_libs(B_Cmd *cmd)
 }
 
 void
-sequencer_libs(B_Cmd *cmd)
+sequencer_libs(b_cmd *cmd)
 {
   b_cmd_append(cmd, "-lportaudio", "-lportmidi", "-lrt", "-lraylib", "-lpthread");
 
   inlcude_dirs(cmd);
 }
 
-void cc(B_Cmd *cmd)
+void cc(b_cmd *cmd)
 {
   b_cmd_append(cmd, "clang");
   cflags_common(cmd);
 }
 
 bool
-build_c(B_Cmd*       cmd,
+build_c(b_cmd*       cmd,
         const char** input_paths,
         size_t       input_paths_len,
         const char** dep_paths,
@@ -76,12 +76,12 @@ build_c(B_Cmd*       cmd,
         const char*  output_path)
 {
   int rebuild_is_needed =
-    b_needs_rebuild(B_COMPILE, output_path, input_paths, input_paths_len);
+    b_needs_rebuild(output_path, input_paths, input_paths_len);
 
   int dep_rebuild = 0;
   if (rebuild_is_needed == 0)
     dep_rebuild =
-        b_needs_rebuild(B_COMPILE, output_path, dep_paths, dep_paths_len);
+        b_needs_rebuild(output_path, dep_paths, dep_paths_len);
 
 
   if (rebuild_is_needed < 0 || dep_rebuild < 0) return false;
@@ -90,19 +90,19 @@ build_c(B_Cmd*       cmd,
     cmd->count = 0;
     cc(cmd);
     b_cmd_append(cmd, "-o", output_path);
-    b_da_append_many(cmd, input_paths, input_paths_len);
+    array_append_many(cmd, input_paths, input_paths_len);
     if (0 == strcmp(output_path, BUILD_DIR"synth"))
       synth_libs(cmd);
     if (0 == strcmp(output_path, BUILD_DIR"sequencer"))
       sequencer_libs(cmd);
-    return b_cmd_run_sync(*cmd);
+    return b_cmd_run(cmd);
   }
 
   b_log(B_INFO, "%s is up-to-date", output_path);
   return true;
 }
 
-bool build_templates(B_Cmd *cmd, const char **templates, size_t len) {
+bool build_templates(b_cmd *cmd, const char **templates, size_t len) {
   char dest[1024] = "";
   for (size_t i = 0; i < len; i++) {
     cmd->count = 0;
@@ -110,7 +110,7 @@ bool build_templates(B_Cmd *cmd, const char **templates, size_t len) {
     strcpy(dest, TEMPLATE_DIR);
     strcat(dest, basename(base));
     strcat(dest, ".h");
-    if (b_needs_rebuild1(B_TEMPLATE, dest, templates[i]) == 0 &&
+    if (b_needs_rebuild1(dest, templates[i]) == 0 &&
         force == false) {
       b_log(B_INFO, "%s is up-to-date", dest);
       continue;
@@ -121,15 +121,15 @@ bool build_templates(B_Cmd *cmd, const char **templates, size_t len) {
     strcat(tmp, " > ");
     strcat(tmp, dest);
     b_cmd_append(cmd, "bash", "-c", tmp);
-    b_cmd_run_sync(*cmd);
+    b_cmd_run(cmd);
   }
   return true;
 }
 
 bool
-build_tests(B_Cmd *cmd, const char * output_path) {
+build_tests(b_cmd *cmd, const char * output_path) {
   int rebuild_is_needed =
-    b_needs_rebuild1(B_COMPILE, output_path, "tests/example_test.c");
+    b_needs_rebuild1(output_path, "tests/example_test.c");
 
   /* int dep_rebuild = 0; */
   /* if (rebuild_is_needed == 0) */
@@ -147,7 +147,7 @@ build_tests(B_Cmd *cmd, const char * output_path) {
     b_cmd_append(cmd, "-l", "check");
     b_cmd_append(cmd, "tests/example_test.c");
     synth_libs(cmd);
-    return b_cmd_run_sync(*cmd);
+    return b_cmd_run(cmd);
   }
 
   b_log(B_INFO, "%s is up-to-date", output_path);
@@ -240,24 +240,24 @@ main(int argc, char *argv[])
     "tmpl/index.html"
   };
 
-  B_Cmd cmd = {0};
+  b_cmd cmd = {0};
 
-  b_mkdir_if_not_exists(BUILD_DIR);
-  b_mkdir_if_not_exists(TEMPLATE_DIR);
+  b_mkdir(BUILD_DIR);
+  b_mkdir(TEMPLATE_DIR);
 
   if (!build_c(&cmd, (const char *[]){"src/tt.c"}, 1, NULL, 0,
                BUILD_DIR "tt"))
     return 1;
 
-  if (!build_templates(&cmd, templates, B_ARRAY_LEN(templates)))
+  if (!build_templates(&cmd, templates, ARRAY_LENGTH(templates)))
     return 1;
 
-  if (!build_c(&cmd, synth_paths, B_ARRAY_LEN(synth_paths), synth_deps,
-               B_ARRAY_LEN(synth_deps), BUILD_DIR "synth"))
+  if (!build_c(&cmd, synth_paths, ARRAY_LENGTH(synth_paths), synth_deps,
+               ARRAY_LENGTH(synth_deps), BUILD_DIR "synth"))
     return 1;
 
-  if (!build_c(&cmd, sequencer_paths, B_ARRAY_LEN(sequencer_paths), sequencer_deps,
-               B_ARRAY_LEN(sequencer_deps), BUILD_DIR "sequencer"))
+  if (!build_c(&cmd, sequencer_paths, ARRAY_LENGTH(sequencer_paths), sequencer_deps,
+               ARRAY_LENGTH(sequencer_deps), BUILD_DIR "sequencer"))
     return 1;
 
   if (tests && !build_tests(&cmd, BUILD_DIR "test"))