From 2088cbfcb294e5566297f2bce8712b37c4f17589 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 2 Oct 2024 13:53:26 +0100 Subject: Revert "config: Remove." This reverts commit d611d990b297b3d573d7d5af83e9376744d51dd5. We need to bring back a local node to evaluate javascript expressions on the head node. --- Makefile | 10 ++++++---- ravanan/command-line-tool.scm | 1 + ravanan/config.scm | 23 +++++++++++++++++++++++ ravanan/config.scm.in | 23 +++++++++++++++++++++++ 4 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 ravanan/config.scm create mode 100644 ravanan/config.scm.in diff --git a/Makefile b/Makefile index 718c677..1eaecfa 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,10 @@ libdir ?= $(prefix)/lib guile_effective_version = 3.0 top_level_module_dir = $(project) +config_file = $(top_level_module_dir)/config.scm sources = $(wildcard $(top_level_module_dir)/*.scm) \ - $(wildcard $(top_level_module_dir)/work/*.scm) + $(wildcard $(top_level_module_dir)/work/*.scm) \ + $(config_file) objects = $(sources:.scm=.go) scripts = $(wildcard bin/*) tests = $(wildcard tests/*.scm) $(wildcard tests/work/*.scm) @@ -42,12 +44,12 @@ godir = $(libdir)/guile/$(guile_effective_version)/site-ccache .PHONY: all clean install -all: $(objects) +all: $(objects) $(config_file) %.scm: %.scm.in $(SED) 's|@NODE@|$(NODE)|' $< > $@ -%.go: %.scm +%.go: %.scm $(config_file) GUILE_AUTO_COMPILE=0 $(GUILD) compile -L . -o $@ $< check: @@ -65,4 +67,4 @@ install: $(sources) $(objects) $(scripts) done clean: - rm -f $(objects) + rm -f $(objects) $(config_file) diff --git a/ravanan/command-line-tool.scm b/ravanan/command-line-tool.scm index 944ff07..55f6bb3 100644 --- a/ravanan/command-line-tool.scm +++ b/ravanan/command-line-tool.scm @@ -36,6 +36,7 @@ #:use-module (guix search-paths) #:use-module (guix store) #:use-module (json) + #:use-module (ravanan config) #:use-module (ravanan job-state) #:use-module (ravanan reader) #:use-module (ravanan slurm-api) diff --git a/ravanan/config.scm b/ravanan/config.scm new file mode 100644 index 0000000..f67418f --- /dev/null +++ b/ravanan/config.scm @@ -0,0 +1,23 @@ +;;; ravanan --- High-reproducibility CWL runner powered by Guix +;;; Copyright © 2024 Arun Isaac +;;; +;;; This file is part of ravanan. +;;; +;;; ravanan is free software: you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; ravanan is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with ravanan. If not, see . + +(define-module (ravanan config) + #:export (%node)) + +(define %node + "node") diff --git a/ravanan/config.scm.in b/ravanan/config.scm.in new file mode 100644 index 0000000..ed90176 --- /dev/null +++ b/ravanan/config.scm.in @@ -0,0 +1,23 @@ +;;; ravanan --- High-reproducibility CWL runner powered by Guix +;;; Copyright © 2024 Arun Isaac +;;; +;;; This file is part of ravanan. +;;; +;;; ravanan is free software: you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; ravanan is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with ravanan. If not, see . + +(define-module (ravanan config) + #:export (%node)) + +(define %node + "@NODE@") -- cgit v1.2.3