From ce05175372a9ddca1a225db0765ace1127a39293 Mon Sep 17 00:00:00 2001
From: Nicholas <nbnoll@eml.cc>
Date: Fri, 12 Nov 2021 09:22:01 -0800
Subject: chore: simplified organizational structure

---
 bin/gentags    | 18 ------------------
 bin/initmk     | 49 -------------------------------------------------
 bin/updatedirs | 21 ++++++++++-----------
 3 files changed, 10 insertions(+), 78 deletions(-)
 delete mode 100755 bin/gentags
 delete mode 100755 bin/initmk

(limited to 'bin')

diff --git a/bin/gentags b/bin/gentags
deleted file mode 100755
index d9019c9..0000000
--- a/bin/gentags
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# TAGS=".tag-files"
-
-# echo "finding files ..."
-# ROOT=/home/nolln/root
-# find $ROOT              \
-#     -path "$ROOT/sys/*.[chs]" -prune -o \
-#     -path "$ROOT/vendor/musl/src/*.[chs]" -prune -o \
-#     -path "$ROOT/include/*.h" \
-#     -path "$ROOT/include/vendor/*.h" > "$TAGS"
-
-ctags -R -f .tags .
-
-# cscope -b -k -I include/vendor/libc -I include/ -i "$CSCOPE_DIR/files"
-
-# CSCOPE_DB="$ROOT/cscope.out"
-# echo "exported CSCOPE_DB to: '$CSCOPE_DB'"
diff --git a/bin/initmk b/bin/initmk
deleted file mode 100755
index 2ea018f..0000000
--- a/bin/initmk
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/python
-
-import os
-import sys
-
-NAME     = "rules.mk"
-TEMPLATE = """include share/push.mk
-# Iterate through subdirectory tree
-
-# Local sources
-SRCS_$(d) :=
-LIBS_$(d) :=
-BINS_$(d) :=
-TSTS_$(d) :=
-
-include share/paths.mk
-
-# Local rules
-# $(LIBS_$(d)) = TCFLAGS :=
-# $(LIBS_$(d)) = TCINCS  :=
-# $(LIBS_$(d)) = TCLIBS  :=
-
-$(LIBS_$(d)): $(OBJS_$(d))
-	$(ARCHIVE)
-
-$(BINS_$(d)): $(OBJS_$(d))
-	$(LINK)
-
-$(UNTS_$(d)): $(TOBJS_$(d)) $(LIBS_$(d))
-	$(LINK)
-
-include share/pop.mk"""
-
-if __name__ == "__main__":
-    if len(sys.argv) == 2:
-        dir = sys.argv[1]
-        if not os.path.exists(dir):
-            raise ValueError(f"path '{dir}' does not exist")
-        path = f"{dir}/{NAME}"
-    elif len(sys.argv) > 2:
-        raise ValueError("only one argument is accepted")
-    else:
-        path = NAME
-    try:
-        with open(path, 'x') as makefile:
-            makefile.write(f"{TEMPLATE}\n")
-    except:
-        print("rules.mk already present", file=sys.stderr)
-        exit(1)
diff --git a/bin/updatedirs b/bin/updatedirs
index cde7a6b..b304251 100755
--- a/bin/updatedirs
+++ b/bin/updatedirs
@@ -2,10 +2,10 @@
 import os
 
 ROOT    = "/home/nolln/u"
-SRCS    = ["src", "sys"]
-BUILD   = ".build"
-TEST    = ".test"
-IGNORED = ["build", "include", "lib", "bin", ".git", "vendor", "obj", "dep", ".generated"]
+SRC     = "src"
+BUILD   = "obj"
+TEST    = "test"
+IGNORED = ["include", "lib", "bin", ".git", "vendor", "obj", ".dep"]
 
 if __name__ == "__main__":
     if not os.path.exists(BUILD):
@@ -14,10 +14,9 @@ if __name__ == "__main__":
     if not os.path.exists(TEST):
         os.mkdir(TEST)
 
-    for SRC in SRCS:
-        for root, dirs, _ in os.walk(f"{ROOT}/{SRC}"):
-            dirs[:] = [d for d in dirs if d not in IGNORED]
-            for newroot in [BUILD, TEST]:
-                blddir  = f"{ROOT}/{newroot}/{SRC}/{root[len(ROOT)+len(SRC)+2:]}"
-                if not os.path.exists(blddir):
-                    os.mkdir(blddir)
+    for root, dirs, _ in os.walk(f"{ROOT}/{SRC}"):
+        dirs[:] = [d for d in dirs if d not in IGNORED]
+        for newroot in [BUILD, TEST]:
+            blddir  = f"{ROOT}/{newroot}/{root[len(ROOT)+len(SRC)+2:]}"
+            if not os.path.exists(blddir):
+                os.mkdir(blddir)
-- 
cgit v1.2.1