From 482c3f1695adbd9eb2e783b21bb5c8ca3cae7f1a Mon Sep 17 00:00:00 2001 From: cage Date: Tue, 28 Jan 2025 19:59:22 +0100 Subject: [PATCH] - [makefile] used ASDF API to configure the place to search for lisp system, instead of manipulate the variable *source-registry*; - added a MAKE rule to compile the project with vendored dependencies. --- Makefile.am | 11 ++++++++++- Makefile.in | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0a5eb58..22ae91a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,7 +103,16 @@ $(PACKAGE): $(CONF_PATH_FILE) *.asd src/* $(LISP_COMPILER) \ --dynamic-space-size $(DYNAMIC_MEMORY_SIZE) \ --eval "(require 'asdf)" \ - --eval "(push \"$$(pwd)/\" asdf:*central-registry*)" \ + --eval "(asdf:initialize-source-registry '(:source-registry :inherit-configuration (:tree \"$$(pwd)/\")))" \ + --eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \ + --eval "(uiop:quit)" + mv src/$(PACKAGE) $(PACKAGE) + +$(PACKAGE)-vendored: $(CONF_PATH_FILE) *.asd src/* + $(LISP_COMPILER) \ + --dynamic-space-size $(DYNAMIC_MEMORY_SIZE) \ + --eval "(require 'asdf)" \ + --eval "(asdf:initialize-source-registry '(:source-registry :ignore-inherited-configuration (:tree \"$$(pwd)/\")))" \ --eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \ --eval "(uiop:quit)" mv src/$(PACKAGE) $(PACKAGE) diff --git a/Makefile.in b/Makefile.in index 0944d00..94f68a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1127,7 +1127,16 @@ $(PACKAGE): $(CONF_PATH_FILE) *.asd src/* $(LISP_COMPILER) \ --dynamic-space-size $(DYNAMIC_MEMORY_SIZE) \ --eval "(require 'asdf)" \ - --eval "(push \"$$(pwd)/\" asdf:*central-registry*)" \ + --eval "(asdf:initialize-source-registry '(:source-registry :inherit-configuration (:tree \"$$(pwd)/\")))" \ + --eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \ + --eval "(uiop:quit)" + mv src/$(PACKAGE) $(PACKAGE) + +$(PACKAGE)-vendored: $(CONF_PATH_FILE) *.asd src/* + $(LISP_COMPILER) \ + --dynamic-space-size $(DYNAMIC_MEMORY_SIZE) \ + --eval "(require 'asdf)" \ + --eval "(asdf:initialize-source-registry '(:source-registry :ignore-inherited-configuration (:tree \"$$(pwd)/\")))" \ --eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \ --eval "(uiop:quit)" mv src/$(PACKAGE) $(PACKAGE)