From c4f0d924a335e892970ec924efdb823c34f880e0 Mon Sep 17 00:00:00 2001 From: "pls.153" Date: Sat, 29 Jul 2023 13:30:09 +0200 Subject: [PATCH] revisions --- .../lisp/swank-quicklisp.lisp | 11 ----------- examples/cl-repl/app.pro | 6 +++--- examples/cl-repl/lisp/swank-quicklisp.lisp | 11 ----------- examples/swank-server/app.pro | 2 +- examples/swank-server/lisp/swank-quicklisp.lisp | 11 ----------- readme-prepare-ios.md | 2 +- 6 files changed, 5 insertions(+), 38 deletions(-) diff --git a/examples/advanced-qml-auto-reload/lisp/swank-quicklisp.lisp b/examples/advanced-qml-auto-reload/lisp/swank-quicklisp.lisp index 3f95f8f..e21c7f2 100644 --- a/examples/advanced-qml-auto-reload/lisp/swank-quicklisp.lisp +++ b/examples/advanced-qml-auto-reload/lisp/swank-quicklisp.lisp @@ -2,22 +2,12 @@ (in-package :qml) -#-interpreter -(ffi:clines "extern void init_lib_ASDF(cl_object);") - (defun %sym (symbol package) (intern (symbol-name symbol) package)) ;;; Quicklisp setup -(defun ensure-asdf () - (unless (find-package :asdf) - (ffi:c-inline nil nil :void "ecl_init_module(NULL, init_lib_ASDF)" :one-liner t) - (in-package :qml-user)) - :asdf) - (defun quicklisp () - (ensure-asdf) (unless (find-package :quicklisp) #+android (progn @@ -45,7 +35,6 @@ (load-contribs t) (setup t) (delete t) (quiet t) (dont-close t) log-events) (unless (find-package :swank) - (ensure-asdf) (funcall (%sym 'load-system :asdf) :swank)) (funcall (%sym 'init :swank-loader) :load-contribs load-contribs diff --git a/examples/cl-repl/app.pro b/examples/cl-repl/app.pro index 602c9a4..6caac20 100644 --- a/examples/cl-repl/app.pro +++ b/examples/cl-repl/app.pro @@ -30,7 +30,7 @@ win32: PRE_TARGETDEPS = tmp/app.lib QT += quick qml TEMPLATE = app CONFIG += c++17 no_keywords release -DEFINES += DESKTOP_APP INI_ASDF INI_LISP INI_ECL_CONTRIB QT_EXTENSION +DEFINES += DESKTOP_APP INI_LISP INI_ASDF INI_ECL_CONTRIB QT_EXTENSION INCLUDEPATH = /usr/local/include ECL_VERSION = $$lower($$system(ecl -v)) ECL_VERSION = $$replace(ECL_VERSION, " ", "-") @@ -54,7 +54,7 @@ win32 { android { QT += androidextras - DEFINES += INI_ASDF NO_TEXT_HANDLES + DEFINES += NO_TEXT_HANDLES DEFINES -= DESKTOP_APP INCLUDEPATH = $$ECL/include ECL_VERSION = $$lower($$system($$ECL/../ecl-android-host/bin/ecl -v)) @@ -81,7 +81,7 @@ android { } ios { - DEFINES += INI_ASDF NO_TEXT_HANDLES DISABLE_SMART_QUOTES + DEFINES += NO_TEXT_HANDLES DISABLE_SMART_QUOTES DEFINES -= DESKTOP_APP INCLUDEPATH = $$(ECL_IOS)/include ECL_VERSION = $$lower($$system($ECL_IOS/../ecl-ios-host/bin/ecl -v)) diff --git a/examples/cl-repl/lisp/swank-quicklisp.lisp b/examples/cl-repl/lisp/swank-quicklisp.lisp index e3b2328..e2d3630 100644 --- a/examples/cl-repl/lisp/swank-quicklisp.lisp +++ b/examples/cl-repl/lisp/swank-quicklisp.lisp @@ -2,22 +2,12 @@ (in-package :qml) -#-interpreter -(ffi:clines "extern void init_lib_ASDF(cl_object);") - (defun %sym (symbol package) (intern (symbol-name symbol) package)) ;;; Quicklisp setup -(defun ensure-asdf () - (unless (find-package :asdf) - (ffi:c-inline nil nil :void "ecl_init_module(NULL, init_lib_ASDF)" :one-liner t) - (in-package :qml-user)) - :asdf) - (defun quicklisp () - (ensure-asdf) (unless (find-package :quicklisp) #+android (require :ecl-quicklisp) @@ -42,7 +32,6 @@ (load-contribs t) (setup t) (delete t) (quiet t) (dont-close t) log-events) (unless (find-package :swank) - (ensure-asdf) (funcall (%sym 'load-system :asdf) :swank)) (funcall (%sym 'init :swank-loader) :load-contribs load-contribs diff --git a/examples/swank-server/app.pro b/examples/swank-server/app.pro index 2647528..8e33dd8 100644 --- a/examples/swank-server/app.pro +++ b/examples/swank-server/app.pro @@ -17,7 +17,7 @@ android { lisp.commands = ecl.exe -shell $$PWD/make.lisp } -lisp.input = LISP_FILES +lisp.input = LISP_FILES win32: lisp.output = tmp/app.lib !win32: lisp.output = tmp/libapp.a diff --git a/examples/swank-server/lisp/swank-quicklisp.lisp b/examples/swank-server/lisp/swank-quicklisp.lisp index 3f95f8f..e21c7f2 100644 --- a/examples/swank-server/lisp/swank-quicklisp.lisp +++ b/examples/swank-server/lisp/swank-quicklisp.lisp @@ -2,22 +2,12 @@ (in-package :qml) -#-interpreter -(ffi:clines "extern void init_lib_ASDF(cl_object);") - (defun %sym (symbol package) (intern (symbol-name symbol) package)) ;;; Quicklisp setup -(defun ensure-asdf () - (unless (find-package :asdf) - (ffi:c-inline nil nil :void "ecl_init_module(NULL, init_lib_ASDF)" :one-liner t) - (in-package :qml-user)) - :asdf) - (defun quicklisp () - (ensure-asdf) (unless (find-package :quicklisp) #+android (progn @@ -45,7 +35,6 @@ (load-contribs t) (setup t) (delete t) (quiet t) (dont-close t) log-events) (unless (find-package :swank) - (ensure-asdf) (funcall (%sym 'load-system :asdf) :swank)) (funcall (%sym 'init :swank-loader) :load-contribs load-contribs diff --git a/readme-prepare-ios.md b/readme-prepare-ios.md index 1820f4d..68ac358 100644 --- a/readme-prepare-ios.md +++ b/readme-prepare-ios.md @@ -79,7 +79,7 @@ version (tested with gmp 6.2.1). Just substitute it in `src/gmp/`: * download [gmp](https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz) -* extract it with `tar -xvf gmp-6.2.1.tar.xz` and replace the version in `src/gmp/` +* extract it with `tar xvf gmp-6.2.1.tar.xz` and replace the version in `src/gmp/` * run second script again, passing **sim** ```