From 1d087a4ae4e715a1371f7f12e28f63720e9ce8d0 Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Wed, 5 Jul 2023 10:16:58 +0100
Subject: [PATCH] Updated to HTML gen flow
---
bin/htmlgen/makefile | 2 ++
bin/htmlgen/project_html_gen.py | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/bin/htmlgen/makefile b/bin/htmlgen/makefile
index 0ddd5af..c1d2767 100644
--- a/bin/htmlgen/makefile
+++ b/bin/htmlgen/makefile
@@ -24,6 +24,8 @@ OUTPUT_FILELIST := $(OUT_DIR)/filelist.flist
gen_html:
@echo building HTML tree
@mkdir -p $(OUT_DIR)/build
+ @echo Output Directory is $(OUT_DIR)/build
+ $(MAKE) -C $(SOCLABS_NANOSOC_TECH_DIR) defs_gen
@(cd $(OUT_DIR)/build; \
rm *.html; rm *.gif; \
$(SOCLABS_SOCTOOLS_FLOW_DIR)/bin/filelist_compile.py -ea -f $(FILELIST) -o $(OUTPUT_FILELIST) ; \
diff --git a/bin/htmlgen/project_html_gen.py b/bin/htmlgen/project_html_gen.py
index 5cc6d17..417c263 100755
--- a/bin/htmlgen/project_html_gen.py
+++ b/bin/htmlgen/project_html_gen.py
@@ -28,7 +28,7 @@ def top_mod_find(filelist):
def bootrom_gen():
# Runs Bootrom generation script in NanoSoC Directory
- bootrom_scipt_dir = os.getenv("SOCLABS_NANOSOC_TECH_DIR")+"/system"
+ bootrom_scipt_dir = os.getenv("SOCLABS_NANOSOC_TECH_DIR")
subprocess.run(["make","-C",bootrom_scipt_dir,"bootrom"])
def html_gen(filelist_path):
@@ -38,7 +38,7 @@ def html_gen(filelist_path):
# Find Top-level module name
top_mod = top_mod_find(filelist_path)
# Work out output Directory
- outdir = os.getenv("SOCLABS_PROJECT_DIR")+"/"+filelist_name+"/html"
+ outdir = os.getenv("SOCLABS_PROJECT_DIR")+"/html/"+filelist_name
print(outdir)
html_scipt_dir = os.getenv("SOCLABS_SOCTOOLS_FLOW_DIR")+"/bin/htmlgen"
subprocess.run(["make","-C",html_scipt_dir,"gen_html","TOP_MODULE="+top_mod,"OUT_DIR="+outdir])
--
GitLab