From d1c9ddeb8fdd39b54bd1530456ad43e2b650ffd0 Mon Sep 17 00:00:00 2001 From: Carsten Heinz Date: Mon, 15 Apr 2024 16:42:18 +0200 Subject: [PATCH 1/2] Fix assignment in genus template --- src/script_fmt/genus_tcl.tera | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script_fmt/genus_tcl.tera b/src/script_fmt/genus_tcl.tera index e46a504e..40333239 100644 --- a/src/script_fmt/genus_tcl.tera +++ b/src/script_fmt/genus_tcl.tera @@ -2,7 +2,7 @@ if [ info exists search_path ] {{ '{{' }} set search_path_initial $search_path {{ '}}' }} -set ROOT = "{{ root }}" +set ROOT "{{ root }}" {% if compilation_mode == 'separate' %}{% for group in srcs %} set search_path $search_path_initial {% for incdir in group.incdirs %}lappend search_path "$ROOT{{ incdir | replace(from=root, to='') }}" From 3118c40a9c712d9eef416034a74b606790f6bc54 Mon Sep 17 00:00:00 2001 From: Carsten Heinz Date: Mon, 15 Apr 2024 23:28:54 +0200 Subject: [PATCH 2/2] Improve search_path_initial init in genus template --- src/script_fmt/genus_tcl.tera | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/script_fmt/genus_tcl.tera b/src/script_fmt/genus_tcl.tera index 40333239..ade1626f 100644 --- a/src/script_fmt/genus_tcl.tera +++ b/src/script_fmt/genus_tcl.tera @@ -1,7 +1,9 @@ # {{ HEADER_AUTOGEN }} -if [ info exists search_path ] {{ '{{' }} - set search_path_initial $search_path -{{ '}}' }} +if [ info exists search_path ] { + set search_path_initial $search_path +} else { + set search_path_initial {} +} set ROOT "{{ root }}" {% if compilation_mode == 'separate' %}{% for group in srcs %} set search_path $search_path_initial