Commit bc9ee71f authored by Dave Cooper's avatar Dave Cooper

added defsystem-depends-on for zacl. Reverted x3dom version for now.

parent 90dc12fd
......@@ -299,6 +299,8 @@ Defaults to nil (i.e. we assume we are loading into a clean system and need all
(if (stringp sexpr)
(format nil "%%remove%%~a%%remove%%" sexpr) sexpr)))
#+nil
(asdf-defsystem-depends-on (let ((sexpr (glisp:sexpr-from-file
(merge-pathnames (make-pathname :name "defsystem-depends-on"
:type "isc")
......@@ -307,6 +309,12 @@ Defaults to nil (i.e. we assume we are loading into a clean system and need all
(format nil "%%remove%%~a%%remove%%" sexpr) sexpr)))
(asdf-defsystem-depends-on (let ((sexpr (glisp:sexpr-from-file
(merge-pathnames (make-pathname :name "defsystem-depends-on"
:type "isc")
(the ppathname)))))
(if (stringp sexpr) sexpr (format nil "\"~s\"" sexpr))))
(additional-asd-code (let ((asd-code-file
(merge-pathnames (make-pathname :name "additional-asd-code"
......@@ -347,8 +355,9 @@ Defaults to nil (i.e. we assume we are loading into a clean system and need all
:serial t
:version ,(the version)
:depends-on ,(the asdf-depends-on)
,(format nil "%%remove%%#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings ~{~s~})%%remove%%" (the asdf-defsystem-depends-on))
,(format nil "%%remove%%#+asdf-unicode :defsystem-depends-on #+asdf-unicode (~{~s~})%%remove%%" (the asdf-defsystem-depends-on))
,(format nil "%%remove%%#-asdf-unicode :defsystem-depends-on #-asdf-unicode ~a%%remove%%"
(format nil "(:asdf-encodings ~a)" (subseq (the asdf-defsystem-depends-on) 1 (1- (length (the asdf-defsystem-depends-on))))))
,(format nil "%%remove%%#+asdf-unicode :defsystem-depends-on #+asdf-unicode ~a%%remove%%" (the asdf-defsystem-depends-on))
"%%remove%%#+asdf-encodings :encoding #+asdf-encodings :utf-8%%remove%%"
;;
;; FLAG -- maybe can get rid of binaries and need to call (the compile-and-load)
......
......@@ -212,10 +212,11 @@
(let ((gendl-loaded? (find-package :gendl)) (genworks-gdl-loaded? (find-package :genworks-gdl)))
(when (or gendl-loaded? genworks-gdl-loaded?)
(funcall (symbol-function (read-from-string \"uiop:setup-temporary-directory\"))))
(cond (genworks-gdl-loaded? (funcall (symbol-function (read-from-string \"gdl:start-gdl!\"))))
(cond (genworks-gdl-loaded? (format t \"Deferring startup for GDL until license file is built.\" ;;(funcall (symbol-function (read-from-string \"gdl:start-gdl!\")))
))
(gendl-loaded? (funcall (symbol-function (read-from-string \"gendl:start-gendl!\"))))
(t (format t \"~%%~%%***~%%Gendl or GDL is not loaded and did not load successfully
from .load-gendl.lisp in your home directory.~%%***~%%~%%\"))))
from .load-gendl.lisp in your home directory.~%%***~%%~%%\"))))
(when (find-package :gendl) (in-package :gdl-user)))" *gendl-home*))
......
"(#-(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 #-(or allegro ccl) :acl-compat #+ccl :zacl)"
"(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel)"
......@@ -2,9 +2,10 @@
(asdf:defsystem #:glisp :description
"The Gendl® Common Lisp Portability" :author b :license
"Genworks Proprietary" :serial t :version "20161127" :depends-on
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-(or allegro ccl) :acl-compat #+ccl :zacl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
"Genworks Proprietary" :serial t :version "20161223" :depends-on
(: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")
......
This diff is collapsed.
This diff is collapsed.
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