From 47cdf02877bac497a45bc67b2a0045d1e21be576 Mon Sep 17 00:00:00 2001 From: Marshall Lochbaum Date: Fri, 30 Sep 2022 11:35:25 -0400 Subject: [PATCH] Build Singeli files with a filename prefix --- SingeliMake.bqn | 3 ++- src/singeli/src/base.singeli | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SingeliMake.bqn b/SingeliMake.bqn index 6f19cbd0..48407e30 100755 --- a/SingeliMake.bqn +++ b/SingeliMake.bqn @@ -9,9 +9,10 @@ srcfile ← •file.At srcfileR resfile ← •file.At resfileR tmpfile ← (•file.At buildDir) •file.At filename∾".d.orig" depfile ← (•file.At buildDir) •file.At filename∾".d" +prefix ← "si_"∾ (∧`'.'⊸≠)⊸/ •file.Name srcfile # invoke singeli, which creates the result file -(⟨"-d" ⋄ tmpfile ⋄ "-o" ⋄ resfile ⋄ srcfile⟩) •Import siDir •file.At "singeli" +(⟨"-d" ⋄ tmpfile ⋄ "-o" ⋄ resfile ⋄ "-n" ⋄ prefix ⋄ srcfile⟩) •Import siDir •file.At "singeli" # output dependency file deps ← siDir⊸•file.At¨ •file.Lines tmpfile diff --git a/src/singeli/src/base.singeli b/src/singeli/src/base.singeli index fb002cd8..6029454c 100644 --- a/src/singeli/src/base.singeli +++ b/src/singeli/src/base.singeli @@ -19,7 +19,7 @@ def bit {k,x} = x & (1<