deprecate jinja process hack, replace with roscha!

Author: rick

.gitignore

@@ -34,3 +34,5 @@ loc.sh
 */.venv-*
 .xmake
 richard-100*
+.meson.build*.log
+.meson-build*.log

.gitmodules

@@ -799,3 +799,18 @@
 [submodule "submodules/c_img"]
 	path = submodules/c_img
 	url = [email protected]:binRick/c_img.git
+[submodule "submodules/qoi"]
+	path = submodules/qoi
+	url = https://github.com/phoboslab/qoi
+[submodule "submodules/interface99"]
+	path = submodules/interface99
+	url = https://github.com/Hirrolot/interface99
+[submodule "submodules/metalang99"]
+	path = submodules/metalang99
+	url = https://github.com/Hirrolot/metalang99
+[submodule "submodules/restic"]
+	path = submodules/restic
+	url = https://github.com/restic/restic
+[submodule "submodules/utf8.h"]
+	path = submodules/utf8.h
+	url = https://github.com/sheredom/utf8.h

Makefile

@@ -2,7 +2,14 @@ default: all
 include submodules/c_deps/etc/includes.mk
 local-setup: setup-binaries setup-golang setup-wg setup
 ##############################################################
-TIDIED_FILES = */*.c */*.h \
+TIDIED_FILES = deps*/*.c deps*/*.h term*/*.c term*/*.h ctable*/*.c ctable*/*.h *table*/*.c *table*/*.h cgif-test/*.c *-test/*.c *-test/*.h chan-test/*.c chan-test/*.h \
+                          introspect-test/*.c introspect-test/*.h \
+                          introspect/*.c introspect/*.h \
+                          reproc-test/*.c reproc-test/*.h \
+                          list-test/*.c list-test/*.h \
+                          *-test/*.c *-test/*.h \
+                          intro*/*.c intro*/*.h \
+                          exec-fzf*/*.c exec-fzf*/*.h \
 			   submodules/c_vt100utils/vt100utils.h \
 			   submodules/c_vt100utils/vt100utils.c \
 			   submodules/c_vt100utils/tuibox.c \

blocks-test/blocks-test.c

@@ -8,7 +8,7 @@
 #include "c_fsio/include/fsio.h"
 #include "c_greatest/greatest/greatest.h"
 #include "c_stringfn/include/stringfn.h"
-#include "c_vector/include/vector.h"
+#include "c_vector/vector/vector.h"
 ////////////////////////////////////////////
 #include "blocks-test/blocks-test.h"
 #include "tiny-regex-c/re.h"

c-meson-utils-test/c-meson-utils-test.c

@@ -12,7 +12,6 @@
 #include "c-meson-utils-test/c-meson-utils-test.h"
 #include "c-meson-utils/c-meson-utils.h"
 #include "c_fsio/include/fsio.h"
-#include "jinja2-cli/jinja2-cli.h"
 #include "tempdir.c/tempdir.h"
 
 //////////////////////////////////////////////

c-meson-utils/c-meson-utils.h

@@ -9,8 +9,7 @@
 #include "c_fsio/include/fsio.h"
 #include "c_string_buffer/include/stringbuffer.h"
 #include "c_stringfn/include/stringfn.h"
-#include "c_vector/include/vector.h"
-#include "jinja2-cli/jinja2-cli.h"
+#include "c_vector/vector/vector.h"
 /////////////////////////////////////
 struct c_meson_module_dep_t {        //    meson/deps/xxxxx/meson.build
   char *dep_name;

c-meson-utils/meson.build

@@ -12,7 +12,6 @@ c_meson_utils_deps = [
   c_fsio_dep,
   c_string_buffer_dep,
   c_stringfn_dep,
-  jinja2_cli_dep,
   c_fsio_dep,
   tempdir_dep,
 ]

chan-test/chan-test.c

@@ -1,12 +1,10 @@
 #include "chan-test.h"
 #include <assert.h>
 #include <ctype.h>
-#include <ctype.h>
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -160,15 +158,12 @@ TEST t_chan_jobs_worker(void *buffer_qty,
   pthread_create(&worker_threads[2], NULL, worker, (void *)5);
 
   ct_start(NULL);
-  char *send_dur;
 
   for (size_t i = 1; i <= JOBS_QTY; i++) {
     usleep(SEND_JOBS_DELAY_MS * 1000);
     chan_send(JOBS_CHANNEL, (void *)i);
   }
 
-  free(send_dur);
-  //ct_set_unit(ct_MILLISECONDS);
   char *sent_dur = ct_stop("");
 
   chan_close(JOBS_CHANNEL);
@@ -177,12 +172,12 @@ TEST t_chan_jobs_worker(void *buffer_qty,
     sent_dur
     );
 
-  for (int i = 0; i < WORKERS_QTY; i++) {
+  for (size_t i = 0; i < WORKERS_QTY; i++) {
     chan_recv(DONE_CHANNEL, NULL);
   }
 
   I("done signals received.....waiting on threads to exit....");
-  for (int i = 0; i < WORKERS_QTY; i++) {
+  for (size_t i = 0; i < WORKERS_QTY; i++) {
     pthread_join(&worker_threads[i], NULL);
   }
 

deps-test/deps-test.c

@@ -64,7 +64,7 @@
 #include "c_string_buffer/include/stringbuffer.h"
 #include "c_stringfn/include/stringfn.h"
 #include "c_timer/include/c_timer.h"
-#include "c_vector/include/vector.h"
+#include "c_vector/vector/vector.h"
 #include "c_workqueue/include/workqueue.h"
 #include "cansid/cansid.h"
 #include "cansid/minunit.h"
@@ -116,7 +116,6 @@
 #include "incbin/incbin.h"
 #include "int/int.h"
 #include "is_number.c/is_number.h"
-#include "jinja2-cli/jinja2-cli.h"
 #include "kgflags/kgflags.h"
 #include "kitty/kitty.h"
 #include "layout/layout.h"
@@ -299,7 +298,7 @@ void handle_request(struct http_request_s *request) {
   http_string_t url = http_request_target(request);
 
   {
-    dbg(url.buf, % s);
+    dbg(url.buf, %s);
     char                   *U             = stringfn_substring(url.buf, 0, url.len);
     struct StringFNStrings lines          = stringfn_split_lines_and_trim(url.buf);
     char                   *req_data      = lines.strings[lines.count - 1];
@@ -315,7 +314,7 @@ void handle_request(struct http_request_s *request) {
       }
     }
     char                   *normalized_url = stringbuffer_to_string(url_sb);
-    dbg(normalized_url, % s);
+    dbg(normalized_url, %s);
     struct StringFNStrings normalized_url_strings = stringfn_split(normalized_url, '/');
 
     int                    p;
@@ -324,7 +323,7 @@ void handle_request(struct http_request_s *request) {
     char                   *parts[3];
     char                   *url_string;
     asprintf(&url_string, "http://localhost:%d%s?%s", HTTPSERVER_LISTEN_PORT, normalized_url, req_data);
-    dbg(url_string, % s);
+    dbg(url_string, %s);
 
     if (-1 == yuarel_parse(&yurl, url_string)) {
       fprintf(stderr, "Could not parse url!\n");
@@ -335,10 +334,10 @@ void handle_request(struct http_request_s *request) {
       printf("scheme:\t%s\n", yurl.scheme);
       printf("host:\t%s\n", yurl.host);
     }
-    dbg(params_strings.count, % d);
-    dbg(req_data, % s);
-    dbg(lines.count, % d);
-    dbg(normalized_url_strings.count, % d);
+    dbg(params_strings.count, %d);
+    dbg(req_data, %s);
+    dbg(lines.count, %d);
+    dbg(normalized_url_strings.count, %d);
     printf("port:\t%d\n", yurl.port);
     printf("path:\t%s\n", yurl.path);
     printf("query:\t%s\n", yurl.query);
@@ -367,8 +366,8 @@ void handle_request(struct http_request_s *request) {
     char *u;
     asprintf(&u, "\n\turl:%s\n\tlen:%d\n", url.buf, url.len);
     if (false) {
-      dbg(uri_decoded, % s);
-      dbg(uri_encoded, % s);
+      dbg(uri_decoded, %s);
+      dbg(uri_encoded, %s);
       printf("%s", u);
     }
   }
@@ -773,7 +772,7 @@ void demo_ansi_qrcode(){
 }
 
 void do_forever_my_program(void *context){
-  dbg("t_forever_my_program", % s);
+  dbg("t_forever_my_program", %s);
   if (context != NULL) {
     // do something with the context
   }
@@ -786,12 +785,12 @@ int do_forever_callback(void *context, const unsigned char started, int stat_loc
   if (context != NULL) {
     // do something with the context
   }
-  dbg(stat_loc, % d);
-  dbg(started, % c);
+  dbg(stat_loc, %d);
+  dbg(started, %c);
   if (stat_loc == 0 || !started) {
     return(-1); // no more retries
   }
-  dbg("do_forever_callback", % s);
+  dbg("do_forever_callback", %s);
   return(500); // wait 500 millies before next invocation, 0 for no wait.
 }
 
@@ -1028,12 +1027,12 @@ TEST t_libbeaufort(void){
   groove   = beaufort_encrypt(groove_s, "groove", NULL);
   assert(groove);
   assert(0 == strcmp(groove, "3n1Cs lg y7l 9ko!F :b"));
-  dbg(monkey, % s);
-  dbg(monkey_s, % s);
-  dbg(goodman, % s);
-  dbg(goodman_s, % s);
-  dbg(groove, % s);
-  dbg(groove_s, % s);
+  dbg(monkey, %s);
+  dbg(monkey_s, %s);
+  dbg(goodman, %s);
+  dbg(goodman_s, %s);
+  dbg(groove, %s);
+  dbg(groove_s, %s);
 
   // BENCHMARK_SUMMARY(benchmark_name);
   PASS();
@@ -1044,8 +1043,8 @@ TEST t_murmurhash(void){
   const char *key = "kinkajou";
   uint32_t   hash = murmurhash(key, (uint32_t)strlen(key), seed);
 
-  dbg(key, % s);
-  dbg(seed, % d);
+  dbg(key, %s);
+  dbg(seed, %d);
   printf("%" PRIu32 "\n", hash);
   printf("%d" PRIu32 "\n", hash);
 
@@ -2221,7 +2220,7 @@ TEST t_ok_file_format_wav(void){
   char *wav_file = malloc(1024);
 
   sprintf(wav_file, "%s/../sounds/key_space_down.wav", EXECUTABLE_PATH_DIRNAME);
-  dbg(wav_file, % s);
+  dbg(wav_file, %s);
   FILE   *file = fopen(wav_file, "rb");
   ok_wav audio = ok_wav_read(file, OK_WAV_DEFAULT_DECODE_FLAGS);
 
@@ -2631,24 +2630,6 @@ TEST t_my_cwd(void){
   PASS();
 }
 
-TEST t_jinja2_cli(void){
-  struct jinja2_render_template_t *CFG = jinja2_init_config();
-
-  CFG->input_json_string = "{\"abc\":\"world\"}";
-  CFG->template_s        = "hello {{ abc }}";
-  CFG->debug_mode        = true;
-  CFG->debug_mode        = false;
-  int res = jinja2_render_template(CFG);
-
-  ASSERT_EQ(res, 0);
-  ASSERT_EQ(CFG->success, true);
-  ASSERT_EQ(strcmp(CFG->output_s, "hello world"), 0);
-
-  printf(AC_RESETALL AC_BLUE "%s" AC_RESETALL "\n", CFG->output_s);
-
-  PASS();
-}
-
 typedef struct {
   char *name;
   int  cash;
@@ -3330,21 +3311,21 @@ TEST t_c_timestamp(void){
   ts.sec    = 0;
   ts.offset = 0;
   ts.nsec   = -1;
-  dbg(timestamp_valid(&ts), % d);
+  dbg(timestamp_valid(&ts), %d);
 
   ts.nsec = 1000000000;
-  dbg(!timestamp_valid(&ts), % d);
+  dbg(!timestamp_valid(&ts), %d);
 
   ts.nsec   = 0;
   ts.offset = -23 * 60 - 60;
-  dbg(!timestamp_valid(&ts), % d);
+  dbg(!timestamp_valid(&ts), %d);
 
   ts.offset = +23 * 60 + 60;
-  dbg(!timestamp_valid(&ts), % d);
+  dbg(!timestamp_valid(&ts), %d);
 
   ts.offset = 0;
   ts.sec    = INT64_C(-62135596801);
-  dbg(!timestamp_valid(&ts), % d);
+  dbg(!timestamp_valid(&ts), %d);
   ts.sec = INT64_C(253402387140);
   timestamp_t ts1;
   struct tm   tm1;
@@ -3353,10 +3334,10 @@ TEST t_c_timestamp(void){
   ts.nsec   = 0;
   ts.offset = 0;
   memset(&tm1, 0, sizeof(tm1));
-  dbg(timestamp_to_tm_utc(&ts, &tm1.tm_year), % d);
-  dbg(timestamp_to_tm_utc(&ts, &tm1.tm_mon), % d);
-  dbg(timestamp_to_tm_utc(&ts, &tm1.tm_hour), % d);
-  dbg(timestamp_to_tm_utc(&ts, &tm1.tm_sec), % d);
+  dbg(timestamp_to_tm_utc(&ts, &tm1.tm_year), %d);
+  dbg(timestamp_to_tm_utc(&ts, &tm1.tm_mon), %d);
+  dbg(timestamp_to_tm_utc(&ts, &tm1.tm_hour), %d);
+  dbg(timestamp_to_tm_utc(&ts, &tm1.tm_sec), %d);
 
   PASS();
 }
@@ -4087,9 +4068,6 @@ SUITE(s_kitty){
 SUITE(s_my_cwd){
   RUN_TEST(t_my_cwd);
 }
-SUITE(s_jinja2_cli){
-  RUN_TEST(t_jinja2_cli);
-}
 SUITE(s_levenshtein){
   RUN_TEST(t_levenshtein);
 }
@@ -4272,7 +4250,6 @@ int main(int argc, char **argv) {
 //  RUN_SUITE(s_occurrences);
 //  RUN_SUITE(s_str_replace);
   RUN_SUITE(s_seethe);
-  RUN_SUITE(s_jinja2_cli);
   RUN_SUITE(s_list);
   RUN_SUITE(s_forever);
   RUN_SUITE(s_eventemitter);

deps-test/meson.build

@@ -92,7 +92,6 @@ deps_test_deps = [
   libyuarel_dep,
   levenshtein_dep,
   libut_dep,
-  jinja2_cli_dep,
   chfreq_c_dep,
   msgbox_dep,
   dotenv_c_dep,
@@ -121,16 +120,6 @@ if get_option('enable-binaries')
      c_args: deps_c_args,
      install: true,
   )
-  if get_option('enable-greatest-tests')
-    #    test('deps-test|List Test Cases',sh_program,
-    #  args: ['-c',deps_ls_tests_script],
-    #  workdir: meson.current_source_dir(),
-    #)
-  endif
-    #test('jinja2-cli', 
-    #  deps_test_exec, args: ['-v','-a','-e','-s','s_jinja2_cli'],
-    #  workdir: deps_cur_dir,
-    #  )
   if get_option('enable-deps-test')
     test('deps-test', 
       deps_test_exec, args: ['-v','-a'],

etc/reference-data.yaml etc/bashful-vars.yaml

@@ -1,4 +1,4 @@
-$include: etc/reference-data.yaml
+$include: etc/bashful-vars.yaml
 $include: etc/config.yaml
 
 config:

etc/meson-repos-info.yaml

@@ -1,4 +1,4 @@
-$include: etc/reference-data.yaml
+$include: etc/bashful-vars.yaml
 $include: etc/config.yaml
 
 config:

etc/meson-repos.yaml

@@ -25,6 +25,8 @@ meson-setup:
 
 meson-build: meson-setup
 	@$(MESON) compile -C $(MESON_BUILD_DIR) -j $(MESON_PARALLEL_JOBS)
+	#| tee .meson-build.log
+	#@$(GREP) 'warning:' .meson-build.log |egrep -v 'submodules|unused parameter' | tee .meson-build-warnings.log
 
 do-build: meson-build muon-build
 

etc/meson.mk

@@ -1,4 +1,4 @@
-$include: etc/reference-data.yaml
+$include: etc/bashful-vars.yaml
 $include: etc/config.yaml