Skip to content

Commit

Permalink
checkpoint, default build paths are now repo/tag instead of tag/repo
Browse files Browse the repository at this point in the history
  • Loading branch information
aappleby committed Nov 10, 2024
1 parent 6fbd492 commit 7be5423
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
15 changes: 11 additions & 4 deletions build.hancho
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
hancho.config.force = True

# Check that all our rule files load
hancho.base_rules = hancho.load("{hancho_dir}/base_rules.hancho")
hancho.fpga_rules = hancho.load("{hancho_dir}/fpga_rules.hancho")
hancho.riscv_rules = hancho.load("{hancho_dir}/riscv_rules.hancho")
hancho.wasm_rules = hancho.load("{hancho_dir}/wasm_rules.hancho")
if "base_rules" not in hancho:
hancho.base_rules = hancho.load("{hancho_dir}/base_rules.hancho")

if "fpga_rules" not in hancho:
hancho.fpga_rules = hancho.load("{hancho_dir}/fpga_rules.hancho")

if "riscv_rules" not in hancho:
hancho.riscv_rules = hancho.load("{hancho_dir}/riscv_rules.hancho")

if "wasm_rules" not in hancho:
hancho.wasm_rules = hancho.load("{hancho_dir}/wasm_rules.hancho")

#hancho.load("tutorial/tutorial.hancho")
hancho.load("examples/examples.hancho")
Expand Down
6 changes: 3 additions & 3 deletions hancho.py
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ class Task:
default_command = None
default_task_dir = "{mod_dir}"
default_build_dir = (
"{build_root}/{build_tag}/{repo_name}/{rel_path(task_dir, repo_dir)}"
"{build_root}/{repo_name}/{build_tag}/{rel_path(task_dir, repo_dir)}"
)
default_build_root = "{root_dir}/build"
default_build_tag = ""
Expand Down Expand Up @@ -1417,8 +1417,8 @@ def main(self):
# queue_task = True
# task_name = out_file
# break
if name := task.get("name", None):
if app.target_regex.search(task.get("name", None)):
if name := task.config.get("name", None):
if app.target_regex.search(name):
queue_task = True
task_name = name
if queue_task:
Expand Down

0 comments on commit 7be5423

Please sign in to comment.