Commit b671a5bc authored by Dave Cooper's avatar Dave Cooper

rearranged systems to get zacl loaded.

parent 432b7ada
......@@ -48,6 +48,9 @@ to the src/ directory distributed with GDL.
(torso-type 'box :settable)
(height 10 :settable)
(head-angle 0 :settable)
(body-angle 20 :settable)
#+nil
(body-angle (let ((angle (or (parse-integer (progn ;;(format t "~&Enter a number for body angle: ~%")
(let ((data (read-line)))
(print-variables data)
......
......@@ -4,7 +4,7 @@
"The Gendl® gendl Subsystem" :author "Genworks International"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20180115" :depends-on
(:bordeaux-threads :uiop #-allegro :babel #-allegro :quri #-allegro :zacl :cl-lite :gwl-graphics :tasty :robot :yadd)
(:bordeaux-threads :uiop #-allegro :babel #-allegro :quri :cl-lite :gwl-graphics :tasty :robot :yadd)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode ()
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
"#-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl"
\ No newline at end of file
"(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :zacl)"
"(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel)"
......@@ -7,9 +7,6 @@
:version "20170828" :depends-on
;;(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :zacl)
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel)
;;#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings #-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl)
;;#+asdf-unicode :defsystem-depends-on #+asdf-unicode (#-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl)
;;#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/presets") (:file "source/parameters")
(:file "source/genworks") (:file "source/initialize")
......
......@@ -428,10 +428,7 @@ the \"current\" error."
)
(defun local-port (socket)
(#+(or allegro zacl) socket:local-port
#-(or allegro zacl abcl) acl-compat.socket:local-port
#+abcl #'(lambda(socket) (declare (ignore socket) 0)) socket))
#+nil
......@@ -495,16 +492,10 @@ are no longer supported by glisp:match-regexp.~%"))
(when if-does-not-exist-error? (error "~&The File `~a' does not exist.~%" pathname))))
(defun remote-host (socket)
#+(or allegro zacl) (socket:remote-host socket)
#-(or allegro zacl abcl) (acl-compat.socket:remote-host socket))
;;
;; FLAG -- add abcl
;;
(defun local-host (socket)
#+(or allegro zacl) (socket:local-host socket)
#-(or allegro zacl abcl) (acl-compat.socket:local-host socket))
(defun replace-regexp (string regexp to-string)
......@@ -685,17 +676,10 @@ please find implementation for the currently running lisp.~%")
#+allegro `(progn ,@body))
(defun with-timeout-sym ()
"Returns the appropriate symbol for with-timeout, for substitution within macros."
#+(or allegro zacl) 'sys:with-timeout
#+abcl 'bordeaux-threads:with-timeout
#-(or allegro zacl abcl) 'acl-compat.mp:with-timeout)
(defmacro with-timeout ((seconds &body timeout-body) &body body)
#+(or allegro zacl) `(sys:with-timeout (,seconds ,@timeout-body) ,@body)
#+abcl `(bordeaux-threads:with-timeout (,seconds ,@timeout-body) ,@body)
#-(or allegro zacl abcl) `(acl-compat.mp:with-timeout (,seconds ,@timeout-body) ,@body))
(defmacro without-redefinition-warnings (&rest body)
......
"(#-allegro :zacl)"
\ No newline at end of file
"(:bordeaux-threads :drakma :glisp #+zacl :aserve #-zacl :paserve :yason)"
;;"(:bordeaux-threads :drakma :glisp #+zacl :aserve #-zacl :paserve :yason)"
(:bordeaux-threads :drakma :glisp #-allegro :zacl-aserve #+allegro :aserve :yason)
......@@ -5,13 +5,14 @@
"Dave Cooper, Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170802" :depends-on
(:bordeaux-threads :drakma :glisp #+zacl :aserve #-zacl :paserve :yason)
(:bordeaux-threads :drakma :glisp #-allegro :zacl-aserve #+allegro :aserve :yason)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode ()
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/with-all-servers")
(:file "source/defparameters") (:file "source/base-html-sheet")
(:file "source/genworks")
(:file "source/html-format") (:file "source/macros")
(:file "source/presets") (:file "source/base-html-utils")
(:file "source/ignore-errors-with-backtrace")
......
(in-package :com.genworks.lisp)
(defun local-port (socket)
(#+(or allegro zacl) socket:local-port
#-(or allegro zacl abcl) acl-compat.socket:local-port
#+abcl #'(lambda(socket) (declare (ignore socket) 0)) socket))
(defun remote-host (socket)
#+(or allegro zacl) (socket:remote-host socket)
#-(or allegro zacl abcl) (acl-compat.socket:remote-host socket))
;;
;; FLAG -- add abcl
;;
(defun local-host (socket)
#+(or allegro zacl) (socket:local-host socket)
#-(or allegro zacl abcl) (acl-compat.socket:local-host socket))
(defun with-timeout-sym ()
"Returns the appropriate symbol for with-timeout, for substitution within macros."
#+(or allegro zacl) 'sys:with-timeout
#+abcl 'bordeaux-threads:with-timeout
#-(or allegro zacl abcl) 'acl-compat.mp:with-timeout)
(defmacro with-timeout ((seconds &body timeout-body) &body body)
#+(or allegro zacl) `(sys:with-timeout (,seconds ,@timeout-body) ,@body)
#+abcl `(bordeaux-threads:with-timeout (,seconds ,@timeout-body) ,@body)
#-(or allegro zacl abcl) `(acl-compat.mp:with-timeout (,seconds ,@timeout-body) ,@body))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment