From c6cca3b959ffc364829b83bcf868a5e2e987994d Mon Sep 17 00:00:00 2001 From: "pls.153" Date: Thu, 2 Jun 2022 16:01:58 +0200 Subject: [PATCH] example 'cl-repl': fix loading of Quicklisp --- examples/cl-repl/lisp/swank-quicklisp.lisp | 5 +---- examples/cl-repl/make.lisp | 11 +++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/cl-repl/lisp/swank-quicklisp.lisp b/examples/cl-repl/lisp/swank-quicklisp.lisp index 3f95f8f..ec0947c 100644 --- a/examples/cl-repl/lisp/swank-quicklisp.lisp +++ b/examples/cl-repl/lisp/swank-quicklisp.lisp @@ -20,10 +20,7 @@ (ensure-asdf) (unless (find-package :quicklisp) #+android - (progn - (require :ecl-quicklisp) - (require :deflate) - (require :ql-minitar)) + (require :ecl-quicklisp) #+ios (load "quicklisp/setup") ;; replace interpreted function with precompiled one from DEFLATE diff --git a/examples/cl-repl/make.lisp b/examples/cl-repl/make.lisp index 0734563..6b2849c 100644 --- a/examples/cl-repl/make.lisp +++ b/examples/cl-repl/make.lisp @@ -33,11 +33,14 @@ (let ((to (cc *assets* "quicklisp/local-projects/slime/"))) (ensure-directories-exist to) (shell (cc "cp -r ../../../slime/src/* " to)))) - (unless (probe-file (cc *assets* "encodings")) - (let ((lib (cc (ext:getenv #+android "ECL_ANDROID" #+ios "ECL_IOS") - "/lib/ecl-*/"))) + (let ((lib (cc (ext:getenv #+android "ECL_ANDROID" #+ios "ECL_IOS") + "/lib/ecl-*/"))) + (unless (probe-file (cc *assets* "encodings")) (shell (cc "cp " lib "*.doc " *assets*)) - (shell (cc "cp -r " lib "encodings " *assets*))))) + (shell (cc "cp -r " lib "encodings " *assets*))) + #+android + (unless (probe-file (cc *assets* "ecl-quicklisp.fas")) + (shell (cc "cp " lib "ecl-quicklisp.fas " *assets*))))) #+mobile (unless (find-swank)