From e881e80d6b793c2d29e472ae4b65bdf8e4363b87 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Fri, 15 May 2020 12:11:57 -0700 Subject: feat: testing directory to allow for easier tests of code --- bin/initmk | 28 +++++----------------------- bin/updateblddir | 15 --------------- 2 files changed, 5 insertions(+), 38 deletions(-) delete mode 100755 bin/updateblddir (limited to 'bin') diff --git a/bin/initmk b/bin/initmk index 1f01443..77fcfd7 100755 --- a/bin/initmk +++ b/bin/initmk @@ -3,30 +3,16 @@ import sys NAME = "rules.mk" -TEMPLATE = """# ---- Push on stack ---- -SP := $(SP).x -DIRSTACK_$(SP) := $(d) -d := $(DIR) - +TEMPLATE = """include share/push.mk # Iterate through subdirectory tree # Local sources SRCS_$(d) := $(wildcard $(d)/*.c) -OBJS_$(d) := $(SRCS_$(d):.c=.o) -OBJS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(OBJS_$(d))) -DEPS_$(d) := $(OBJS_$(d):.o=.d) - -OBJS := $(OBJS) $(OBJS_$(d)) -DEPS := $(DEPS) $(DEPS_$(d)) - -# Local targets LIBS_$(d) := -LIBS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(LIBS_$(d))) -LIBS := $(LIBS) $(LIBS_$(d)) - BINS_$(d) := -BINS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(BINS_$(d))) -BINS := $(BINS) $(BINS_$(d)) +TSTS_$(d) := + +include share/pop.mk # Local rules # $(LIBS_$(d)) = TCFLAGS := @@ -39,11 +25,7 @@ $(LIBS_$(d)): $(OBJS_$(d)) $(BINS_$(d)): $(OBJS_$(d)) $(LINK) -# ---- Pop off stack ---- --include $(DEPS_$(d)) - -d := $(DIRSTACK_$(SP)) -SP := $(basename $(SP))""" +include share/pop.mk""" if __name__ == "__main__": try: diff --git a/bin/updateblddir b/bin/updateblddir deleted file mode 100755 index 34f148d..0000000 --- a/bin/updateblddir +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/python - -import os - -ROOT = "/home/nolln/root" -SRC = "sys" -BUILD = "build" -IGNORED = ["build", "include", "lib", "bin", ".git", "vendor", "obj", "dep", ".generated"] - -if __name__ == "__main__": - for root, dirs, _ in os.walk(f"{ROOT}/{SRC}"): - dirs[:] = [d for d in dirs if d not in IGNORED] - blddir = f"{ROOT}/{BUILD}/{root[len(ROOT)+len(SRC)+2:]}" - if not os.path.exists(blddir): - os.mkdir(blddir) -- cgit v1.2.1