revision: remove redundant #-interpreter, use #-ecl-bytecmp instead

This commit is contained in:
pls.153 2025-05-08 11:42:44 +02:00
parent d1c19ec74c
commit 878007b8f2
24 changed files with 16 additions and 28 deletions

View file

@ -254,7 +254,7 @@
Only useful if used with UNLESS, in order to check for a valid pointer. Only useful if used with UNLESS, in order to check for a valid pointer.
Returns T if the argument is not of type QT-OBJECT. Returns T if the argument is not of type QT-OBJECT.
(unless (qnull ui:*item*) (unless (qnull (find-quick-item ui:*label*))
...) ...)

View file

@ -70,7 +70,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -33,7 +33,7 @@ Rectangle {
currentIndex: view.currentIndex currentIndex: view.currentIndex
} }
Keys.onPressed: { Keys.onPressed: (event) => {
if (event.key === Qt.Key_Back) { if (event.key === Qt.Key_Back) {
event.accepted = true event.accepted = true
if (view.currentIndex === 0) { if (view.currentIndex === 0) {

View file

@ -13,8 +13,8 @@
(unless (x:empty-string ip) (unless (x:empty-string ip)
(format nil "http://~A:8080/" ip)))) (format nil "http://~A:8080/" ip))))
(defvar *remote-ip* #+interpreter nil (defvar *remote-ip* #+ecl-bytecmp nil
#-interpreter #.(remote-ip)) #-ecl-bytecmp #.(remote-ip))
(defun load* (file) (defun load* (file)
(load (make-string-input-stream (curl (x:cc *remote-ip* file))))) (load (make-string-input-stream (curl (x:cc *remote-ip* file)))))

View file

@ -81,7 +81,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -46,7 +46,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -67,7 +67,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -10,8 +10,8 @@
(unless (x:empty-string ip) (unless (x:empty-string ip)
(format nil "http://~A:8080/" ip)))) (format nil "http://~A:8080/" ip))))
(defvar *remote-ip* #+interpreter nil (defvar *remote-ip* #+ecl-bytecmp nil
#-interpreter #.(remote-ip)) #-ecl-bytecmp #.(remote-ip))
(defun load* (file) (defun load* (file)
(load (make-string-input-stream (curl (x:cc *remote-ip* file))))) (load (make-string-input-stream (curl (x:cc *remote-ip* file)))))

View file

@ -52,7 +52,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "lib") (defvar *asdf-system* "lib")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *build-type* :fasl) (defvar *build-type* :fasl)

View file

@ -92,7 +92,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -45,7 +45,7 @@ StackView {
Lisp.call("editor:orientation-changed", Screen.orientation) Lisp.call("editor:orientation-changed", Screen.orientation)
} }
Keys.onPressed: { Keys.onPressed: (event) => {
if (event.key === Qt.Key_Back) { if (event.key === Qt.Key_Back) {
event.accepted = true event.accepted = true
Lisp.call("editor:back-pressed") Lisp.call("editor:back-pressed")

View file

@ -1,7 +1,7 @@
(defsystem :app (defsystem :app
:serial t :serial t
;; requires this CLOG fork: https://gitlab.com/eql/clog-for-mobile/-/blob/main/clog-2.2.tgz ;; requires this CLOG fork: https://gitlab.com/eql/clog-for-mobile/-/blob/main/clog-2.2.tgz
:depends-on (#-clog-loaded :clog) :depends-on (#-depends-loaded :clog)
:components ((:file "lisp/package") :components ((:file "lisp/package")
(:file "lisp/ini") (:file "lisp/ini")
(:file "lisp/ui-vars") (:file "lisp/ui-vars")

View file

@ -2,7 +2,7 @@
(in-package :qml) (in-package :qml)
#-interpreter #-ecl-bytecmp
(ffi:clines "extern void init_lib_ASDF(cl_object);") (ffi:clines "extern void init_lib_ASDF(cl_object);")
(defun %sym (symbol package) (defun %sym (symbol package)
@ -12,6 +12,7 @@
(defun ensure-asdf () (defun ensure-asdf ()
(unless (find-package :asdf) (unless (find-package :asdf)
#-ecl-bytecmp
(ffi:c-inline nil nil :void "ecl_init_module(NULL, init_lib_ASDF)" :one-liner t) (ffi:c-inline nil nil :void "ecl_init_module(NULL, init_lib_ASDF)" :one-liner t)
(in-package :qml-user)) (in-package :qml-user))
:asdf) :asdf)

View file

@ -84,7 +84,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -33,7 +33,7 @@ Rectangle {
currentIndex: view.currentIndex currentIndex: view.currentIndex
} }
Keys.onPressed: { Keys.onPressed: (event) => {
if (event.key === Qt.Key_Back) { if (event.key === Qt.Key_Back) {
event.accepted = true event.accepted = true
if (view.currentIndex === 0) { if (view.currentIndex === 0) {

View file

@ -10,8 +10,7 @@
(push (merge-pathnames "./") (push (merge-pathnames "./")
asdf:*central-registry*) asdf:*central-registry*)
(push :interpreter *features*) (push :depends-loaded *features*)
(push :clog-loaded *features*)
(asdf:operate 'asdf:load-source-op :app) (asdf:operate 'asdf:load-source-op :app)

View file

@ -85,7 +85,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -63,7 +63,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -10,8 +10,8 @@
(unless (x:empty-string ip) (unless (x:empty-string ip)
(format nil "http://~A:8080/" ip)))) (format nil "http://~A:8080/" ip))))
(defvar *remote-ip* #+interpreter nil (defvar *remote-ip* #+ecl-bytecmp nil
#-interpreter #.(remote-ip)) #-ecl-bytecmp #.(remote-ip))
(defun load* (file) (defun load* (file)
(load (make-string-input-stream (curl (x:cc *remote-ip* file))))) (load (make-string-input-stream (curl (x:cc *remote-ip* file)))))

View file

@ -81,7 +81,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -38,7 +38,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "app") (defvar *asdf-system* "app")
(defvar *ql-libs* (cc *current* "ql-libs.lisp")) (defvar *ql-libs* (cc *current* "ql-libs.lisp"))
(defvar *init-name* "ini_app") (defvar *init-name* "ini_app")

View file

@ -57,7 +57,7 @@
(ext:install-c-compiler) (ext:install-c-compiler)
(setf *features* (remove :interpreter *features*)) (setf *features* (remove :interpreter *features*)) ; now obsolete, see #-ecl-bytecmp
(load (merge-pathnames (format nil "platforms/~A/cross-compile" (load (merge-pathnames (format nil "platforms/~A/cross-compile"
#+android "android" #+android "android"

View file

@ -484,7 +484,7 @@ cl_object qnull(cl_object l_arg) {
/// args: (qt-object) /// args: (qt-object)
/// Only useful if used with UNLESS, in order to check for a valid pointer. /// Only useful if used with UNLESS, in order to check for a valid pointer.
/// Returns T if the argument is not of type QT-OBJECT. /// Returns T if the argument is not of type QT-OBJECT.
/// (unless (qnull ui:*item*) /// (unless (qnull (find-quick-item ui:*label*))
/// ...) /// ...)
QObject* qobject = toQObjectPointer(l_arg); QObject* qobject = toQObjectPointer(l_arg);
ecl_return1(ecl_process_env(), (qobject == nullptr) ? ECL_T : ECL_NIL); ecl_return1(ecl_process_env(), (qobject == nullptr) ? ECL_T : ECL_NIL);

View file

@ -33,7 +33,6 @@
#+mobile #+mobile
(progn (progn
(pushnew :interpreter *features*)
(defvar *asdf-system* "lqml") (defvar *asdf-system* "lqml")
(defvar *init-name* "ini_LQML") (defvar *init-name* "ini_LQML")
(defvar *library-path* (format nil "platforms/~A/lib/" (defvar *library-path* (format nil "platforms/~A/lib/"