diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | ravanan/command-line-tool.scm | 1 | ||||
| -rw-r--r-- | ravanan/config.scm | 23 | ||||
| -rw-r--r-- | ravanan/config.scm.in | 23 |
4 files changed, 4 insertions, 53 deletions
diff --git a/Makefile b/Makefile index 1eaecfa..718c677 100644 --- a/Makefile +++ b/Makefile @@ -31,10 +31,8 @@ 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) \ - $(config_file) + $(wildcard $(top_level_module_dir)/work/*.scm) objects = $(sources:.scm=.go) scripts = $(wildcard bin/*) tests = $(wildcard tests/*.scm) $(wildcard tests/work/*.scm) @@ -44,12 +42,12 @@ godir = $(libdir)/guile/$(guile_effective_version)/site-ccache .PHONY: all clean install -all: $(objects) $(config_file) +all: $(objects) %.scm: %.scm.in $(SED) 's|@NODE@|$(NODE)|' $< > $@ -%.go: %.scm $(config_file) +%.go: %.scm GUILE_AUTO_COMPILE=0 $(GUILD) compile -L . -o $@ $< check: @@ -67,4 +65,4 @@ install: $(sources) $(objects) $(scripts) done clean: - rm -f $(objects) $(config_file) + rm -f $(objects) diff --git a/ravanan/command-line-tool.scm b/ravanan/command-line-tool.scm index 6711450..9fd8b51 100644 --- a/ravanan/command-line-tool.scm +++ b/ravanan/command-line-tool.scm @@ -45,7 +45,6 @@ #:use-module (guix store) #:use-module (json) #:use-module (yaml) - #:use-module (ravanan config) #:use-module (ravanan glob) #:use-module (ravanan job-state) #:use-module (ravanan propnet) diff --git a/ravanan/config.scm b/ravanan/config.scm deleted file mode 100644 index f67418f..0000000 --- a/ravanan/config.scm +++ /dev/null @@ -1,23 +0,0 @@ -;;; ravanan --- High-reproducibility CWL runner powered by Guix -;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net> -;;; -;;; 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 <https://www.gnu.org/licenses/>. - -(define-module (ravanan config) - #:export (%node)) - -(define %node - "node") diff --git a/ravanan/config.scm.in b/ravanan/config.scm.in deleted file mode 100644 index ed90176..0000000 --- a/ravanan/config.scm.in +++ /dev/null @@ -1,23 +0,0 @@ -;;; ravanan --- High-reproducibility CWL runner powered by Guix -;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net> -;;; -;;; 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 <https://www.gnu.org/licenses/>. - -(define-module (ravanan config) - #:export (%node)) - -(define %node - "@NODE@") |